i18n-js 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6045fc4e7caf2df9308248a08c9a5f7f74d08a5
-  data.tar.gz: 3ac4f6ee77a6afa9948a73758bfcb70ecf92a156
+  metadata.gz: 1ebec2528bae57b4e38d4fbf4fe2241197dfc36d
+  data.tar.gz: 5b5cc7647e6dabbd1fe607a438737f156b6e9e54
 SHA512:
-  metadata.gz: 0b56080a8ec45da012f3a846d8d811ed80245f76f2c3905079cf7930b08b3775b2381757b20b2384ab91e17fcfd76586daf459c594b31f03aa04e31fc65a8fe0
-  data.tar.gz: 9d093f0a6c62daee153bc8d9b7702f2aab193d660a752e17e1c0fe4595637f19748819dc7c45d4e46816adaf97342d56f3db1285a687f565fd87e74ac308cf58
+  metadata.gz: 1e9b528236405cf0d44016d62ecbc892bd9ffec07e8266bd2cbd5760c17a852f95d38dd230779b1eab7a9db25c80394d4aa36231522227c51e5b28e2222a7ce0
+  data.tar.gz: 2fd596c5e48d2e570a930bf714278571c49944251247217b93f65a192338bbb3f72cf41d1f80bc8136a173792f2af705f1a97887a3ea1f182809c9f8d134f362

data/.npmignore

@@ -17,6 +17,7 @@ coverage
 .editorconfig
 
 # Ruby code
+app/assets/javascripts/i18n/
 gemfiles
 lib
 Gemfile*

data/.travis.yml

@@ -6,11 +6,11 @@ cache:
   - bundler
 rvm:
   - 2.1.10
-  - 2.2.5
+  - 2.2.8
   # Since the Travis Build Env does not recognize `2.3` alias yet
   # We need to specify the version precisely
-  - 2.3.3
-  - 2.4.0
+  - 2.3.5
+  - 2.4.2
   - ruby-head
 before_install:
 # Need to install something extra to test JS
@@ -19,6 +19,7 @@ gemfile:
   - gemfiles/i18n_0_6.gemfile
   - gemfiles/i18n_0_7.gemfile
   - gemfiles/i18n_0_8.gemfile
+  - gemfiles/i18n_0_9.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -10,3 +10,7 @@ end
 appraise "i18n_0_8" do
   gem "i18n", "~> 0.8.0"
 end
+
+appraise "i18n_0_9" do
+  gem "i18n", "~> 0.9.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.2] - 2017-10-26
+
+### Added
+
+- Nothing
+
+### Changed
+
+- [Ruby] Avoid writing new file if a file with same content already exists  
+  (PR: https://github.com/fnando/i18n-js/pull/473)
+- [JS] Fix fallback when "3-part" locale like `zh-Hant-TW` is used  
+  It was falling back to `zh` first instead of `zh-Hant` (see new test case added)  
+  (PR: https://github.com/fnando/i18n-js/pull/475)
+
+### Fixed
+
+- Nothing
+
+
 ## [3.0.1] - 2017-08-02
 
 ### Changed
@@ -251,7 +270,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.1...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.2...HEAD
+[3.0.2]:      https://github.com/fnando/i18n-js/compare/v3.0.1...v3.0.2
 [3.0.1]:      https://github.com/fnando/i18n-js/compare/v3.0.0...v3.0.1
 [3.0.0]:      https://github.com/fnando/i18n-js/compare/v3.0.0.rc16...v3.0.0
 [3.0.0.rc16]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc15...v3.0.0.rc16

data/README.md

@@ -21,7 +21,7 @@ Features:
 - Lots more! :)
 
 ## Version Notice
-The `master` branch (including this README) is for latest `3.0.0.rc` instead of `2.x`.
+The `master` branch (including this README) is for latest `3.0.0` instead of `2.x`.
 
 
 ## Usage
@@ -279,9 +279,15 @@ by hand or using your favorite programming language. More info below.
 
 #### Via NPM with webpack and CommonJS
 
-Add the following line to your package.json dependencies (where version is the version you want - n.b. npm install requires it to be the gzipped tarball, see [npm install](https://www.npmjs.org/doc/cli/npm-install.html))
+
+Add the following line to your package.json dependencies  
+where version is the version you want  
 ```javascript
-"i18n-js": "http://github.com/fnando/i18n-js/archive/v3.0.0.rc12.tar.gz"
+"i18n-js": "{version_constraint}"
+
+// Or if you want unreleased version
+// npm install requires it to be the gzipped tarball, see [npm install](https://www.npmjs.org/doc/cli/npm-install.html)
+"i18n-js": "https://github.com/fnando/i18n-js/archive/{tag_name_or_branch_name_or_commit_sha}.tar.gz"
 ```
 Run npm install then use via
 ```javascript
@@ -777,19 +783,20 @@ Due to the design of `sprockets`:
 This means that new locale files will not be detected, and so they will not trigger a i18n-js refresh. There are a few approaches to work around this:
 
 1. You can force i18n-js to update its translations by completely clearing the assets cache. Use one of the following:
+  
+```bash
+$ rake assets:clobber
+# Or, with older versions of Rails:
+$ rake tmp:cache:clear
+```
 
-  ```bash
-  $ rake assets:clobber
-  # Or, with older versions of Rails:
-  $ rake tmp:cache:clear
-  ```
+These commands will remove *all* fingerprinted assets, and you will have to recompile them with
 
-    These commands will remove *all* fingerprinted assets, and you will have to recompile them with
+```bash
+$ rake assets:precompile
+```
 
-    ```
-    $ rake assets:precompile
-    ```
-    or similar commands.  If you are precompiling assets on the target machine(s), cached pages may be broken by this, so they will need to be refreshed.
+or similar commands.  If you are precompiling assets on the target machine(s), cached pages may be broken by this, so they will need to be refreshed.
 
 2. You can change something in a different locale file.
 

data/app/assets/javascripts/i18n.js

@@ -309,11 +309,11 @@
       var firstFallback = null;
       var secondFallback = null;
       if (localeParts.length === 3) {
-        firstFallback = localeParts[0];
-        secondFallback = [
+        firstFallback = [
           localeParts[0],
           localeParts[1]
         ].join("-");
+        secondFallback = localeParts[0];
       }
       else if (localeParts.length === 2) {
         firstFallback = localeParts[0];

data/gemfiles/i18n_0_9.gemfile

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

data/lib/i18n/js.rb

@@ -219,6 +219,9 @@ module I18n
         FileUtils.mkdir_p(export_i18n_js_dir_path)
 
         i18n_js_path = File.expand_path('../../../app/assets/javascripts/i18n.js', __FILE__)
+        destination_path = File.expand_path("i18n.js", export_i18n_js_dir_path)
+        return if File.exist?(destination_path) && FileUtils.identical?(i18n_js_path, destination_path)
+
         FileUtils.cp(i18n_js_path, export_i18n_js_dir_path)
       end
 

data/lib/i18n/js/segment.rb

@@ -40,11 +40,15 @@ module I18n
 
       def write_file(_file = @file, _translations = @translations)
         FileUtils.mkdir_p File.dirname(_file)
+        contents = js_header
+        _translations.each do |locale, translations_for_locale|
+          contents << js_translations(locale, translations_for_locale)
+        end
+
+        return if File.exist?(_file) && File.read(_file) == contents
+
         File.open(_file, "w+") do |f|
-          f << js_header
-          _translations.each do |locale, translations_for_locale|
-            f << js_translations(locale, translations_for_locale)
-          end
+          f << contents
         end
       end
 

data/lib/i18n/js/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module JS
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

data/package.json

@@ -1,6 +1,10 @@
 {
   "name": "i18n-js",
-  "version": "3.0.1",
+  "version": "3.0.2",
+  "description": "A javascript library similar to Ruby on Rails i18n gem",
+  "author": "Nando Vieira",
+  "license": "MIT",
+  "keywords": ["i18n"],
   "devDependencies": {
     "jasmine-node": "^1.14.5"
   },
@@ -8,6 +12,10 @@
   "scripts": {
     "test": "./node_modules/.bin/jasmine-node spec/js"
   },
+  "homepage": "https://github.com/fnando/i18n-js",
+  "bugs": {
+    "url": "https://github.com/fnando/i18n-js/issues"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/fnando/i18n-js.git"

data/spec/js/translate.spec.js

@@ -96,6 +96,10 @@ describe("Translate", function(){
     it("fallbacks to 1-part locale when 2-part missing requested translation", function(){
       expect(I18n.t("dog")).toEqual("狗");
     });
+
+    it("fallbacks to 2-part for the first time", function(){
+      expect(I18n.t("dragon")).toEqual("龍");
+    });
   });
 
   it("fallbacks using custom rules (function)", function(){

data/spec/js/translations.js

@@ -131,11 +131,13 @@ var DEBUG = false;
     };
 
     Translations["zh-Hant"] = {
-      cat: "貓"
+        cat: "貓"
+      , dragon: "龍"
     };
 
     Translations["zh"] = {
-      dog: "狗"
+        dog: "狗"
+      , dragon: "龙"
     };
 
     return Translations;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -109,6 +109,7 @@ files:
 - gemfiles/i18n_0_6.gemfile
 - gemfiles/i18n_0_7.gemfile
 - gemfiles/i18n_0_8.gemfile
+- gemfiles/i18n_0_9.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.