rebuild

i18next · Feb 13, 2019 · 55bcc6d · 55bcc6d
1 parent 95dfee8
commit 55bcc6d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 15.0.3
+
+- typescript: accept templatestringsarray as TKey [1199](https://github.com/i18next/i18next/pull/1199)
+- allow arrays on addResources
+
 ### 15.0.2
 
 - try fixing UMD build

diff --git a/i18next.js b/i18next.js
@@ -552,7 +552,7 @@
 
         /* eslint no-restricted-syntax: 0 */
         for (var m in resources) {
-          if (typeof resources[m] === 'string') this.addResource(lng, ns, m, resources[m], {
+          if (typeof resources[m] === 'string' || Object.prototype.toString.apply(resources[m]) === '[object Array]') this.addResource(lng, ns, m, resources[m], {
             silent: true
           });
         }

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "i18next",
-  "version": "15.0.2",
+  "version": "15.0.3",
   "description": "i18next internationalization framework",
   "main": "./index.js",
   "types": "index.d.ts",

diff --git a/src/ResourceStore.js b/src/ResourceStore.js
@@ -63,7 +63,10 @@ class ResourceStore extends EventEmitter {
   addResources(lng, ns, resources, options = { silent: false }) {
     /* eslint no-restricted-syntax: 0 */
     for (const m in resources) {
-      if (typeof resources[m] === 'string')
+      if (
+        typeof resources[m] === 'string' ||
+        Object.prototype.toString.apply(resources[m]) === '[object Array]'
+      )
         this.addResource(lng, ns, m, resources[m], { silent: true });
     }
     if (!options.silent) this.emit('added', lng, ns, resources);

diff --git a/src/Translator.js b/src/Translator.js
@@ -143,7 +143,11 @@ class Translator extends EventEmitter {
         }
         res = copy;
       }
-    } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && resType === '[object Array]') {
+    } else if (
+      handleAsObjectInI18nFormat &&
+      typeof joinArrays === 'string' &&
+      resType === '[object Array]'
+    ) {
       // array special treatment
       res = res.join(joinArrays);
       if (res) res = this.extendTranslation(res, keys, options);

diff --git a/test/translator/translator.translate.array.spec.js b/test/translator/translator.translate.array.spec.js
@@ -17,8 +17,8 @@ describe('Translator', () => {
             search: {
               flagList: [['basic', 'Basic'], ['simple', 'Simple']],
             },
-            keyArray: ["hello world {{count}}", "hey {{count}}"],
-            keyArray_plural: ["hello world plural {{count}}", "hey plural {{count}}"],
+            keyArray: ['hello world {{count}}', 'hey {{count}}'],
+            keyArray_plural: ['hello world plural {{count}}', 'hey plural {{count}}'],
           },
         },
       });
@@ -62,11 +62,11 @@ describe('Translator', () => {
       },
       {
         args: ['keyArray', { count: 1 }],
-        expected: ["hello world 1", "hey 1"],
+        expected: ['hello world 1', 'hey 1'],
       },
       {
         args: ['keyArray', { count: 100 }],
-        expected: ["hello world plural 100", "hey plural 100"],
+        expected: ['hello world plural 100', 'hey plural 100'],
       },
     ];