minor fixes to binding

i18next · Sep 11, 2018 · 0f2a0c9 · 0f2a0c9
1 parent cb237cb
commit 0f2a0c9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 0.0.3
+
+- check if bundle exists before getMessage call
+
 ### 0.0.2
 
 - support accessing attributes on fluent segment using keys like `login.placeholder`

diff --git a/i18nextFluent.js b/i18nextFluent.js
@@ -2139,7 +2139,7 @@
     }
 
     bind() {
-      this.i18next.on('added', (lng, ns) => {
+      this.i18next.store.on('added', (lng, ns) => {
         if (!this.i18next.isInitialized) return;
         this.createBundleFromI18next(lng, ns);
       });
@@ -2179,12 +2179,14 @@
       const isAttr = key.indexOf('.') > -1;
       if (!res) return key;
       const useRes = isAttr ? res.attrs[key.split('.')[1]] : res;
+      if (!bundle) return key;
       return bundle.format(useRes, options);
     }
 
     getResource(lng, ns, key, options) {
-      const bundle = this.store.getBundle(lng, ns);
+      let bundle = this.store.getBundle(lng, ns);
       const useKey = key.indexOf('.') > -1 ? key.split('.')[0] : key;
+      if (!bundle) return key;
       return bundle.getMessage(useKey);
     }
 

diff --git a/i18nextFluent.min.js b/i18nextFluent.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "i18next-fluent",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "i18nFormat plugin to use fluent format with i18next",
   "main": "./index.js",
   "jsnext:main": "dist/es/index.js",

diff --git a/src/index.js b/src/index.js
@@ -57,7 +57,7 @@ class BundleStore {
   }
 
   bind() {
-    this.i18next.on('added', (lng, ns) => {
+    this.i18next.store.on('added', (lng, ns) => {
       if (!this.i18next.isInitialized) return;
       this.createBundleFromI18next(lng, ns);
     });
@@ -101,13 +101,15 @@ class Fluent {
     if (!res) return key;
 
     const useRes = isAttr ? res.attrs[key.split('.')[1]] : res;
+    if (!bundle) return key;
     return bundle.format(useRes, options);
   }
 
   getResource(lng, ns, key, options) {
-    const bundle = this.store.getBundle(lng, ns);
+    let bundle = this.store.getBundle(lng, ns);
     const useKey = key.indexOf('.') > -1 ? key.split('.')[0] : key;
 
+    if (!bundle) return key;
     return bundle.getMessage(useKey);
   }