i18n-js 3.5.1 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62051e50266fb55f81099456051f21393aba9a4ecabda1bf2739ae181bf64ec6
-  data.tar.gz: 517cc9090a03e060781be401588b00495a18ccf934fd155ec838d1334b349d7c
+  metadata.gz: e8b0336b575e1fcbf19bc557cb7fd709db85f8831a842970c03f34517baa90c2
+  data.tar.gz: 4f86f0c6d7e05b0aeb4b8f7898d5947b6a06dd402593d34c068f98da28ed09ff
 SHA512:
-  metadata.gz: e88fc0e5f91b673a401310c1b8db1bc5f04a3d3cf5379d978fda9a1030cb5bedb897175577301b5cd4ef86cd025f03c17250c1d5953c7779a48a0911339e7307
-  data.tar.gz: b7caf39eff008a7817a512f60edffc515a3baa41ff8c7388d54f8fcd59f42e9247ee28567f58c264a319fd9f7049712fc8d0a76a85ca778dad4d70144fb4124f
+  metadata.gz: 20f3d107d1e745c7948ff2fa10173712e84bf58894cab7f1d21f58b5c647bf17fb0a664cc2bb4363d3def74898c0a85dda1a8de6c64161400bd1044663a61cc0
+  data.tar.gz: bc0fa3a90ff5ef2a23c4f084845238564b6c66d9deb96abb79478f719e37e065744cd775b3d8de33765f1d72a266325672b8bcfe95fc1dbd9c0aceb507538d5c

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 before_install:
 # Needed to test JS
@@ -29,6 +30,7 @@ gemfile:
   - gemfiles/i18n_1_5.gemfile
   - gemfiles/i18n_1_6.gemfile
   - gemfiles/i18n_1_7.gemfile
+  - gemfiles/i18n_1_8.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -38,3 +38,7 @@ end
 appraise "i18n_1_7" do
   gem "i18n", "~> 1.7.0"
 end
+
+appraise "i18n_1_8" do
+  gem "i18n", "~> 1.8.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,30 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.7.1] - 2020-06-30
+
+### Fixed
+
+- [JS] For translation missing behaviour `guess`, replace all underscores to spaces properly  
+  (PR: https://github.com/fnando/i18n-js/pull/574)
+
+
+## [3.7.0] - 2020-05-29
+
+### Added
+
+- [JS] Allow options to be passed in when calling `I18n.localize`/`I18n.l`  
+  (PR: https://github.com/fnando/i18n-js/pull/570)
+
+
+## [3.6.0] - 2020-02-14
+
+### Added
+
+- [Ruby] Allow `suffix` to be added to generated translations files  
+  (PR: https://github.com/fnando/i18n-js/pull/561)
+
+
 ## [3.5.1] - 2019-12-21
 
 ### Changed
@@ -441,7 +465,10 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.5.1...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.7.1...HEAD
+[3.7.1]:      https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1
+[3.7.0]:      https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0
+[3.6.0]:      https://github.com/fnando/i18n-js/compare/v3.5.1...v3.6.0
 [3.5.1]:      https://github.com/fnando/i18n-js/compare/v3.5.0...v3.5.1
 [3.5.0]:      https://github.com/fnando/i18n-js/compare/v3.4.2...v3.5.0
 [3.4.2]:      https://github.com/fnando/i18n-js/compare/v3.4.1...v3.4.2

data/README.md

@@ -248,9 +248,9 @@ MyNamespace.translations["en"] = { ... }
 ```
 
 
-### Adding a line at the beginning of the translations file (useful for imports)
+### Adding prefix & suffix to the translations file(s)
 
-Setting the `prefix: "import I18n from 'i18n-js';\n"` option will add the line at the beggining of the resultant translation file.
+Setting the `prefix: "import I18n from 'i18n-js';\n"` option will add the line at the beginning of the resultant translation file.
 This can be useful to use this gem with the [i18n-js](https://www.npmjs.com/package/i18n-js) npm package, which is quite useful to use it with webpack.
 The user should provide the semi-colon and the newline character if needed.
 
@@ -267,6 +267,11 @@ will create:
 ```
 import I18n from 'i18n-js';
 I18n.translations || (I18n.translations = {});
+```
+
+
+`suffix` option is added in https://github.com/fnando/i18n-js/pull/561.  
+It's similar to `prefix` so won't explain it in details.
 
 
 #### Pretty Print

data/app/assets/javascripts/i18n.js

@@ -679,7 +679,7 @@
       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()} );
     }
 
@@ -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
     );
 

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/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/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.7.1"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "3.5.1",
+  "version": "3.7.1",
   "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/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(){

data/spec/js/translations.js

@@ -90,7 +90,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.7.1
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - gemfiles/i18n_1_5.gemfile
 - gemfiles/i18n_1_6.gemfile
 - gemfiles/i18n_1_7.gemfile
+- gemfiles/i18n_1_8.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
@@ -207,7 +208,7 @@ homepage: http://rubygems.org/gems/i18n-js
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
 test_files: