fix(core): pound symbol being replaced outside plural and selectordin…

…al (#1928)
lingui · May 3, 2024 · e94c6fd · e94c6fd
1 parent 8a3b9c3
commit e94c6fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/core/src/interpolate.test.ts b/packages/core/src/interpolate.test.ts
@@ -71,6 +71,13 @@ describe("interpolate", () => {
     )
   })
 
+  it("should not replace `#` symbol outside plural and selectordinal", () => {
+    const cache = compile("#{place} in best seller list")
+    expect(interpolate(cache, "en", [])({ place: 7 })).toEqual(
+      "#7 in best seller list"
+    )
+  })
+
   it("should replace more than one octothorpe symbols in message", () => {
     const plural = prepare("{value, plural, one {} other {# and #}}")
 

diff --git a/packages/core/src/interpolate.ts b/packages/core/src/interpolate.ts
@@ -77,11 +77,14 @@ export function interpolate(
   return (values: Values = {}, formats?: Formats): string => {
     const formatters = getDefaultFormats(locale, locales, formats)
 
-    const formatMessage = (tokens: CompiledMessage | number | undefined) => {
+    const formatMessage = (
+      tokens: CompiledMessage | number | undefined,
+      replaceOctothorpe: boolean = false
+    ) => {
       if (!Array.isArray(tokens)) return tokens
 
       return tokens.reduce<string>((message, token) => {
-        if (token === "#") {
+        if (token === "#" && replaceOctothorpe) {
           return message + OCTOTHORPE_PH
         }
 
@@ -100,7 +103,10 @@ export function interpolate(
         ) {
           Object.entries(format as CompiledIcuChoices).forEach(
             ([key, value]) => {
-              interpolatedFormat[key] = formatMessage(value)
+              interpolatedFormat[key] = formatMessage(
+                value,
+                type === "plural" || type === "selectordinal"
+              )
             }
           )
         } else {