exvo_globalize 0.5.2 → 0.5.3

data/app/assets/javascripts/exvo_globalize_i18n.js

@@ -1,6 +1,6 @@
 //
 // exvo_globalize_i18n.js
-// Version: 0.5.2
+// Version: 0.5.3
 //
 (function() {
 
@@ -86,12 +86,17 @@
       opts = opts || {};
       opts.defaultValue = opts.defaultValue || null;
       key = I18n.keyToArray(opts.scope).concat(I18n.keyToArray(key));
-      var value = this.lookup(I18n.currentLocale(), key, opts.defaultValue);
+
+      var locale = I18n.currentLocale();
+      var value = this.lookup(locale, key, opts.defaultValue);
 
       // fall back to I18n.defaultLocale for missing translations
-      if (value == null && I18n.locale != I18n.defaultLocale) value = this.lookup(I18n.defaultLocale, key, opts.defaultLocale);
+      if (value == null && I18n.locale != I18n.defaultLocale) {
+        value = this.lookup(I18n.defaultLocale, key, opts.defaultLocale);
+        locale = I18n.defaultLocale;
+      }
 
-      if (typeof value != "string" && value) value = this.pluralize(value, opts.count);
+      if (typeof value != "string" && value) value = this.pluralize(locale, value, opts.count);
       if (typeof value == "string") value = I18n.interpolate(value, opts);
       if (value == null) value = this.missingTranslation(key)
       return value;
@@ -365,9 +370,9 @@
   };
 
   // Pluralization function
-  I18n.pluralize = function(value, count) {
+  I18n.pluralize = function(locale, value, count) {
     if (typeof count != 'number') return value;
-    return I18n.plurals[I18n.currentLocale()](value, count);
+    return I18n.plurals[locale](value, count);
   };
 
   // Default pluralization rules

data/lib/exvo_globalize/version.rb

@@ -1,3 +1,3 @@
 module ExvoGlobalize
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/javascripts/exvo_globalize_i18n_spec.js

@@ -83,6 +83,13 @@ describe("Locale fallback", function() {
     expect(I18n.t("title", {scope: "page"})).toEqual("Title") // missing translation
   })
 
+  it("falls back to I18n.defaultLocale even for missing pluralization keys", function() {
+    I18n.locale = "pl"
+    expect(I18n.t("friend", {count: 1})).toEqual("1 Friend")
+    expect(I18n.t("friend", {count: 2})).toEqual("2 Friends")
+    expect(I18n.t("friend", {count: 5})).toEqual("5 Friends")
+  })
+
 })
 
 describe("Localization of numbers", function() {
@@ -396,6 +403,13 @@ describe("Pluralizations", function() {
     expect(I18n.t("contact", {count: 22})).toEqual("22 Contacts")
   })
 
+  it("correctly pluralizes another English phrase", function() {
+    I18n.locale = "en"
+    expect(I18n.t("friend", {count: 1})).toEqual("1 Friend")
+    expect(I18n.t("friend", {count: 2})).toEqual("2 Friends")
+    expect(I18n.t("friend", {count: 22})).toEqual("22 Friends")
+  })
+
   it("correctly pluralizes the French phrase", function() {
     I18n.locale = "fr"
     expect(I18n.t("contact", {count: 0})).toEqual("0 contact")

data/spec/javascripts/fixtures/translations.js

@@ -12,6 +12,11 @@ I18n.translations = {
       other: "%{count} Contacts"
     },
 
+    friend: {
+      one: "1 Friend",
+      other: "%{count} Friends"
+    },
+
     page: {
       footer: "Footer",
       title: "Title",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo_globalize
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Go\xC5\x9Bcicki"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +02:00
+date: 2011-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency