Merge b778af2 into ed635a1

i18next · Feb 26, 2019 · 9bee5fe · 9bee5fe
2 parents ed635a1 + b778af2
commit 9bee5fe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/parser.js b/src/parser.js
@@ -368,17 +368,16 @@ class Parser {
         // `\s` matches a single whitespace character, which includes spaces, tabs, form feeds, line feeds and other unicode spaces.
         const matchSpecialCharacters = '[\\r\\n\\s]*';
         const stringGroup =
-            '(' +
+            matchSpecialCharacters + '(' +
             // backtick (``)
-            matchSpecialCharacters + '`(?:[^`\\\\]|\\\\(?:.|$))*`' +
+            '`(?:[^`\\\\]|\\\\(?:.|$))*`' +
             '|' +
             // double quotes ("")
-            matchSpecialCharacters + '"(?:[^"\\\\]|\\\\(?:.|$))*"' +
+            '"(?:[^"\\\\]|\\\\(?:.|$))*"' +
             '|' +
             // single quote ('')
-            matchSpecialCharacters + '\'(?:[^\'\\\\]|\\\\(?:.|$))*\'' +
-            matchSpecialCharacters +
-            ')';
+            '\'(?:[^\'\\\\]|\\\\(?:.|$))*\'' +
+            ')' + matchSpecialCharacters;
         const pattern = '(?:(?:^\\s*)|[^a-zA-Z0-9_])' +
             '(?:' + matchFuncs + ')' +
             '\\(' + stringGroup +

diff --git a/test/fixtures/default-values.js b/test/fixtures/default-values.js
@@ -1,4 +1,13 @@
 i18next.t('product.milk', { defaultValue: 'Milk' }); // output: 'Milk'
 i18next.t('product.bread', 'Bread'); // output: 'Bread'
 i18next.t('product.boiledEgg', 'Boiled Egg'); // output: 'Boiled Egg'
+i18next.t(
+    'product.cheese',
+    'Cheese'
+); // output: 'Cheese'
 i18next.t('product.potato', '{{color}} potato', { color: 'white' }); // output: '{{color}} potato'
+i18next.t(
+    'product.carrot',
+    '{{size}} carrot',
+    { size: 'big' }
+); // output: '{{size}} potato'
diff --git a/test/parser.js b/test/parser.js
@@ -1142,7 +1142,9 @@ test('Default values test', (t) => {
                     'bread': 'Bread',
                     'milk': 'Milk',
                     'boiledEgg': 'Boiled Egg',
-                    'potato': '{{color}} potato'
+                    'cheese': 'Cheese',
+                    'potato': '{{color}} potato',
+                    'carrot': '{{size}} carrot',
                 }
             }
         }