fallback to singular if no plural is found

ghaspias · Mar 10, 2015 · 5ab950a · 5ab950a
1 parent 1520c1f
commit 5ab950a
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 1 deletion.
diff --git a/releasenotes.md b/releasenotes.md
@@ -5,6 +5,7 @@
 - add support on key is a number
 - added getResourceBundle to API
 - allow multiple post-processors
+- fallback to singular if no plural is found fixes issue [issue 356](https://github.com/i18next/i18next/issues/356) 
 
 ### 1.7.7
 - fixes issue with stack overflow on t(lng, count)

diff --git a/spec/translate/translate.plurals.spec.js b/spec/translate/translate.plurals.spec.js
@@ -50,6 +50,40 @@ describe('plural usage', function() {
 
   });
 
+  describe('fallback on count with non-plurals', function() {
+    var resStore = {
+      dev: { 'ns.2': {
+            pluralTestWithCount: '__count__ item from ns.2'
+        }},
+      en: { },            
+      'en-US': { 
+        'ns.1': {
+            pluralTestWithCount: '__count__ item'
+        } 
+      }
+    };
+
+    beforeEach(function(done) {
+      i18n.init(i18n.functions.extend(opts, { 
+          resStore: resStore,
+          ns: { namespaces: ['ns.1', 'ns.2'], defaultNs: 'ns.1'}
+        }),
+        function(t) { done(); });
+    });
+
+    it('it should provide correct singular form', function() {
+      expect(i18n.t('pluralTestWithCount', {count: 0})).to.be('0 item');
+      expect(i18n.t('pluralTestWithCount', {count: 1})).to.be('1 item');
+      expect(i18n.t('pluralTestWithCount', {count: 7})).to.be('7 item');
+    });
+
+    it('it should provide correct singular form for second namespace', function() {
+      expect(i18n.t('ns.2:pluralTestWithCount', {count: 1})).to.be('1 item from ns.2');
+      expect(i18n.t('ns.2:pluralTestWithCount', {count: 7})).to.be('7 item from ns.2');
+    });
+
+  });
+
   describe('Plurals with passing lng to translation function', function() {
 
     var resStore = {

diff --git a/src/i18next.translate.js b/src/i18next.translate.js
@@ -281,6 +281,7 @@ function _find(key, options) {
     if (needsPlural(options, lngs[0])) {
         optionWithoutCount = f.extend({ lngs: [lngs[0]]}, options);
         delete optionWithoutCount.count;
+        optionWithoutCount._origLng = optionWithoutCount._origLng || optionWithoutCount.lng || lngs[0];
         delete optionWithoutCount.lng;
         optionWithoutCount.defaultValue = o.pluralNotFound;
 
@@ -310,12 +311,21 @@ function _find(key, options) {
             var clone = lngs.slice();
             clone.shift();
             options = f.extend(options, { lngs: clone });
+            options._origLng = optionWithoutCount._origLng;
             delete options.lng;
             // retry with fallbacks
             translated = translate(ns + o.nsseparator + key, options);
             if (translated != o.pluralNotFound) return translated;
         } else {
-            return translated;
+            optionWithoutCount.lng = optionWithoutCount._origLng;
+            delete optionWithoutCount._origLng;
+            translated = translate(ns + o.nsseparator + key, optionWithoutCount);
+
+            return applyReplacement(translated, {
+                count: options.count,
+                interpolationPrefix: options.interpolationPrefix,
+                interpolationSuffix: options.interpolationSuffix
+            });
         }
     }
 

diff --git a/test/test.js b/test/test.js
@@ -2041,6 +2041,40 @@ describe('i18next', function() {
 
       });
 
+      describe('fallback on count with non-plurals', function() {
+        var resStore = {
+          dev: { 'ns.2': {
+                pluralTestWithCount: '__count__ item from ns.2'
+            }},
+          en: { },            
+          'en-US': { 
+            'ns.1': {
+                pluralTestWithCount: '__count__ item'
+            } 
+          }
+        };
+
+        beforeEach(function(done) {
+          i18n.init(i18n.functions.extend(opts, { 
+              resStore: resStore,
+              ns: { namespaces: ['ns.1', 'ns.2'], defaultNs: 'ns.1'}
+            }),
+            function(t) { done(); });
+        });
+
+        it('it should provide correct singular form', function() {
+          expect(i18n.t('pluralTestWithCount', {count: 0})).to.be('0 item');
+          expect(i18n.t('pluralTestWithCount', {count: 1})).to.be('1 item');
+          expect(i18n.t('pluralTestWithCount', {count: 7})).to.be('7 item');
+        });
+
+        it('it should provide correct singular form for second namespace', function() {
+          expect(i18n.t('ns.2:pluralTestWithCount', {count: 1})).to.be('1 item from ns.2');
+          expect(i18n.t('ns.2:pluralTestWithCount', {count: 7})).to.be('7 item from ns.2');
+        });
+
+      });
+
       describe('Plurals with passing lng to translation function', function() {
 
         var resStore = {