Do not set default locale when a request is given as an argument.

mashpie · Aug 7, 2012 · d773772 · d773772
1 parent 5df241c
commit d773772
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/i18n.js b/i18n.js
@@ -110,7 +110,7 @@ i18n.__n = function () {
 // setLocale('en') or like
 // setLocale(req, 'en')
 i18n.setLocale = function (arg1, arg2) {
-  var request = {},
+  var request = undefined,
       target_locale = arg1;
 
   if (arg2 && locales[arg2]) {
@@ -119,8 +119,12 @@ i18n.setLocale = function (arg1, arg2) {
   }
 
   if (locales[target_locale]) {
-    request.locale = target_locale;
-    defaultLocale = target_locale;
+    if (request === undefined) {
+      defaultLocale = target_locale;
+    }
+    else {
+      request.locale = target_locale;
+    }
   }
   return i18n.getLocale(request);
 };

diff --git a/test/i18n.test.js b/test/i18n.test.js
@@ -20,6 +20,8 @@ module.exports = {
     assert.equal('en', i18n.getLocale(), 'should return default setting');
     assert.equal('de', i18n.setLocale('de'), 'should return the new setting');
     assert.equal('de', i18n.getLocale(), 'should return the new setting');
+    assert.equal('en', i18n.setLocale({}, 'en'), 'should return the request setting');
+    assert.equal('de', i18n.getLocale(), 'should return the previous default setting');
   },
 
   'check singular': function () {