Merge branch 'master' of https://github.com/adriantanasa/i18n-node in…

…to adriantanasa-master

# Conflicts:
#	.travis.yml
#	Makefile
#	appveyor.yml
#	package.json

README.md

@@ -138,8 +138,8 @@ i18n.configure({
     // setup some locales - other locales default to en silently
     locales:['en', 'de'],
 
-    // fall back from Dutch to German
-    fallbacks:{'nl': 'de'},
+    // fall back from Dutch to German and from any localized German (de-at, de-li etc.) to German
+    fallbacks:{'nl': 'de', 'de-*': 'de'},
 
     // you may alter a site wide default locale
     defaultLocale: 'de',

i18n.js

@@ -417,8 +417,8 @@ module.exports = (function() {
     }
 
     // consider a fallback
-    if (!locales[targetLocale] && fallbacks[targetLocale]) {
-      targetLocale = fallbacks[targetLocale];
+    if (!locales[targetLocale]) {
+      targetLocale = getFallback(targetLocale, fallbacks) || targetLocale;
     }
 
     // now set locale on object
@@ -513,8 +513,8 @@ module.exports = (function() {
       return locales;
     }
 
-    if (!locales[targetLocale] && fallbacks[targetLocale]) {
-      targetLocale = fallbacks[targetLocale];
+    if (!locales[targetLocale]) {
+      targetLocale = getFallback(targetLocale, fallbacks) || targetLocale;
     }
 
     if (locales[targetLocale]) {
@@ -705,8 +705,9 @@ module.exports = (function() {
             region = lr[1];
 
           // Check if we have a configured fallback set for this language.
-          if (fallbacks && fallbacks[lang]) {
-            fallback = fallbacks[lang];
+          var fallbackLang = getFallback(lang, fallbacks);
+          if (fallbackLang) {
+            fallback = fallbackLang;
             // Fallbacks for languages should be inserted
             // where the original, unsupported language existed.
             var acceptedLanguageIndex = acceptedLanguages.indexOf(lang);
@@ -718,8 +719,9 @@ module.exports = (function() {
           }
 
           // Check if we have a configured fallback set for the parent language of the locale.
-          if (fallbacks && fallbacks[parentLang]) {
-            fallback = fallbacks[parentLang];
+          var fallbackParentLang = getFallback(parentLang, fallbacks);
+          if (fallbackParentLang) {
+            fallback = fallbackParentLang;
             // Fallbacks for a parent language should be inserted
             // to the end of the list, so they're only picked
             // if there is no better match.
@@ -864,8 +866,8 @@ module.exports = (function() {
       locale = defaultLocale;
     }
 
-    if (!locales[locale] && fallbacks[locale]) {
-      locale = fallbacks[locale];
+    if (!locales[locale]) {
+      locale = getFallback(locale, fallbacks) || locale;
     }
 
     // attempt to read when defined as valid locale
@@ -1194,6 +1196,22 @@ module.exports = (function() {
     return filepath;
   };
 
+  /**
+   * Get locales with wildcard support
+   */
+  var getFallback = function(targetLocale, fallbacks) {
+    fallbacks = fallbacks || {};
+    if (fallbacks[targetLocale]) return fallbacks[targetLocale];
+    var fallBackLocale = null;
+    for (var key in fallbacks) {
+      if(targetLocale.match(new RegExp('^' + key.replace('*', '.*') + '$'))) {
+        fallBackLocale = fallbacks[key];
+        break;
+      }
+    }
+    return fallBackLocale;
+  };
+
   /**
    * Logging proxies
    */

locales/fr-CA.json

@@ -0,0 +1 @@
+{}

test/i18n.configureLocales.js

@@ -12,7 +12,7 @@ describe('locales configuration', function() {
       directory: directory
     });
 
-    var expected = ['de', 'de-AT', 'de-DE', 'en', 'en-GB', 'en-US', 'fr', 'nl', 'ru', 'tr-TR'].sort();
+    var expected = ['de', 'de-AT', 'de-DE', 'en', 'en-GB', 'en-US', 'fr', 'fr-CA', 'nl', 'ru', 'tr-TR'].sort();
     should.deepEqual(i18n.getLocales(), expected);
 
     done();

test/i18n.fallbacks.js

@@ -15,9 +15,9 @@ describe('Fallbacks', function() {
     beforeEach(function() {
 
       i18n.configure({
-        locales: ['en', 'de'],
+        locales: ['en', 'de', 'fr'],
         defaultLocale: 'en',
-        fallbacks: { 'foo': 'de', 'de-AT': 'de' },
+        fallbacks: { 'foo': 'de', 'de-AT': 'de', 'fr-*': 'fr' },
         directory: './locales',
         register: req
       });
@@ -45,11 +45,21 @@ describe('Fallbacks', function() {
       i18n.init(req);
       i18n.getLocale(req).should.equal('de');
     });
+    it('should fall back to "fr" for locale "fr-CA"', function() {
+      req.headers['accept-language'] = 'fr-CA';
+      i18n.init(req);
+      i18n.getLocale(req).should.equal('fr');
+    });
     it('should fall back to "de" for second-order locale "de-AT"', function() {
       req.headers['accept-language'] = 'de-DK,de-AT';
       i18n.init(req);
       i18n.getLocale(req).should.equal('de');
     });
+    it('should fall back to "fr" for second-order locale "fr-CA"', function() {
+      req.headers['accept-language'] = 'de-DK,fr-CA,de-AT';
+      i18n.init(req);
+      i18n.getLocale(req).should.equal('fr');
+    });
     it('should use default "en" for valid locale request (ignoring fallbacks)', function() {
       req.headers['accept-language'] = 'en-US,en,de-DK,de-AT';
       i18n.init(req);
@@ -100,9 +110,9 @@ describe('Fallbacks', function() {
       i18n = require(i18nFilename);
 
       i18n.configure({
-        locales: ['en-US', 'de-DE'],
+        locales: ['en-US', 'de-DE', 'fr-CA'],
         defaultLocale: 'en-US',
-        fallbacks: { 'de': 'de-DE' },
+        fallbacks: { 'de': 'de-DE', 'fr*': 'fr-CA' },
         directory: './locales',
         register: req
       });
@@ -124,6 +134,11 @@ describe('Fallbacks', function() {
       i18n.init(req);
       i18n.getLocale(req).should.equal('de-DE');
     });
+    it('should fall back to "fr-CA" for language "fr"', function() {
+      req.headers['accept-language'] = 'fr';
+      i18n.init(req);
+      i18n.getLocale(req).should.equal('fr-CA');
+    });
   });
 
   describe('Keep valid locale', function() {