Language fallbacks

.gitignore

@@ -6,3 +6,4 @@
 /e2e-results.xml
 /.idea
 *.iml
+.DS_Store

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)
                         ];
                     }

dist/angular-gettext.js

@@ -10,7 +10,7 @@ angular.module('gettext').constant('gettext', function (str) {
     return str;
 });
 
-angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http", "$cacheFactory", "$interpolate", "$rootScope", function (gettextPlurals, $http, $cacheFactory, $interpolate, $rootScope) {
+angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "gettextFallbackLanguage", "$http", "$cacheFactory", "$interpolate", "$rootScope", function (gettextPlurals, gettextFallbackLanguage, $http, $cacheFactory, $interpolate, $rootScope) {
     var catalog;
     var noContext = '$$noContext';
 
@@ -92,22 +92,30 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
             broadcastUpdated();
         },
 
-        getStringForm: function (string, n, context) {
-            var stringTable = this.strings[this.currentLanguage] || {};
+        getStringFormFor: function (language, string, n, context) {
+            if (!language) {
+                return null;
+            }
+            var stringTable = this.strings[language] || {};
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
-            return plurals[n];
+            return plurals[gettextPlurals(language, n)];
         },
 
         getString: function (string, scope, context) {
-            string = this.getStringForm(string, 0, context) || prefixDebug(string);
+            var fallbackLanguage = gettextFallbackLanguage(this.currentLanguage);
+            string = this.getStringFormFor(this.currentLanguage, string, 1, context) ||
+                     this.getStringFormFor(fallbackLanguage, string, 1, context) ||
+                     prefixDebug(string);
             string = scope ? $interpolate(string)(scope) : string;
             return addTranslatedMarkers(string);
         },
 
         getPlural: function (n, string, stringPlural, scope, context) {
-            var form = gettextPlurals(this.currentLanguage, n);
-            string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
+            var fallbackLanguage = gettextFallbackLanguage(this.currentLanguage);
+            string = this.getStringFormFor(this.currentLanguage, string, n, context) ||
+                     this.getStringFormFor(fallbackLanguage, string, n, context) ||
+                     prefixDebug(n === 1 ? string : stringPlural);
             if (scope) {
                 scope.$count = n;
                 string = $interpolate(string)(scope);
@@ -230,6 +238,24 @@ angular.module('gettext').directive('translate', ["gettextCatalog", "$parse", "$
     };
 }]);
 
+angular.module("gettext").factory("gettextFallbackLanguage", function () {
+    var cache = {};
+    var pattern = /([^_]+)_[^_]+$/;
+
+    return function (langCode) {
+        if (cache[langCode]) {
+            return cache[langCode];
+        }
+
+        var matches = pattern.exec(langCode);
+        if (matches) {
+            cache[langCode] = matches[1];
+            return matches[1];
+        }
+
+        return null;
+    };
+});
 angular.module('gettext').filter('translate', ["gettextCatalog", function (gettextCatalog) {
     function filter(input, context) {
         return gettextCatalog.getString(input, null, context);

src/catalog.js

@@ -1,4 +1,4 @@
-angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $http, $cacheFactory, $interpolate, $rootScope) {
+angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, gettextFallbackLanguage, $http, $cacheFactory, $interpolate, $rootScope) {
     var catalog;
     var noContext = '$$noContext';
 
@@ -80,22 +80,30 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
             broadcastUpdated();
         },
 
-        getStringForm: function (string, n, context) {
-            var stringTable = this.strings[this.currentLanguage] || {};
+        getStringFormFor: function (language, string, n, context) {
+            if (!language) {
+                return null;
+            }
+            var stringTable = this.strings[language] || {};
             var contexts = stringTable[string] || {};
             var plurals = contexts[context || noContext] || [];
-            return plurals[n];
+            return plurals[gettextPlurals(language, n)];
         },
 
         getString: function (string, scope, context) {
-            string = this.getStringForm(string, 0, context) || prefixDebug(string);
+            var fallbackLanguage = gettextFallbackLanguage(this.currentLanguage);
+            string = this.getStringFormFor(this.currentLanguage, string, 1, context) ||
+                     this.getStringFormFor(fallbackLanguage, string, 1, context) ||
+                     prefixDebug(string);
             string = scope ? $interpolate(string)(scope) : string;
             return addTranslatedMarkers(string);
         },
 
         getPlural: function (n, string, stringPlural, scope, context) {
-            var form = gettextPlurals(this.currentLanguage, n);
-            string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
+            var fallbackLanguage = gettextFallbackLanguage(this.currentLanguage);
+            string = this.getStringFormFor(this.currentLanguage, string, n, context) ||
+                     this.getStringFormFor(fallbackLanguage, string, n, context) ||
+                     prefixDebug(n === 1 ? string : stringPlural);
             if (scope) {
                 scope.$count = n;
                 string = $interpolate(string)(scope);

src/fallback_language.js

@@ -0,0 +1,18 @@
+angular.module("gettext").factory("gettextFallbackLanguage", function () {
+    var cache = {};
+    var pattern = /([^_]+)_[^_]+$/;
+
+    return function (langCode) {
+        if (cache[langCode]) {
+            return cache[langCode];
+        }
+
+        var matches = pattern.exec(langCode);
+        if (matches) {
+            cache[langCode] = matches[1];
+            return matches[1];
+        }
+
+        return null;
+    };
+});

test/unit/catalog.js

@@ -145,4 +145,22 @@ describe("Catalog", function () {
         assert.equal(catalog.getString("Archive", {}, "verb"), "Archiveren");
         assert.equal(catalog.getString("Archive", {}, "noun"), "Archief");
     });
+
+    it("Should return string from fallback language if current language has no translation", function () {
+        var strings = { Hello: "Hallo" };
+        catalog.setStrings("nl", strings);
+        catalog.setCurrentLanguage("nl_NL");
+        assert.equal(catalog.getString("Bye"), "Bye");
+        assert.equal(catalog.getString("Hello"), "Hallo");
+    });
+
+    it("Should not return string from fallback language if current language has translation", function () {
+        var stringsEn   = { Baggage: "Baggage" };
+        var stringsEnGB = { Baggage: "Luggage" };
+        catalog.setStrings("en", stringsEn);
+        catalog.setStrings("en_GB", stringsEnGB);
+        catalog.setCurrentLanguage("en_GB");
+        assert.equal(catalog.getString("Bye"), "Bye");
+        assert.equal(catalog.getString("Baggage"), "Luggage");
+    });
 });

test/unit/fallback_language.js

@@ -0,0 +1,22 @@
+describe("Fallback languages", function () {
+    var fallback = null;
+
+    beforeEach(module("gettext"));
+
+    beforeEach(inject(function (gettextFallbackLanguage) {
+        fallback = gettextFallbackLanguage;
+    }));
+
+    it("returns base language as fallback", function () {
+        assert.equal(fallback("en_GB"), "en");
+    });
+    it("returns null for simple language codes", function () {
+        assert.isNull(fallback("nl"), null);
+    });
+    it("returns null for null", function () {
+        assert.isNull(fallback(null));
+    });
+    it("returns consistent values", function () {
+        assert.equal(fallback("de_CH"), fallback("de_CH"));
+    });
+});

test/unit/plurals.js

@@ -31,7 +31,7 @@ describe("Plurals", function () {
     it("Plural form of plural french is 1", function () {
         assert.equal(plurals("fr", 2), 1);
     });
-    it("Plural form of zero in french is 1", function () {
+    it("Plural form of zero in french is 0", function () {
         assert.equal(plurals("fr", 0), 0);
     });
     it("Plural form of 27 in arabic is 4", function () {