added use of local locale to __ and __n

mashpie · Jan 28, 2013 · c6e720f · c6e720f
1 parent cb79a25
commit c6e720f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/i18n.js b/i18n.js
@@ -83,6 +83,9 @@ i18n.__ = function (phrase) {
   if (this && this.scope) {
     locale = this.scope.locale;
   }
+  if (this && this.locale) {
+    locale = this.locale;
+  }
   msg = translate(locale, phrase);
   if (arguments.length > 1) {
     msg = vsprintf(msg, Array.prototype.slice.call(arguments, 1));
@@ -95,6 +98,9 @@ i18n.__n = function (singular, plural, count) {
   if (this && this.scope) {
     locale = this.scope.locale;
   }
+  if (this && this.locale) {
+    locale = this.locale;
+  }
   msg = translate(locale, singular, plural);
 
   if (parseInt(count, 10) > 1) {