i18n-js 3.0.0.rc15 → 3.0.0.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb04a52e869d4da0331db74c65512cae5c19abc
-  data.tar.gz: 6522e5f84e73ca868c2054a2d67946c3d798a672
+  metadata.gz: 2bdd993cc2123f7996d8770f22fbe77d083c4d16
+  data.tar.gz: e8d72e140dd4a56dd87125054bd14359d738b336
 SHA512:
-  metadata.gz: a500c069fd37898516080b518c313f8cb3cc7e0d3acc8cf9cd0a0f0b82f6f2c5f751ea777868d6de14f88fda66797f60e37246aedfbfc73942558ca648149dad
-  data.tar.gz: ce0941d24100dd6c414f4699de4db0fac4725c2f995129cc19cec35847e7693503570e5ca8262aa7cda7da93e8ac5712bdd94c82db58271fcbc5687c3d89128a
+  metadata.gz: bbeea2c099c506bdceb373085e054e408caf5f1d662968c33595cc9e5b65aafdd117826ace1a55da9a68b18ff670f48e71649737ff31ba2df197868e04992868
+  data.tar.gz: 617d9be3db375c09d69d332053f29d391c49a4e8a6939dc89cf938b0de2f927b52d7cf29af1dcfbcd50911ef7970420c1fdca63721f182890bc0c4eff8c69f16

data/.travis.yml

@@ -5,18 +5,20 @@ language: ruby
 cache:
   - bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.5
   # Since the Travis Build Env does not recognize `2.3` alias yet
   # We need to specify the version precisely
-  - 2.3.0
+  - 2.3.3
+  - 2.4.0
   - ruby-head
-before_install: # Need to install something extra to test JS
-- npm install jasmine-node@1.14.2
+before_install:
+# Need to install something extra to test JS
+- npm install
 gemfile:
   - gemfiles/i18n_0_6.gemfile
   - gemfiles/i18n_0_7.gemfile
+  - gemfiles/i18n_0_8.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -6,3 +6,7 @@ end
 appraise "i18n_0_7" do
   gem "i18n", "~> 0.7.0"
 end
+
+appraise "i18n_0_8" do
+  gem "i18n", "~> 0.8.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.0.rc16] - 2017-03-13
+
+### Changed
+
+- [Ruby] Drop support for Ruby < `2.1.0`
+
+### Fixed
+
+- [JS] Make defaultValue works on plural translation
+- [JS] Fix UMD pattern so the global/root won’t be undefined
+
+
 ## [3.0.0.rc15] - 2016-12-07
 
 ### Added
@@ -217,7 +229,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc15...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc16...HEAD
+[3.0.0.rc16]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc15...v3.0.0.rc16
 [3.0.0.rc15]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc14...v3.0.0.rc15
 [3.0.0.rc14]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc13...v3.0.0.rc14
 [3.0.0.rc13]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc12...v3.0.0.rc13

data/README.md

@@ -603,6 +603,27 @@ The accepted formats are:
 
 Check out `spec/*.spec.js` files for more examples!
 
+#### Using pluralization and number formatting together
+Sometimes you might want to display translation with formatted number, like adding thousand delimiters to displayed number  
+You can do this:  
+```json
+{
+  "en": {
+    "point": {
+      "one": "1 Point",
+      "other": "{{formatted_number}} Points",
+      "zero": "0 Points"
+    }
+  }
+}
+```
+```js
+var point_in_number = 1000;
+I18n.t('point', { count: point_in_number, formatted_number: I18n.toNumber(point_in_number) });
+```
+Output should be `1,000 points`
+
+
 ## Using multiple exported translation files on a page.
 This method is useful for very large apps where a single contained translations.js file is not desirable. Examples would be a global translations file and a more specific route translation file.
 

data/app/assets/javascripts/i18n.js

@@ -12,19 +12,23 @@
 // See tests for specific formatting like numbers and dates.
 //
 
-;(function(factory) {
-  if (typeof module !== 'undefined' && module.exports) {
-    // Node/CommonJS
-    module.exports = factory(this);
-  } else if (typeof define === 'function' && define.amd) {
-    // AMD
-    var global=this;
-    define('i18n', function(){ return factory(global);});
+// Using UMD pattern from
+// https://github.com/umdjs/umd#regular-module
+// `returnExports.js` version
+;(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define("i18n", function(){ return factory(root);});
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory(root);
   } else {
-    // Browser globals
-    this.I18n = factory(this);
+    // Browser globals (root is window)
+    root.I18n = factory(root);
   }
-}(function(global) {
+}(this, function(global) {
   "use strict";
 
   // Use previously defined object if exists in current scope
@@ -525,6 +529,7 @@
   I18n.translate = function(scope, options) {
     options = this.prepareOptions(options);
 
+    var copiedOptions = this.prepareOptions(options);
     var translationOptions = this.createTranslationOptions(scope, options);
 
     var translation;
@@ -550,7 +555,7 @@
     if (typeof(translation) === "string") {
       translation = this.interpolate(translation, options);
     } else if (isObject(translation) && this.isSet(options.count)) {
-      translation = this.pluralize(options.count, scope, options);
+      translation = this.pluralize(options.count, scope, copiedOptions);
     }
 
     return translation;

data/app/assets/javascripts/i18n/filtered.js.erb

@@ -1,17 +1,22 @@
 <%# encoding: utf-8 %>
 
-;(function(factory) {
-  if (typeof module !== 'undefined' && module.exports) {
-    // Node/CommonJS
-    factory(require('i18n'));
-  } else if (typeof define === 'function' && define.amd) {
-    // AMD
-    define(['i18n'], factory);
+// Using UMD pattern from
+// https://github.com/umdjs/umd#regular-module
+// `returnExports.js` version
+;(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(["i18n"], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    factory(require("i18n"));
   } else {
-    // Browser globals
-    factory(this.I18n);
+    // Browser globals (root is window)
+    factory(root.I18n);
   }
-}(function(I18n) {
+}(this, function(I18n) {
   "use strict";
 
   I18n.translations = <%= I18n::JS.filtered_translations.to_json %>;

data/gemfiles/i18n_0_8.gemfile

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

data/i18n-js.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "i18n", "~> 0.6", ">= 0.6.6"
+
   s.add_development_dependency "appraisal", "~> 2.0"
   s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", "~> 12.0"
   s.add_development_dependency "gem-release", ">= 0.7"
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.1.0"
 end

data/lib/i18n/js/version.rb

@@ -4,7 +4,7 @@ module I18n
       MAJOR = 3
       MINOR = 0
       PATCH = 0
-      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc15"
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc16"
     end
   end
 end

data/package.json

@@ -2,7 +2,7 @@
   "name": "i18n-js",
   "version": "0.0.0",
   "devDependencies": {
-    "jasmine-node": "*"
+    "jasmine-node": "^1.14.5"
   },
   "main": "app/assets/javascripts/i18n.js",
   "scripts": {

data/spec/js/translate.spec.js

@@ -152,6 +152,11 @@ describe("Translate", function(){
     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});
+    expect(actual).toEqual("1 message");
+  });
+
   it("uses default value for unknown locale", function(){
     I18n.locale = "fr";
     actual = I18n.t("warning", {defaultValue: "Warning!"});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc15
+  version: 3.0.0.rc16
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,7 @@ files:
 - app/assets/javascripts/i18n/translations.js
 - gemfiles/i18n_0_6.gemfile
 - gemfiles/i18n_0_7.gemfile
+- gemfiles/i18n_0_8.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
@@ -187,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -254,4 +255,3 @@ test_files:
 - spec/ruby/i18n/js/utils_spec.rb
 - spec/ruby/i18n/js_spec.rb
 - spec/spec_helper.rb
-has_rdoc: