Improve fallback

Closes rubenv#210
crissdev · Oct 27, 2015 · d3625fb · d3625fb
1 parent 4e7b81f
commit d3625fb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -82,6 +82,7 @@ module.exports = function (grunt) {
                     hostname: "0.0.0.0",
                     middleware: function (connect) {
                         return [
+                            // jscs:disable requireDotNotation
                             connect["static"](__dirname)
                         ];
                     }

diff --git a/dist/angular-gettext.js b/dist/angular-gettext.js
@@ -41,6 +41,14 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         $rootScope.$broadcast('gettextLanguageChanged');
     }
 
+    function fallbackLanguage() {
+        var parts = this.currentLanguage.split('_');
+        if (parts.length > 1) {
+            return parts[0];
+        }
+        return null;
+    }
+
     catalog = {
         debug: false,
         debugPrefix: '[MISSING]: ',
@@ -93,7 +101,8 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         },
 
         getStringForm: function (string, n, context) {
-            var stringTable = this.strings[this.currentLanguage] || {};
+            var fallback = fallbackLanguage();
+            var stringTable = this.strings[this.currentLanguage] || (fallback ? this.strings[this.currentLanguage] : {});
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
             return plurals[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,6 +29,14 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         $rootScope.$broadcast('gettextLanguageChanged');
     }
 
+    function fallbackLanguage() {
+        var parts = this.currentLanguage.split('_');
+        if (parts.length > 1) {
+            return parts[0];
+        }
+        return null;
+    }
+
     catalog = {
         debug: false,
         debugPrefix: '[MISSING]: ',
@@ -81,7 +89,8 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         },
 
         getStringForm: function (string, n, context) {
-            var stringTable = this.strings[this.currentLanguage] || {};
+            var fallback = fallbackLanguage();
+            var stringTable = this.strings[this.currentLanguage] || (fallback ? this.strings[this.currentLanguage] : {});
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
             return plurals[n];

diff --git a/test/unit/catalog.js b/test/unit/catalog.js
@@ -145,4 +145,13 @@ describe("Catalog", function () {
         assert.equal(catalog.getString("Archive", {}, "verb"), "Archiveren");
         assert.equal(catalog.getString("Archive", {}, "noun"), "Archief");
     });
+
+    it("Should return string from fallback language", function () {
+        var strings = { Hello: "Hallo" };
+        catalog.setStrings("nl", strings);
+        catalog.setCurrentLanguage("nl_NL");
+        // It should check strings for nl_NL, then strings for nl
+        assert.equal(catalog.getString("Bye"), "Bye");
+        assert.equal(catalog.getString("Hello"), "Hallo");
+    });
 });