i18n-js 3.5.1 → 3.8.1

data/app/assets/javascripts/i18n.js

@@ -402,7 +402,7 @@
 
     while (locales.length) {
       locale = locales.shift();
-      scopes = fullScope.split(this.defaultSeparator);
+      scopes = fullScope.split(options.separator || this.defaultSeparator);
       translations = this.translations[locale];
 
       if (!translations) {
@@ -459,7 +459,7 @@
 
     while (locales.length) {
       locale = locales.shift();
-      scopes = scope.split(this.defaultSeparator);
+      scopes = scope.split(options.separator || this.defaultSeparator);
       translations = this.translations[locale];
 
       if (!translations) {
@@ -679,13 +679,13 @@
       var s = scope.split('.').slice(-1)[0];
       //replace underscore with space && camelcase with space and lowercase letter
       return (this.missingTranslationPrefix.length > 0 ? this.missingTranslationPrefix : '') +
-          s.replace('_',' ').replace(/([a-z])([A-Z])/g,
+          s.replace(/_/g,' ').replace(/([a-z])([A-Z])/g,
           function(match, p1, p2) {return p1 + ' ' + p2.toLowerCase()} );
     }
 
     var localeForTranslation = (options != null && options.locale != null) ? options.locale : this.currentLocale();
     var fullScope           = this.getFullScope(scope, options);
-    var fullScopeWithLocale = [localeForTranslation, fullScope].join(this.defaultSeparator);
+    var fullScopeWithLocale = [localeForTranslation, fullScope].join(options.separator || this.defaultSeparator);
 
     return '[missing "' + fullScopeWithLocale + '" translation]';
   };
@@ -779,8 +779,8 @@
   I18n.toCurrency = function(number, options) {
     options = this.prepareOptions(
         options
-      , this.lookup("number.currency.format")
-      , this.lookup("number.format")
+      , this.lookup("number.currency.format", options)
+      , this.lookup("number.format", options)
       , CURRENCY_FORMAT
     );
 
@@ -799,17 +799,17 @@
 
     switch (scope) {
       case "currency":
-        return this.toCurrency(value);
+        return this.toCurrency(value, options);
       case "number":
-        scope = this.lookup("number.format");
+        scope = this.lookup("number.format", options);
         return this.toNumber(value, scope);
       case "percentage":
-        return this.toPercentage(value);
+        return this.toPercentage(value, options);
       default:
         var localizedValue;
 
         if (scope.match(/^(date|time)/)) {
-          localizedValue = this.toTime(scope, value);
+          localizedValue = this.toTime(scope, value, options);
         } else {
           localizedValue = value.toString();
         }
@@ -914,8 +914,8 @@
   //     %Y     - Year with century
   //     %z/%Z  - Timezone offset (+0545)
   //
-  I18n.strftime = function(date, format) {
-    var options = this.lookup("date")
+  I18n.strftime = function(date, format, options) {
+    var options = this.lookup("date", options)
       , meridianOptions = I18n.meridian()
     ;
 
@@ -984,9 +984,9 @@
   };
 
   // Convert the given dateString into a formatted date.
-  I18n.toTime = function(scope, dateString) {
+  I18n.toTime = function(scope, dateString, options) {
     var date = this.parseDate(dateString)
-      , format = this.lookup(scope)
+      , format = this.lookup(scope, options)
     ;
 
     // A date input of `null` or `undefined` will be returned as-is
@@ -1003,15 +1003,15 @@
       return date_string;
     }
 
-    return this.strftime(date, format);
+    return this.strftime(date, format, options);
   };
 
   // Convert a number into a formatted percentage value.
   I18n.toPercentage = function(number, options) {
     options = this.prepareOptions(
         options
-      , this.lookup("number.percentage.format")
-      , this.lookup("number.format")
+      , this.lookup("number.percentage.format", options)
+      , this.lookup("number.format", options)
       , PERCENTAGE_FORMAT
     );
 
@@ -1025,6 +1025,7 @@
       , iterations = 0
       , unit
       , precision
+      , fullScope
     ;
 
     while (size >= kb && iterations < 4) {
@@ -1033,10 +1034,12 @@
     }
 
     if (iterations === 0) {
-      unit = this.t("number.human.storage_units.units.byte", {count: size});
+      fullScope = this.getFullScope("number.human.storage_units.units.byte", options);
+      unit = this.t(fullScope, {count: size});
       precision = 0;
     } else {
-      unit = this.t("number.human.storage_units.units." + SIZE_UNITS[iterations]);
+      fullScope = this.getFullScope("number.human.storage_units.units." + SIZE_UNITS[iterations], options);
+      unit = this.t(fullScope);
       precision = (size - Math.floor(size) === 0) ? 0 : 1;
     }
 
@@ -1053,7 +1056,7 @@
 
     // Deal with the scope as an array.
     if (isArray(scope)) {
-      scope = scope.join(this.defaultSeparator);
+      scope = scope.join(options.separator || this.defaultSeparator);
     }
 
     // Deal with the scope option provided through the second argument.
@@ -1061,7 +1064,7 @@
     //    I18n.t('hello', {scope: 'greetings'});
     //
     if (options.scope) {
-      scope = [options.scope, scope].join(this.defaultSeparator);
+      scope = [options.scope, scope].join(options.separator || this.defaultSeparator);
     }
 
     return scope;

data/gemfiles/i18n_1_8.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "i18n", "~> 1.8.0"
+
+gemspec path: "../"

data/i18n-js.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "i18n", ">= 0.6.6"
 
-  s.add_development_dependency "appraisal", "~> 2.0"
+  s.add_development_dependency "appraisal", "~> 2.3"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rake", "~> 12.0"
   s.add_development_dependency "gem-release", ">= 0.7"

data/lib/i18n/js.rb

@@ -4,6 +4,7 @@ require "i18n"
 
 require "i18n/js/utils"
 require "i18n/js/private/hash_with_symbol_keys"
+require "i18n/js/private/config_store"
 
 module I18n
   module JS
@@ -26,6 +27,8 @@ module I18n
 
     def self.config_file_path=(new_path)
       @config_file_path = new_path
+      # new config file path = need to re-read config from new file
+      Private::ConfigStore.instance.flush_cache
     end
 
     # Allow using a different backend than the one globally configured
@@ -108,14 +111,16 @@ module I18n
     # Load configuration file for partial exporting and
     # custom output directory
     def self.config
-      if config_file_exists?
-        erb_result_from_yaml_file = ERB.new(File.read(config_file_path)).result
-        Private::HashWithSymbolKeys.new(
-          (::YAML.load(erb_result_from_yaml_file) || {})
-        )
-      else
-        Private::HashWithSymbolKeys.new({})
-      end.freeze
+      Private::ConfigStore.instance.fetch do
+        if config_file_exists?
+          erb_result_from_yaml_file = ERB.new(File.read(config_file_path)).result
+          Private::HashWithSymbolKeys.new(
+            (::YAML.load(erb_result_from_yaml_file) || {})
+          )
+        else
+          Private::HashWithSymbolKeys.new({})
+        end.freeze
+      end
     end
 
     # @api private

data/lib/i18n/js/formatters/base.rb

@@ -2,11 +2,12 @@ module I18n
   module JS
     module Formatters
       class Base
-        def initialize(js_extend: false, namespace: nil, pretty_print: false, prefix: nil)
+        def initialize(js_extend: false, namespace: nil, pretty_print: false, prefix: nil, suffix: nil)
           @js_extend    = js_extend
           @namespace    = namespace
           @pretty_print = pretty_print
           @prefix = prefix
+          @suffix = suffix
         end
 
         protected

data/lib/i18n/js/formatters/js.rb

@@ -9,7 +9,7 @@ module I18n
           translations.each do |locale, translations_for_locale|
             contents << line(locale, format_json(translations_for_locale))
           end
-          contents
+          contents << (@suffix || '')
         end
 
         protected

data/lib/i18n/js/private/config_store.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "singleton"
+
+module I18n
+  module JS
+    # @api private
+    module Private
+      # Caching implementation for I18n::JS.config
+      #
+      # @api private
+      class ConfigStore
+        include Singleton
+
+        def fetch
+          return @config if @config
+
+          yield.tap do |obj|
+            raise AugumentError, "unexpected falsy object from block" unless obj
+
+            @config = obj
+          end
+        end
+
+        def flush_cache
+          @config = nil
+        end
+      end
+    end
+  end
+end

data/lib/i18n/js/segment.rb

@@ -7,7 +7,7 @@ module I18n
 
     # Class which enscapulates a translations hash and outputs a single JSON translation file
     class Segment
-      OPTIONS = [:namespace, :pretty_print, :js_extend, :prefix, :sort_translation_keys, :json_only].freeze
+      OPTIONS = [:namespace, :pretty_print, :js_extend, :prefix, :suffix, :sort_translation_keys, :json_only].freeze
       LOCALE_INTERPOLATOR = /%\{locale\}/
 
       attr_reader *([:file, :translations] | OPTIONS)
@@ -25,6 +25,7 @@ module I18n
         @pretty_print = !!options[:pretty_print]
         @js_extend    = options.key?(:js_extend) ? !!options[:js_extend] : true
         @prefix       = options.key?(:prefix) ? options[:prefix] : nil
+        @suffix       = options.key?(:suffix) ? options[:suffix] : nil
         @sort_translation_keys = options.key?(:sort_translation_keys) ? !!options[:sort_translation_keys] : true
         @json_only = options.key?(:json_only) ? !!options[:json_only] : false
       end
@@ -70,7 +71,9 @@ module I18n
         { js_extend: @js_extend,
           namespace: @namespace,
           pretty_print: @pretty_print,
-          prefix: @prefix }
+          prefix: @prefix,
+          suffix: @suffix
+        }
       end
     end
   end

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.5.1"
+    VERSION = "3.8.1"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "3.5.1",
+  "version": "3.8.0",
   "description": "A javascript library similar to Ruby on Rails i18n gem",
   "author": "Nando Vieira",
   "license": "MIT",

data/spec/fixtures/js_file_with_namespace_prefix_and_pretty_print.yml

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

data/spec/js/localization.spec.js

@@ -36,6 +36,20 @@ describe("Localization", function(){
     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";
 

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/translate.spec.js

@@ -48,9 +48,14 @@ describe("Translate", function(){
 
   it("returns guessed translation if missingBehaviour is set to guess", function(){
     I18n.missingBehaviour = 'guess'
-    actual = I18n.translate("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(){
@@ -291,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.");
+  });
 });

data/spec/js/translations.js

@@ -58,6 +58,18 @@
           }
         }
 
+      , extended: {
+          number: {
+            human: {
+              storage_units: {
+                  units: {
+                    "mb": "Megabyte"
+                }
+              }
+            }
+          }
+        }
+
       , arrayWithParams: [
         null,
         "An item with a param of {{value}}",
@@ -67,7 +79,11 @@
         {foo: "bar"}
       ]
 
-      , null_key: null
+      , null_key: null,
+
+      sentences_with_dots: {
+          "A implies B means something.": "A implies B means that when A is true, B must be true."
+      }
     };
 
     Translations["en-US"] = {
@@ -90,7 +106,16 @@
         hello: "Olá Mundo!"
 
       , number: {
-          percentage: {
+          currency: {
+            format: {
+              delimiter: ".",
+              format: "%u %n",
+              precision: 2,
+              separator: ",",
+              unit: "R$"
+            }
+          }
+          , percentage: {
             format: {
                 delimiter: ""
               , separator: ","

data/spec/ruby/i18n/js_spec.rb

@@ -351,7 +351,7 @@ EOS
     end
   end
 
-  context "namespace, prefix and pretty_print options" do
+  context "namespace, prefix, suffix, and pretty_print options" do
 
     before do
       stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
@@ -379,6 +379,7 @@ EOS
   "foo": "Foo",
   "fallback_test": "Success"
 };
+//test
 EOS
 }$/)
     end