i18n-js 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 353417f345acd62bc99d23f7a5fec4009cc0ee3e
-  data.tar.gz: f06f7d88940146630ad37d71dc64d0ed7e746a75
+  metadata.gz: a6045fc4e7caf2df9308248a08c9a5f7f74d08a5
+  data.tar.gz: 3ac4f6ee77a6afa9948a73758bfcb70ecf92a156
 SHA512:
-  metadata.gz: 40cb6d125502a38e0a9e87bb57fb57f3a4913ad6647a0431bd9c81cfa40b60b37b77562bec24c93c0a3b40687be33163107c63e9af7abc7a2d35a323dfc8fcee
-  data.tar.gz: a6503dbaecb63aa9638f348e28625df2854399dd5c4cacacc776a13f2fdfd88aef8ca21f0aed3d6b6e1cb56571c83d8ca270ba6f949c4b14c452cdf177472fcd
+  metadata.gz: 0b56080a8ec45da012f3a846d8d811ed80245f76f2c3905079cf7930b08b3775b2381757b20b2384ab91e17fcfd76586daf459c594b31f03aa04e31fc65a8fe0
+  data.tar.gz: 9d093f0a6c62daee153bc8d9b7702f2aab193d660a752e17e1c0fe4595637f19748819dc7c45d4e46816adaf97342d56f3db1285a687f565fd87e74ac308cf58

data/.editorconfig

@@ -0,0 +1,24 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# default configuration
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+
+# Set default charset
+charset = utf-8
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[*.{md,markdown}]
+trim_trailing_whitespace = false

data/.npmignore

@@ -0,0 +1,26 @@
+# https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package
+
+# tests
+spec
+coverage
+
+# build tools
+.travis.yml
+
+# linters
+.jscsrc
+.jshintrc
+.eslintrc*
+
+# editor settings
+.idea
+.editorconfig
+
+# Ruby code
+gemfiles
+lib
+Gemfile*
+*.gemspec
+Rakefile
+Appraisals
+

data/CHANGELOG.md

@@ -18,6 +18,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.1] - 2017-08-02
+
+### Changed
+
+- [Ruby] Relax Rails detection code to work with alternative installation methods  
+  (PR: https://github.com/fnando/i18n-js/pull/467)
+- [JS] Fix fallback when "3-part" locale like `zh-Hant-TW` is used  
+  It fallbacks to `zh` only before, now it fallbacks to `zh-Hant`  
+  (PR: https://github.com/fnando/i18n-js/pull/465)
+
+
 ## [3.0.0] - 2017-04-01
 
 This is a fake official release, the *real* one will be `3.0.0.rc17`  
@@ -240,7 +251,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.0...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.1...HEAD
+[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
 [3.0.0.rc15]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc14...v3.0.0.rc15

data/README.md

@@ -257,7 +257,7 @@ translations:
 ```
 
 
-#### Javscript Deep Merge (:js_extend option)
+#### Javascript Deep Merge (:js_extend option)
 
 By default, the output file Javascript will call the `I18n.extend` method to ensure that newly loaded locale
 files are deep-merged with any locale data already in memory. To disable this either globally or per-file,
@@ -453,7 +453,7 @@ I18n.pluralization["ru"] = function (count) {
 };
 ```
 
-You can find all rules on <http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html>.
+You can find all rules on <http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html>.
 
 If you're using the same scope over and over again, you may use the `scope` option.
 

data/app/assets/javascripts/i18n.js

@@ -52,7 +52,17 @@
   // Borrowed from Underscore.js
   var isObject = function(obj) {
     var type = typeof obj;
-    return type === 'function' || type === 'object' && !!obj;
+    return type === 'function' || type === 'object'
+  };
+
+  var isFunction = function(func) {
+    var type = typeof func;
+    return type === 'function'
+  };
+
+  // Check if value is different than undefined and null;
+  var isSet = function(value) {
+    return typeof(value) !== 'undefined' && value !== null;
   };
 
   // Is a given value an array?
@@ -95,6 +105,14 @@
     return +(value[0] + 'e' + (value[1] ? (+value[1] + exp) : exp));
   }
 
+  var lazyEvaluate = function(message, scope) {
+    if (isFunction(message)) {
+      return message(scope);
+    } else {
+      return message;
+    }
+  }
+
   var merge = function (dest, obj) {
     var key, value;
     for (key in obj) if (obj.hasOwnProperty(key)) {
@@ -173,60 +191,21 @@
     , missingTranslationPrefix: ''
   };
 
+  // Set default locale. This locale will be used when fallback is enabled and
+  // the translation doesn't exist in a particular locale.
   I18n.reset = function() {
-    // Set default locale. This locale will be used when fallback is enabled and
-    // the translation doesn't exist in a particular locale.
-    this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
-
-    // Set the current locale to `en`.
-    this.locale = DEFAULT_OPTIONS.locale;
-
-    // Set the translation key separator.
-    this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
-
-    // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
-    this.placeholder = DEFAULT_OPTIONS.placeholder;
-
-    // Set if engine should fallback to the default locale when a translation
-    // is missing.
-    this.fallbacks = DEFAULT_OPTIONS.fallbacks;
-
-    // Set the default translation object.
-    this.translations = DEFAULT_OPTIONS.translations;
-
-    // Set the default missing behaviour
-    this.missingBehaviour = DEFAULT_OPTIONS.missingBehaviour;
-
-    // Set the default missing string prefix for guess behaviour
-    this.missingTranslationPrefix = DEFAULT_OPTIONS.missingTranslationPrefix;
-
+    var key;
+    for (key in DEFAULT_OPTIONS) {
+      this[key] = DEFAULT_OPTIONS[key];
+    }
   };
 
   // Much like `reset`, but only assign options if not already assigned
   I18n.initializeOptions = function() {
-    if (typeof(this.defaultLocale) === "undefined" && this.defaultLocale !== null)
-      this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
-
-    if (typeof(this.locale) === "undefined" && this.locale !== null)
-      this.locale = DEFAULT_OPTIONS.locale;
-
-    if (typeof(this.defaultSeparator) === "undefined" && this.defaultSeparator !== null)
-      this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
-
-    if (typeof(this.placeholder) === "undefined" && this.placeholder !== null)
-      this.placeholder = DEFAULT_OPTIONS.placeholder;
-
-    if (typeof(this.fallbacks) === "undefined" && this.fallbacks !== null)
-      this.fallbacks = DEFAULT_OPTIONS.fallbacks;
-
-    if (typeof(this.translations) === "undefined" && this.translations !== null)
-      this.translations = DEFAULT_OPTIONS.translations;
-
-    if (typeof(this.missingBehaviour) === "undefined" && this.missingBehaviour !== null)
-      this.missingBehaviour = DEFAULT_OPTIONS.missingBehaviour;
-
-    if (typeof(this.missingTranslationPrefix) === "undefined" && this.missingTranslationPrefix !== null)
-      this.missingTranslationPrefix = DEFAULT_OPTIONS.missingTranslationPrefix;
+    var key;
+    for (key in DEFAULT_OPTIONS) if (!isSet(this[key])) {
+      this[key] = DEFAULT_OPTIONS[key];
+    }
   };
   I18n.initializeOptions();
 
@@ -252,7 +231,7 @@
   I18n.locales.get = function(locale) {
     var result = this[locale] || this[I18n.locale] || this["default"];
 
-    if (typeof(result) === "function") {
+    if (isFunction(result)) {
       result = result(locale);
     }
 
@@ -267,8 +246,6 @@
   I18n.locales["default"] = function(locale) {
     var locales = []
       , list = []
-      , countryCode
-      , count
     ;
 
     // Handle the inline locale option that can be provided to
@@ -287,19 +264,85 @@
       locales.push(I18n.defaultLocale);
     }
 
+    // Locale code format 1:
+    // According to RFC4646 (http://www.ietf.org/rfc/rfc4646.txt)
+    // language codes for Traditional Chinese should be `zh-Hant`
+    //
+    // But due to backward compatibility
+    // We use older version of IETF language tag
+    // @see http://www.w3.org/TR/html401/struct/dirlang.html
+    // @see http://en.wikipedia.org/wiki/IETF_language_tag
+    //
+    // Format: `language-code = primary-code ( "-" subcode )*`
+    //
+    // primary-code uses ISO639-1
+    // @see http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+    // @see http://www.iso.org/iso/home/standards/language_codes.htm
+    //
+    // subcode uses ISO 3166-1 alpha-2
+    // @see http://en.wikipedia.org/wiki/ISO_3166
+    // @see http://www.iso.org/iso/country_codes.htm
+    //
+    // @note
+    //   subcode can be in upper case or lower case
+    //   defining it in upper case is a convention only
+
+
+    // Locale code format 2:
+    // Format: `code = primary-code ( "-" region-code )*`
+    // primary-code uses ISO 639-1
+    // script-code uses ISO 15924
+    // region-code uses ISO 3166-1 alpha-2
+    // Example: zh-Hant-TW, en-HK, zh-Hant-CN
+    //
+    // It is similar to RFC4646 (or actually the same),
+    // but seems to be limited to language, script, region
+
     // Compute each locale with its country code.
-    // So this will return an array containing both
-    // `de-DE` and `de` locales.
-    locales.forEach(function(locale){
-      countryCode = locale.split("-")[0];
+    // So this will return an array containing
+    // `de-DE` and `de`
+    // or
+    // `zh-hans-tw`, `zh-hans`, `zh`
+    // locales.
+    locales.forEach(function(locale) {
+      var localeParts = locale.split("-");
+      var firstFallback = null;
+      var secondFallback = null;
+      if (localeParts.length === 3) {
+        firstFallback = localeParts[0];
+        secondFallback = [
+          localeParts[0],
+          localeParts[1]
+        ].join("-");
+      }
+      else if (localeParts.length === 2) {
+        firstFallback = localeParts[0];
+      }
 
-      if (!~list.indexOf(locale)) {
+      if (list.indexOf(locale) === -1) {
         list.push(locale);
       }
 
-      if (I18n.fallbacks && countryCode && countryCode !== locale && !~list.indexOf(countryCode)) {
-        list.push(countryCode);
+      if (! I18n.fallbacks) {
+        return;
       }
+
+      [
+        firstFallback,
+        secondFallback
+      ].forEach(function(nullableFallbackLocale) {
+        // We don't want null values
+        if (typeof nullableFallbackLocale === "undefined") { return; }
+        if (nullableFallbackLocale === null) { return; }
+        // We don't want duplicate values
+        //
+        // Comparing with `locale` first is faster than
+        // checking whether value's presence in the list
+        if (nullableFallbackLocale === locale) { return; }
+        if (list.indexOf(nullableFallbackLocale) !== -1) { return; }
+
+        list.push(nullableFallbackLocale);
+      });
     });
 
     // No locales set? English it is.
@@ -336,28 +379,27 @@
   };
 
   // Check if value is different than undefined and null;
-  I18n.isSet = function(value) {
-    return value !== undefined && value !== null;
-  };
+  I18n.isSet = isSet;
 
   // Find and process the translation using the provided scope and options.
   // This is used internally by some functions and should not be used as an
   // public API.
   I18n.lookup = function(scope, options) {
-    options = this.prepareOptions(options);
+    options = options || {}
 
     var locales = this.locales.get(options.locale).slice()
       , requestedLocale = locales[0]
       , locale
       , scopes
+      , fullScope
       , translations
     ;
 
-    scope = this.getFullScope(scope, options);
+    fullScope = this.getFullScope(scope, options);
 
     while (locales.length) {
       locale = locales.shift();
-      scopes = scope.split(this.defaultSeparator);
+      scopes = fullScope.split(this.defaultSeparator);
       translations = this.translations[locale];
 
       if (!translations) {
@@ -376,8 +418,8 @@
       }
     }
 
-    if (this.isSet(options.defaultValue)) {
-      return options.defaultValue;
+    if (isSet(options.defaultValue)) {
+      return lazyEvaluate(options.defaultValue, scope);
     }
   };
 
@@ -391,7 +433,7 @@
     if (isObject(translations)) {
       while (pluralizerKeys.length) {
         pluralizerKey = pluralizerKeys.shift();
-        if (this.isSet(translations[pluralizerKey])) {
+        if (isSet(translations[pluralizerKey])) {
           message = translations[pluralizerKey];
           break;
         }
@@ -403,7 +445,7 @@
 
   // Lookup dedicated to pluralization
   I18n.pluralizationLookup = function(count, scope, options) {
-    options = this.prepareOptions(options);
+    options = options || {}
     var locales = this.locales.get(options.locale).slice()
       , requestedLocale = locales[0]
       , locale
@@ -437,7 +479,7 @@
     }
 
     if (message == null || message == undefined) {
-      if (this.isSet(options.defaultValue)) {
+      if (isSet(options.defaultValue)) {
         if (isObject(options.defaultValue)) {
           message = this.pluralizationLookupWithoutFallback(count, options.locale, options.defaultValue);
         } else {
@@ -492,7 +534,7 @@
           continue;
         }
 
-        if (this.isSet(options[attr])) {
+        if (isSet(options[attr])) {
           continue;
         }
 
@@ -511,15 +553,14 @@
 
     // Defaults should be an array of hashes containing either
     // fallback scopes or messages
-    if (this.isSet(options.defaults)) {
+    if (isSet(options.defaults)) {
       translationOptions = translationOptions.concat(options.defaults);
     }
 
     // Maintain support for defaultValue. Since it is always a message
     // insert it in to the translation options as such.
-    if (this.isSet(options.defaultValue)) {
+    if (isSet(options.defaultValue)) {
       translationOptions.push({ message: options.defaultValue });
-      delete options.defaultValue;
     }
 
     return translationOptions;
@@ -527,20 +568,23 @@
 
   // Translate the given scope with the provided options.
   I18n.translate = function(scope, options) {
-    options = this.prepareOptions(options);
+    options = options || {}
 
-    var copiedOptions = this.prepareOptions(options);
     var translationOptions = this.createTranslationOptions(scope, options);
 
     var translation;
+
+    var optionsWithoutDefault = this.prepareOptions(options)
+    delete optionsWithoutDefault.defaultValue
+
     // Iterate through the translation options until a translation
     // or message is found.
     var translationFound =
       translationOptions.some(function(translationOption) {
-        if (this.isSet(translationOption.scope)) {
-          translation = this.lookup(translationOption.scope, options);
-        } else if (this.isSet(translationOption.message)) {
-          translation = translationOption.message;
+        if (isSet(translationOption.scope)) {
+          translation = this.lookup(translationOption.scope, optionsWithoutDefault);
+        } else if (isSet(translationOption.message)) {
+          translation = lazyEvaluate(translationOption.message, scope);
         }
 
         if (translation !== undefined && translation !== null) {
@@ -554,8 +598,8 @@
 
     if (typeof(translation) === "string") {
       translation = this.interpolate(translation, options);
-    } else if (isObject(translation) && this.isSet(options.count)) {
-      translation = this.pluralize(options.count, scope, copiedOptions);
+    } else if (isObject(translation) && isSet(options.count)) {
+      translation = this.pluralize(options.count, scope, options);
     }
 
     return translation;
@@ -563,7 +607,7 @@
 
   // This function interpolates the all variables in the given message.
   I18n.interpolate = function(message, options) {
-    options = this.prepareOptions(options);
+    options = options || {}
     var matches = message.match(this.placeholder)
       , placeholder
       , value
@@ -581,7 +625,7 @@
       placeholder = matches.shift();
       name = placeholder.replace(this.placeholder, "$1");
 
-      if (this.isSet(options[name])) {
+      if (isSet(options[name])) {
         value = options[name].toString().replace(/\$/gm, "_#$#_");
       } else if (name in options) {
         value = this.nullPlaceholder(placeholder, message, options);
@@ -600,7 +644,7 @@
   // The pluralized translation may have other placeholders,
   // which will be retrieved from `options`.
   I18n.pluralize = function(count, scope, options) {
-    options = this.prepareOptions(options);
+    options = this.prepareOptions({count: String(count)}, options)
     var pluralizer, message, result;
 
     result = this.pluralizationLookup(count, scope, options);
@@ -608,8 +652,6 @@
       return this.missingTranslation(scope, options);
     }
 
-    options.count = String(count);
-
     if (result.message != undefined && result.message != null) {
       return this.interpolate(result.message, options);
     }
@@ -982,10 +1024,10 @@
   };
 
   I18n.getFullScope = function(scope, options) {
-    options = this.prepareOptions(options);
+    options = options || {}
 
     // Deal with the scope as an array.
-    if (scope.constructor === Array) {
+    if (isArray(scope)) {
       scope = scope.join(this.defaultSeparator);
     }
 

data/lib/i18n/js/dependencies.rb

@@ -4,28 +4,12 @@ module I18n
     # we need to specify pre-release version suffix in version constraint
     module Dependencies
       class << self
-        def rails3?
-          safe_gem_check("rails", "~> 3.0") && running_rails3?
-        end
-
-        def rails4?
-          safe_gem_check("rails", "~> 4.0", ">= 4.0.0.beta1") && running_rails4?
-        end
-
-        def rails5?
-          safe_gem_check("rails", "~> 5.0", ">= 5.0.0.beta1") && running_rails5?
-        end
-
-        def sprockets_supports_register_preprocessor?
-          defined?(Sprockets) && Sprockets.respond_to?(:register_preprocessor)
-        end
-
         def rails?
-          rails_available? && running_rails?
+          defined?(Rails) && Rails.respond_to?(:version)
         end
 
-        def rails_available?
-          safe_gem_check("rails", '>= 3.0.0.beta')
+        def sprockets_rails_v2_plus?
+          safe_gem_check("sprockets-rails", ">= 2")
         end
 
         # This cannot be called at class definition time
@@ -47,20 +31,16 @@ module I18n
 
         private
 
-        def running_rails3?
-          running_rails? && Rails.version.to_i == 3
-        end
-
-        def running_rails4?
-          running_rails? && Rails.version.to_i == 4
+        def rails3?
+          rails? && Rails.version.to_i == 3
         end
 
-        def running_rails5?
-          running_rails? && Rails.version.to_i == 5
+        def rails4?
+          rails? && Rails.version.to_i == 4
         end
 
-        def running_rails?
-          defined?(Rails) && Rails.respond_to?(:version)
+        def rails5?
+          rails? && Rails.version.to_i == 5
         end
 
         def safe_gem_check(*args)

data/lib/i18n/js/engine.rb

@@ -9,56 +9,39 @@ module I18n
     end
 
     class Engine < ::Rails::Engine
-      if JS::Dependencies.sprockets_supports_register_preprocessor?
-        # constant `Sprockets` should be available here after
-        # `.sprockets_supports_register_preprocessor?` called
-        sprockets_version = Gem::Version.new(Sprockets::VERSION).release
-        v2_only = Gem::Dependency.new("", " ~> 2")
-        v3_plus = Gem::Dependency.new("", " >= 3")
+      # See https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors
+      # for reference of supporting multiple versions
 
-        # See https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors
-        # for reference of supporting multiple versions
+      # `sprockets.environment` was used for 1.x of `sprockets-rails`
+      # https://github.com/rails/sprockets-rails/issues/227
+      #
+      # References for current values:
+      #
+      # Here is where sprockets are attached with Rails. There is no 'sprockets.environment' mentioned.
+      # https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb
+      #
+      # Finisher hook is the place which should be used as border.
+      # http://guides.rubyonrails.org/configuring.html#initializers
+      #
+      # For detail see Pull Request:
+      # https://github.com/fnando/i18n-js/pull/371
+      initializer "i18n-js.register_preprocessor", after: :engines_blank_point, before: :finisher_hook do
+        # This must be called inside initializer block
+        # For details see comments for `using_asset_pipeline?`
+        next unless JS::Dependencies.using_asset_pipeline?
 
-        # `sprockets.environment` was used for 1.x of `sprockets-rails`
-        # https://github.com/rails/sprockets-rails/issues/227
+        # From README of 2.x & 3.x of `sprockets-rails`
+        # It seems the `configure` block is preferred way to call `register_preprocessor`
+        # Not sure if this will break older versions of rails
         #
-        # References for current values:
-        #
-        # Here is where sprockets are attached with Rails. There is no 'sprockets.environment' mentioned.
-        # https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb
-        #
-        # Finisher hook is the place which should be used as border.
-        # http://guides.rubyonrails.org/configuring.html#initializers
-        #
-        # For detail see Pull Request:
-        # https://github.com/fnando/i18n-js/pull/371
-        #
-        # Not using -> for JRuby compatibility
-        # See https://github.com/fnando/i18n-js/issues/419
-        initializer_args = case sprockets_version
-        when lambda {|v| v2_only.match?("", v) || v3_plus.match?("", v) }
-          { after: :engines_blank_point, before: :finisher_hook }
-        else
-          raise StandardError, "Sprockets version #{sprockets_version} is not supported"
-        end
-
-        initializer "i18n-js.register_preprocessor", initializer_args do
-          # This must be called inside initializer block
-          # For details see comments for `using_asset_pipeline?`
-          next unless JS::Dependencies.using_asset_pipeline?
-
-          # From README of 2.x & 3.x of `sprockets-rails`
-          # It seems the `configure` block is preferred way to call `register_preprocessor`
-          # Not sure if this will break older versions of rails
-          #
-          # https://github.com/rails/sprockets-rails/blob/v2.3.3/README.md
-          # https://github.com/rails/sprockets-rails/blob/v3.0.0/README.md
+        # https://github.com/rails/sprockets-rails/blob/v2.3.3/README.md
+        # https://github.com/rails/sprockets-rails/blob/v3.0.0/README.md
+        if JS::Dependencies.sprockets_rails_v2_plus?
           Rails.application.config.assets.configure do |config|
-            config.register_preprocessor(
-              "application/javascript",
-              ::I18n::JS::SprocketsExtension,
-            )
+            config.register_preprocessor("application/javascript", ::I18n::JS::SprocketsExtension)
           end
+        elsif Rails.application.assets.respond_to?(:register_preprocessor)
+          Rails.application.assets.register_preprocessor("application/javascript", ::I18n::JS::SprocketsExtension)
         end
       end
     end

data/lib/i18n/js/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "0.0.0",
+  "version": "3.0.1",
   "devDependencies": {
     "jasmine-node": "^1.14.5"
   },

data/spec/js/translate.spec.js

@@ -65,7 +65,7 @@ describe("Translate", function(){
     expect(I18n.t("hello", {locale: "pt-BR"})).toEqual("Olá Mundo!");
   });
 
-  it("fallbacks to the default locale when I18n.fallbackss is enabled", function(){
+  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!");
@@ -83,6 +83,21 @@ describe("Translate", function(){
     expect(I18n.t("hello")).toEqual("Hallo Welt!");
   });
 
+  describe("when a 3-part locale is used", function(){
+    beforeEach(function(){
+      I18n.locale = "zh-Hant-TW";
+      I18n.fallbacks = true;
+    });
+
+    it("fallbacks to 2-part locale when absent", function(){
+      expect(I18n.t("cat")).toEqual("貓");
+    });
+
+    it("fallbacks to 1-part locale when 2-part missing requested translation", function(){
+      expect(I18n.t("dog")).toEqual("狗");
+    });
+  });
+
   it("fallbacks using custom rules (function)", function(){
     I18n.locale = "no";
     I18n.fallbacks = true;
@@ -145,6 +160,26 @@ describe("Translate", function(){
       actual = I18n.t("foo", options);
       expect(actual).toEqual("Hello all!");
     });
+
+    it("uses default scope over default value if default scope is found", function() {
+      var options = {
+          defaults: [{scope: "hello"}]
+        , defaultValue: "Hello all!"
+      };
+      actual = I18n.t("foo", options);
+      expect(actual).toEqual("Hello World!");
+    })
+
+    it("uses default value with lazy evaluation", function () {
+      var options = {
+          defaults: [{scope: "bar"}]
+        , defaultValue: function(scope) {
+          return scope.toUpperCase();
+        }
+      };
+      actual = I18n.t("foo", options);
+      expect(actual).toEqual("FOO");
+    })
   });
 
   it("uses default value for simple translation", function(){

data/spec/js/translations.js

@@ -130,6 +130,14 @@ var DEBUG = false;
       hello: "Hei Verden!"
     };
 
+    Translations["zh-Hant"] = {
+      cat: "貓"
+    };
+
+    Translations["zh"] = {
+      dog: "狗"
+    };
+
     return Translations;
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -93,7 +93,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".npmignore"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -170,7 +172,6 @@ files:
 - spec/js/translate.spec.js
 - spec/js/translations.js
 - spec/js/utility_functions.spec.js
-- spec/ruby/i18n/js/dependencies_spec.rb
 - spec/ruby/i18n/js/fallback_locales_spec.rb
 - spec/ruby/i18n/js/segment_spec.rb
 - spec/ruby/i18n/js/utils_spec.rb
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -249,7 +250,6 @@ test_files:
 - spec/js/translate.spec.js
 - spec/js/translations.js
 - spec/js/utility_functions.spec.js
-- spec/ruby/i18n/js/dependencies_spec.rb
 - spec/ruby/i18n/js/fallback_locales_spec.rb
 - spec/ruby/i18n/js/segment_spec.rb
 - spec/ruby/i18n/js/utils_spec.rb

data/spec/ruby/i18n/js/dependencies_spec.rb

@@ -1,43 +0,0 @@
-require "spec_helper"
-
-describe I18n::JS::Dependencies, ".sprockets_supports_register_preprocessor?" do
-
-  subject { described_class.sprockets_supports_register_preprocessor? }
-
-  context 'when Sprockets is available to register preprocessors' do
-    let!(:sprockets_double) do
-      class_double('Sprockets').as_stubbed_const(register_processor: true).tap do |double|
-        allow(double).to receive(:respond_to?).with(:register_preprocessor).and_return(true)
-      end
-    end
-
-    it { is_expected.to be_truthy }
-    it 'calls respond_to? with register_preprocessor on Sprockets' do
-      expect(sprockets_double).to receive(:respond_to?).with(:register_preprocessor).and_return(true)
-      subject
-    end
-  end
-
-  context 'when Sprockets is NOT available to register preprocessors' do
-    let!(:sprockets_double) do
-      class_double('Sprockets').as_stubbed_const(register_processor: true).tap do |double|
-        allow(double).to receive(:respond_to?).with(:register_preprocessor).and_return(false)
-      end
-    end
-
-    it { is_expected.to be_falsy }
-    it 'calls respond_to? with register_preprocessor on Sprockets' do
-      expect(sprockets_double).to receive(:respond_to?).with(:register_preprocessor).and_return(false)
-      subject
-    end
-  end
-
-  context 'when Sprockets is missing' do
-    before do
-      hide_const('Sprockets')
-      expect { Sprockets }.to raise_error(NameError)
-    end
-
-    it { is_expected.to be_falsy }
-  end
-end