i18n-js 3.3.0 → 3.9.2

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "3.3.0",
+  "version": "3.9.2",
   "description": "A javascript library similar to Ruby on Rails i18n gem",
   "author": "Nando Vieira",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "i18n"
   ],
   "devDependencies": {
-    "jasmine-node": "^1.14.5"
+    "jasmine-node": "^3.0.0"
   },
   "main": "app/assets/javascripts/i18n.js",
   "scripts": {

data/spec/fixtures/js_available_locales_custom.yml

@@ -0,0 +1 @@
+js_available_locales: ["en", "foo"]

data/spec/fixtures/{js_file_with_namespace_and_pretty_print.yml → js_file_with_namespace_prefix_and_pretty_print.yml}

@@ -5,3 +5,5 @@ translations:
     only: '*'
     namespace: "Foo"
     pretty_print: true
+    prefix: "import random from 'random-library';\n"
+    suffix: "//test"

data/spec/fixtures/locales.yml

@@ -1,5 +1,9 @@
 en:
   number:
+    human:
+      decimal_units:
+        units:
+          million: Million
     format:
       separator: "."
       delimiter: ","
@@ -40,6 +44,29 @@ en:
   merge_plurals:
     one: Apple
     other: Apples
+  merge_plurals_with_no_overrides:
+    zero: "No Apple"
+    one: Apple
+    other: Apples
+  merge_plurals_with_partial_overrides:
+    one: Cat
+    other: Cats
+
+es:
+  number:
+    human:
+      decimal_units:
+        units:
+          million:
+            one: millón
+            other: millones
+
+ru:
+  merge_plurals_with_no_overrides:
+    one: кот
+    few: кошек
+    many: кошка
+    other: кошек
 
 de:
   fallback_test: "Erfolg"
@@ -89,6 +116,17 @@ fr:
     one: Pomme
     other: Pommes
 
+en-US:
+  merge_plurals_with_no_overrides:
+    zero:
+    one:
+    other:
+  merge_plurals_with_partial_overrides:
+    one: Cat
+    few:
+    many:
+    other:
+
 ja:
   admin:
     show:

data/spec/fixtures/merge_plurals_with_no_overrides.yml

@@ -0,0 +1,4 @@
+translations:
+  - file: "tmp/i18n-js/merge_plurals_with_no_overrides.js"
+    only:
+      - "*.merge_plurals_with_no_overrides"

data/spec/fixtures/merge_plurals_with_partial_overrides.yml

@@ -0,0 +1,4 @@
+translations:
+  - file: "tmp/i18n-js/merge_plurals_with_partial_overrides.js"
+    only:
+      - "*.merge_plurals_with_partial_overrides"

data/spec/fixtures/millions.yml

@@ -0,0 +1,4 @@
+translations:
+  - file: "tmp/i18n-js/millions.js"
+    only:
+      - "*.number.human.decimal_units.units"

data/spec/js/dates.spec.js

@@ -132,6 +132,7 @@ describe("Dates", function(){
 
     // 24-hour without padding
     expect(I18n.strftime(date, "%-H")).toEqual("7");
+    expect(I18n.strftime(date, "%k")).toEqual("7");
 
     // 12-hour without padding
     expect(I18n.strftime(date, "%-I")).toEqual("7");

data/spec/js/json_parsable.spec.js

@@ -0,0 +1,14 @@
+describe("JSON.parse", function () {
+  it('should parse', function () {
+    expect(JSON.parse('{"a":"Test\'s"}')).toEqual({
+      a: "Test's"
+    })
+
+    expect(JSON.parse('{"a":"say \\"hello\\""}')).toEqual({
+      a: 'say "hello"'
+    });
+    expect(JSON.parse('{"double-backslash-in-double-quote":"\\"\\\\\\\\\\""}')).toEqual({
+      'double-backslash-in-double-quote': '"\\\\"'
+    });
+  })
+})

data/spec/js/localization.spec.js

@@ -10,45 +10,69 @@ describe("Localization", function(){
     I18n.translations = Translations();
   });
 
+  it("sets bound alias", function() {
+    expect(I18n.l).toEqual(jasmine.any(Function));
+    expect(I18n.l).not.toBe(I18n.localize);
+  });
+
   it("localizes number", function(){
-    expect(I18n.l("number", 1234567)).toEqual("1,234,567.000");
+    expect(I18n.localize("number", 1234567)).toEqual("1,234,567.000");
+  });
+
+  it("localizes number with 'l' shortcut", function(){
+    var l = I18n.l;
+    expect(l("number", 1234567)).toEqual("1,234,567.000");
   });
 
   it("localizes currency", function(){
-    expect(I18n.l("currency", 1234567)).toEqual("$1,234,567.00");
+    expect(I18n.localize("currency", 1234567)).toEqual("$1,234,567.00");
   });
 
   it("localizes date strings", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("date.formats.default", "2009-11-29")).toEqual("29/11/2009");
-    expect(I18n.l("date.formats.short", "2009-01-07")).toEqual("07 de Janeiro");
-    expect(I18n.l("date.formats.long", "2009-01-07")).toEqual("07 de Janeiro de 2009");
+    expect(I18n.localize("date.formats.default", "2009-11-29")).toEqual("29/11/2009");
+    expect(I18n.localize("date.formats.short", "2009-01-07")).toEqual("07 de Janeiro");
+    expect(I18n.localize("date.formats.long", "2009-01-07")).toEqual("07 de Janeiro de 2009");
+  });
+
+  it("localizes strings with locale from options", function(){
+    I18n.locale = "en";
+
+    expect(I18n.localize("date.formats.default", "2009-11-29", { locale: "pt-BR" })).toEqual("29/11/2009");
+    expect(I18n.localize("date.formats.short", "2009-01-07", { locale: "pt-BR" })).toEqual("07 de Janeiro");
+    expect(I18n.localize("date.formats.long", "2009-01-07", { locale: "pt-BR" })).toEqual("07 de Janeiro de 2009");
+    expect(I18n.localize("time.formats.default", "2009-11-29 15:07:59", { locale: "pt-BR" })).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.short", "2009-01-07 09:12:35", { locale: "pt-BR" })).toEqual("07/01, 09:12 h");
+    expect(I18n.localize("time.formats.long", "2009-11-29 15:07:59", { locale: "pt-BR" })).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("number", 1234567, { locale: "pt-BR" })).toEqual("1,234,567.000");
+    expect(I18n.localize("currency", 1234567, { locale: "pt-BR" })).toEqual("R$ 1.234.567,00");
+    expect(I18n.localize("percentage", 123.45, { locale: "pt-BR" })).toEqual("123,45%");
   });
 
   it("localizes time strings", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("time.formats.default", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
-    expect(I18n.l("time.formats.short", "2009-01-07 09:12:35")).toEqual("07/01, 09:12 h");
-    expect(I18n.l("time.formats.long", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.default", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.short", "2009-01-07 09:12:35")).toEqual("07/01, 09:12 h");
+    expect(I18n.localize("time.formats.long", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
   });
 
   it("return 'Invalid Date' or original value for invalid input", function(){
-    expect(I18n.l("time.formats.default", "")).toEqual("Invalid Date");
-    expect(I18n.l("time.formats.default", null)).toEqual(null);
-    expect(I18n.l("time.formats.default", undefined)).toEqual(undefined);
+    expect(I18n.localize("time.formats.default", "")).toEqual("Invalid Date");
+    expect(I18n.localize("time.formats.default", null)).toEqual(null);
+    expect(I18n.localize("time.formats.default", undefined)).toEqual(undefined);
   });
 
   it("localizes date/time strings with placeholders", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("date.formats.short_with_placeholders", "2009-01-07", { p1: "!", p2: "?" })).toEqual("07 de Janeiro ! ?");
-    expect(I18n.l("time.formats.short_with_placeholders", "2009-01-07 09:12:35", { p1: "!" })).toEqual("07/01, 09:12 h !");
+    expect(I18n.localize("date.formats.short_with_placeholders", "2009-01-07", { p1: "!", p2: "?" })).toEqual("07 de Janeiro ! ?");
+    expect(I18n.localize("time.formats.short_with_placeholders", "2009-01-07 09:12:35", { p1: "!" })).toEqual("07/01, 09:12 h !");
   });
 
   it("localizes percentage", function(){
     I18n.locale = "pt-BR";
-    expect(I18n.l("percentage", 123.45)).toEqual("123,45%");
+    expect(I18n.localize("percentage", 123.45)).toEqual("123,45%");
   });
 });

data/spec/js/numbers.spec.js

@@ -150,6 +150,10 @@ describe("Numbers", function(){
     expect(I18n.toHumanSize(1024 * 1.6, {precision: 0})).toEqual("2KB");
   });
 
+  it("returns number as human size using custom scope", function(){
+    expect(I18n.toHumanSize(1024 * 1024, {scope: "extended"})).toEqual("1Megabyte");
+  });
+
   it("formats numbers with strip insignificant zero", function() {
     options = {separator: ".", delimiter: ",", strip_insignificant_zeros: true};
 

data/spec/js/pluralization.spec.js

@@ -10,8 +10,9 @@ describe("Pluralization", function(){
     I18n.translations = Translations();
   });
 
-  it("sets alias", function() {
-    expect(I18n.p).toEqual(I18n.pluralize);
+  it("sets bound alias", function() {
+    expect(I18n.p).toEqual(jasmine.any(Function));
+    expect(I18n.p).not.toBe(I18n.pluralize);
   });
 
   it("pluralizes scope", function(){
@@ -20,6 +21,13 @@ describe("Pluralization", function(){
     expect(I18n.p(5, "inbox")).toEqual("You have 5 messages");
   });
 
+  it("pluralizes scope with 'p' shortcut", function(){
+    var p = I18n.p;
+    expect(p(0, "inbox")).toEqual("You have no messages");
+    expect(p(1, "inbox")).toEqual("You have 1 message");
+    expect(p(5, "inbox")).toEqual("You have 5 messages");
+  });
+
   it("pluralizes using the 'other' scope", function(){
     I18n.translations["en"]["inbox"]["zero"] = null;
     expect(I18n.p(0, "inbox")).toEqual("You have 0 messages");
@@ -140,6 +148,15 @@ describe("Pluralization", function(){
     expect(I18n.p(5, "inbox", { count: 5 })).toEqual('You have 5 messages');
   });
 
+  it("fallback to default locale when I18n.fallbacks is enabled and value is null", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["pt-BR"].inbox = null;
+    expect(I18n.p(0, "inbox", { count: 0 })).toEqual("You have no messages");
+    expect(I18n.p(1, "inbox", { count: 1 })).toEqual("You have 1 message");
+    expect(I18n.p(5, "inbox", { count: 5 })).toEqual("You have 5 messages");
+  });
+
   it("fallback to 'other' scope", function() {
     I18n.locale = "pt-BR";
     I18n.fallbacks = true;

data/spec/js/require.js

@@ -1,7 +1,7 @@
 /** vim: et:ts=4:sw=4:sts=4
  * @license RequireJS 2.1.16 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
+ * see: https://github.com/jrburke/requirejs for details
  */
 //Not using strict: uneven strict support in browsers, #392, and causes
 //problems with requirejs.exec()/transpiler plugins that may not be strict.
@@ -163,7 +163,7 @@ var requirejs, require, define;
      * @returns {Error}
      */
     function makeError(id, msg, err, requireModules) {
-        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+        var e = new Error(msg + '\nhttps://requirejs.org/docs/errors.html#' + id);
         e.requireType = id;
         e.requireModules = requireModules;
         if (err) {
@@ -1810,7 +1810,7 @@ var requirejs, require, define;
         head = s.head = document.getElementsByTagName('head')[0];
         //If BASE tag is in play, using appendChild is a problem for IE6.
         //When that browser dies, this can be removed. Details in this jQuery bug:
-        //http://dev.jquery.com/ticket/2709
+        //https://dev.jquery.com/ticket/2709
         baseElement = document.getElementsByTagName('base')[0];
         if (baseElement) {
             head = s.head = baseElement.parentNode;
@@ -1829,7 +1829,7 @@ var requirejs, require, define;
      */
     req.createNode = function (config, moduleName, url) {
         var node = config.xhtml ?
-                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                document.createElementNS('https://www.w3.org/1999/xhtml', 'html:script') :
                 document.createElement('script');
         node.type = config.scriptType || 'text/javascript';
         node.charset = 'utf-8';

data/spec/js/translate.spec.js

@@ -10,83 +10,98 @@ describe("Translate", function(){
     I18n.translations = Translations();
   });
 
+  it("sets bound alias", function() {
+    expect(I18n.t).toEqual(jasmine.any(Function));
+    expect(I18n.t).not.toBe(I18n.translate);
+  });
+
   it("returns translation for single scope", function(){
-    expect(I18n.t("hello")).toEqual("Hello World!");
+    expect(I18n.translate("hello")).toEqual("Hello World!");
+  });
+
+  it("returns translation with 't' shortcut", function(){
+    var t = I18n.t;
+    expect(t("hello")).toEqual("Hello World!");
   });
 
   it("returns translation as object", function(){
-    expect(I18n.t("greetings")).toEqual(I18n.translations.en.greetings);
+    expect(I18n.translate("greetings")).toEqual(I18n.translations.en.greetings);
   });
 
   it("returns missing message translation for valid scope with null", function(){
-    actual = I18n.t("null_key");
+    actual = I18n.translate("null_key");
     expected = '[missing "en.null_key" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns missing message translation for invalid scope", function(){
-    actual = I18n.t("invalid.scope");
+    actual = I18n.translate("invalid.scope");
     expected = '[missing "en.invalid.scope" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns missing message translation with provided locale for invalid scope", function(){
-    actual = I18n.t("invalid.scope", { locale: "ja" });
+    actual = I18n.translate("invalid.scope", { locale: "ja" });
     expected = '[missing "ja.invalid.scope" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns guessed translation if missingBehaviour is set to guess", function(){
     I18n.missingBehaviour = 'guess'
-    actual = I18n.t("invalid.thisIsAutomaticallyGeneratedTranslation");
-    expected = 'this is automatically generated translation';
-    expect(actual).toEqual(expected);
+
+    var actual_1 = I18n.translate("invalid.thisIsAutomaticallyGeneratedTranslation");
+    var expected_1 = 'this is automatically generated translation';
+    expect(actual_1).toEqual(expected_1);
+
+    var actual_2 = I18n.translate("invalid.this_is_automatically_generated_translation");
+    var expected_2 = 'this is automatically generated translation';
+    expect(actual_2).toEqual(expected_2);
   });
 
   it("returns guessed translation with prefix if missingBehaviour is set to guess and prefix is also provided", function(){
     I18n.missingBehaviour = 'guess'
     I18n.missingTranslationPrefix = 'EE: '
-    actual = I18n.t("invalid.thisIsAutomaticallyGeneratedTranslation");
+    actual = I18n.translate("invalid.thisIsAutomaticallyGeneratedTranslation");
     expected = 'EE: this is automatically generated translation';
     expect(actual).toEqual(expected);
   });
 
   it("returns missing message translation for valid scope with scope", function(){
-    actual = I18n.t("monster", {scope: "greetings"});
+    actual = I18n.translate("monster", {scope: "greetings"});
     expected = '[missing "en.greetings.monster" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns translation for single scope on a custom locale", function(){
     I18n.locale = "pt-BR";
-    expect(I18n.t("hello")).toEqual("Olá Mundo!");
+    expect(I18n.translate("hello")).toEqual("Olá Mundo!");
   });
 
   it("returns translation for multiple scopes", function(){
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("returns translation with default locale option", function(){
-    expect(I18n.t("hello", {locale: "en"})).toEqual("Hello World!");
-    expect(I18n.t("hello", {locale: "pt-BR"})).toEqual("Olá Mundo!");
+    expect(I18n.translate("hello", {locale: "en"})).toEqual("Hello World!");
+    expect(I18n.translate("hello", {locale: "pt-BR"})).toEqual("Olá Mundo!");
   });
 
   it("fallbacks to the default locale when I18n.fallbacks is enabled", function(){
     I18n.locale = "pt-BR";
     I18n.fallbacks = true;
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("fallbacks to default locale when providing an unknown locale", function(){
     I18n.locale = "fr";
     I18n.fallbacks = true;
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("fallbacks to less specific locale", function(){
     I18n.locale = "de-DE";
     I18n.fallbacks = true;
-    expect(I18n.t("hello")).toEqual("Hallo Welt!");
+    expect(I18n.translate("hello")).toEqual("Hallo Welt!");
   });
 
   describe("when a 3-part locale is used", function(){
@@ -96,15 +111,15 @@ describe("Translate", function(){
     });
 
     it("fallbacks to 2-part locale when absent", function(){
-      expect(I18n.t("cat")).toEqual("貓");
+      expect(I18n.translate("cat")).toEqual("貓");
     });
 
     it("fallbacks to 1-part locale when 2-part missing requested translation", function(){
-      expect(I18n.t("dog")).toEqual("狗");
+      expect(I18n.translate("dog")).toEqual("狗");
     });
 
     it("fallbacks to 2-part for the first time", function(){
-      expect(I18n.t("dragon")).toEqual("龍");
+      expect(I18n.translate("dragon")).toEqual("龍");
     });
   });
 
@@ -115,7 +130,7 @@ describe("Translate", function(){
       return ["nb"];
     };
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   it("fallbacks using custom rules (array)", function() {
@@ -123,7 +138,7 @@ describe("Translate", function(){
     I18n.fallbacks = true;
     I18n.locales["no"] = ["no", "nb"];
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   it("fallbacks using custom rules (string)", function() {
@@ -131,25 +146,25 @@ describe("Translate", function(){
     I18n.fallbacks = true;
     I18n.locales["no"] = "nb";
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   describe("when provided default values", function() {
     it("uses scope provided in defaults if scope doesn't exist", function() {
-      actual = I18n.t("Hello!", {defaults: [{scope: "greetings.stranger"}]});
+      actual = I18n.translate("Hello!", {defaults: [{scope: "greetings.stranger"}]});
       expect(actual).toEqual("Hello stranger!");
     });
 
     it("continues to fallback until a scope is found", function() {
       var defaults = [{scope: "foo"}, {scope: "hello"}];
 
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello World!");
     });
 
     it("uses message if specified as a default", function() {
       var defaults = [{message: "Hello all!"}];
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello all!");
     });
 
@@ -158,7 +173,7 @@ describe("Translate", function(){
           {scope: "bar"}
         , {message: "Hello all!"}
         , {scope: "hello"}];
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello all!");
     });
 
@@ -167,7 +182,7 @@ describe("Translate", function(){
           defaults: [{scope: "bar"}]
         , defaultValue: "Hello all!"
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("Hello all!");
     });
 
@@ -176,7 +191,7 @@ describe("Translate", function(){
           defaults: [{scope: "hello"}]
         , defaultValue: "Hello all!"
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("Hello World!");
     })
 
@@ -187,36 +202,36 @@ describe("Translate", function(){
           return scope.toUpperCase();
         }
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("FOO");
     })
 
     it("pluralizes using the correct scope if translation is found within default scope", function() {
       expect(I18n.translations["en"]["mailbox"]).toEqual(undefined);
-      actual = I18n.t("mailbox.inbox", {count: 1, defaults: [{scope: "inbox"}]});
-      expected = I18n.t("inbox", {count: 1})
+      actual = I18n.translate("mailbox.inbox", {count: 1, defaults: [{scope: "inbox"}]});
+      expected = I18n.translate("inbox", {count: 1})
       expect(actual).toEqual(expected)
     })
   });
 
   it("uses default value for simple translation", function(){
-    actual = I18n.t("warning", {defaultValue: "Warning!"});
+    actual = I18n.translate("warning", {defaultValue: "Warning!"});
     expect(actual).toEqual("Warning!");
   });
 
   it("uses default value for plural translation", function(){
-    actual = I18n.t("message", {defaultValue: { one: '%{count} message', other: '%{count} messages'}, count: 1});
+    actual = I18n.translate("message", {defaultValue: { one: '%{count} message', other: '%{count} messages'}, count: 1});
     expect(actual).toEqual("1 message");
   });
 
   it("uses default value for unknown locale", function(){
     I18n.locale = "fr";
-    actual = I18n.t("warning", {defaultValue: "Warning!"});
+    actual = I18n.translate("warning", {defaultValue: "Warning!"});
     expect(actual).toEqual("Warning!");
   });
 
   it("uses default value with interpolation", function(){
-    actual = I18n.t(
+    actual = I18n.translate(
       "alert",
       {defaultValue: "Attention! {{message}}", message: "You're out of quota!"}
     );
@@ -225,33 +240,33 @@ describe("Translate", function(){
   });
 
   it("ignores default value when scope exists", function(){
-    actual = I18n.t("hello", {defaultValue: "What's up?"});
+    actual = I18n.translate("hello", {defaultValue: "What's up?"});
     expect(actual).toEqual("Hello World!");
   });
 
   it("returns translation for custom scope separator", function(){
     I18n.defaultSeparator = "•";
-    actual = I18n.t("greetings•stranger");
+    actual = I18n.translate("greetings•stranger");
     expect(actual).toEqual("Hello stranger!");
   });
 
   it("returns boolean values", function() {
-    expect(I18n.t("booleans.yes")).toEqual(true);
-    expect(I18n.t("booleans.no")).toEqual(false);
+    expect(I18n.translate("booleans.yes")).toEqual(true);
+    expect(I18n.translate("booleans.no")).toEqual(false);
   });
 
   it("escapes $ when doing substitution (IE)", function(){
     I18n.locale = "en";
 
-    expect(I18n.t("paid", {price: "$0"})).toEqual("You were paid $0");
-    expect(I18n.t("paid", {price: "$0.12"})).toEqual("You were paid $0.12");
-    expect(I18n.t("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
+    expect(I18n.translate("paid", {price: "$0"})).toEqual("You were paid $0");
+    expect(I18n.translate("paid", {price: "$0.12"})).toEqual("You were paid $0.12");
+    expect(I18n.translate("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
   });
 
   it("replaces all occurrences of escaped $", function(){
     I18n.locale = "en";
 
-    expect(I18n.t("paid_with_vat", {
+    expect(I18n.translate("paid_with_vat", {
       price: "$0.12",
       vat: "$0.02"}
     )).toEqual("You were paid $0.12 (incl. VAT $0.02)");
@@ -259,20 +274,20 @@ describe("Translate", function(){
 
   it("sets default scope", function(){
     var options = {scope: "greetings"};
-    expect(I18n.t("stranger", options)).toEqual("Hello stranger!");
+    expect(I18n.translate("stranger", options)).toEqual("Hello stranger!");
   });
 
   it("accepts the scope as an array", function(){
-    expect(I18n.t(["greetings", "stranger"])).toEqual("Hello stranger!");
+    expect(I18n.translate(["greetings", "stranger"])).toEqual("Hello stranger!");
   });
 
   it("accepts the scope as an array using a base scope", function(){
-    expect(I18n.t(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
+    expect(I18n.translate(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
   });
 
   it("returns an array with values interpolated", function(){
     var options = {value: 314};
-    expect(I18n.t("arrayWithParams", options)).toEqual([
+    expect(I18n.translate("arrayWithParams", options)).toEqual([
       null,
       "An item with a param of " + options.value,
       "Another item with a param of " + options.value,
@@ -281,4 +296,9 @@ describe("Translate", function(){
       {foo: "bar"}
     ]);
   });
+
+
+  it("returns value with key containing dot but different separator specified", function() {
+    expect(I18n.t(["A implies B means something."], {scope: "sentences_with_dots", separator: "|"})).toEqual("A implies B means that when A is true, B must be true.");
+  });
 });