rename fallbackLanguage to baseLanguage

- baseLanguage is private because it conflicts with catalog's attribute with the same name - plural detection is pretty hardcoded, there's no clear way to know if plural is defined or not
rubenv · Oct 30, 2015 · 3fdb714 · 3fdb714
1 parent dfa89d0
commit 3fdb714
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/dist/angular-gettext.js b/dist/angular-gettext.js
@@ -41,10 +41,13 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         $rootScope.$broadcast('gettextLanguageChanged');
     }
 
-    function fallbackLanguage(lang) {
-        var parts = (lang || '').split('_');
-        if (parts.length > 1) {
-            return parts[0];
+    function baseLanguage() {
+        if (catalog.currentLanguage) {
+            var parts = catalog.currentLanguage.split('_');
+            if (parts.length > 0) {
+                return parts[0];
+            }
+            return catalog.currentLanguage;
         }
         return null;
     }
@@ -101,8 +104,7 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         },
 
         getStringForm: function (string, n, context) {
-            var fallback = fallbackLanguage(this.currentLanguage);
-            var stringTable = this.strings[this.currentLanguage] || this.strings[fallback] || {};
+            var stringTable = this.strings[this.currentLanguage] || this.strings[baseLanguage()] || {};
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
             return plurals[n];
@@ -115,7 +117,8 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         },
 
         getPlural: function (n, string, stringPlural, scope, context) {
-            var form = gettextPlurals(this.currentLanguage, n);
+            var baseLang = baseLanguage();
+            var form = gettextPlurals(this.currentLanguage !== 'pt_BR' ? baseLang : this.currentLanguage, n);
             string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
             if (scope) {
                 scope.$count = n;

diff --git a/dist/angular-gettext.min.js b/dist/angular-gettext.min.js
diff --git a/src/catalog.js b/src/catalog.js
@@ -29,10 +29,13 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         $rootScope.$broadcast('gettextLanguageChanged');
     }
 
-    function fallbackLanguage(lang) {
-        var parts = (lang || '').split('_');
-        if (parts.length > 1) {
-            return parts[0];
+    function baseLanguage() {
+        if (catalog.currentLanguage) {
+            var parts = catalog.currentLanguage.split('_');
+            if (parts.length > 0) {
+                return parts[0];
+            }
+            return catalog.currentLanguage;
         }
         return null;
     }
@@ -89,8 +92,7 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         },
 
         getStringForm: function (string, n, context) {
-            var fallback = fallbackLanguage(this.currentLanguage);
-            var stringTable = this.strings[this.currentLanguage] || this.strings[fallback] || {};
+            var stringTable = this.strings[this.currentLanguage] || this.strings[baseLanguage()] || {};
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
             return plurals[n];
@@ -103,7 +105,8 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         },
 
         getPlural: function (n, string, stringPlural, scope, context) {
-            var form = gettextPlurals(this.currentLanguage, n);
+            var baseLang = baseLanguage();
+            var form = gettextPlurals(this.currentLanguage !== 'pt_BR' ? baseLang : this.currentLanguage, n);
             string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
             if (scope) {
                 scope.$count = n;