Fix: choice should use fallback logic for fallback locale.

This fixes #64. Again, thanks @nanaya.
rmariuzzo · Dec 22, 2017 · 2259777 · 2259777
1 parent 99b54b2
commit 2259777
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/lang.js b/src/lang.js
@@ -221,7 +221,8 @@
             }
         }
 
-        var pluralForm = this._getPluralForm(number);
+        locale = locale || this._getLocale(key);
+        var pluralForm = this._getPluralForm(number, locale);
 
         return messageParts[pluralForm];
     };
@@ -311,6 +312,22 @@
         return message;
     };
 
+    /**
+     * Return the locale to be used between default and fallback.
+     * @param {String} key
+     * @return {String}
+     */
+    Lang.prototype._getLocale = function(key) {
+        key = this._parseKey(key, this.locale)
+        if (this.messages[key.source]) {
+            return this.locale;
+        }
+        if (this.messages[key.sourceFallback]) {
+            return this.fallback;
+        }
+        return null;
+    };
+
     /**
      * Find a message in a translation tree using both dotted keys and regular ones
      *
@@ -452,10 +469,11 @@
      * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
      *
      * @param {Number} count
+     * @param {String} locale
      * @return {Number}
      */
-    Lang.prototype._getPluralForm = function(count) {
-        switch (this.locale) {
+    Lang.prototype._getPluralForm = function(count, locale) {
+        switch (locale) {
             case 'az':
             case 'bo':
             case 'dz':