From 0204a38f0ce730436c8175a82e6aadbfd47b7fcf Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 21 Dec 2018 10:54:26 +0000 Subject: [PATCH] brew vendor-gems: commit updates. --- .../vendor/bundle-standalone/bundler/setup.rb | 2 +- .../gems/i18n-1.2.0/lib/i18n/core_ext/hash.rb | 37 ------------------- .../{i18n-1.2.0 => i18n-1.3.0}/lib/i18n.rb | 13 ++++++- .../lib/i18n/backend.rb | 0 .../lib/i18n/backend/base.rb | 1 + .../lib/i18n/backend/cache.rb | 0 .../lib/i18n/backend/cache_file.rb | 0 .../lib/i18n/backend/cascade.rb | 0 .../lib/i18n/backend/chain.rb | 6 ++- .../lib/i18n/backend/fallbacks.rb | 0 .../lib/i18n/backend/flatten.rb | 0 .../lib/i18n/backend/gettext.rb | 2 + .../i18n/backend/interpolation_compiler.rb | 0 .../lib/i18n/backend/key_value.rb | 2 + .../lib/i18n/backend/memoize.rb | 0 .../lib/i18n/backend/metadata.rb | 0 .../lib/i18n/backend/pluralization.rb | 0 .../lib/i18n/backend/simple.rb | 13 +++++-- .../lib/i18n/backend/transliterator.rb | 0 .../lib/i18n/config.rb | 0 .../gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb | 37 +++++++++++++++++++ .../lib/i18n/core_ext/string/interpolate.rb | 0 .../lib/i18n/exceptions.rb | 0 .../lib/i18n/gettext.rb | 0 .../lib/i18n/gettext/helpers.rb | 0 .../lib/i18n/gettext/po_parser.rb | 0 .../lib/i18n/interpolate/ruby.rb | 0 .../lib/i18n/locale.rb | 0 .../lib/i18n/locale/fallbacks.rb | 0 .../lib/i18n/locale/tag.rb | 0 .../lib/i18n/locale/tag/parents.rb | 0 .../lib/i18n/locale/tag/rfc4646.rb | 0 .../lib/i18n/locale/tag/simple.rb | 0 .../lib/i18n/middleware.rb | 0 .../lib/i18n/version.rb | 2 +- 35 files changed, 70 insertions(+), 45 deletions(-) delete mode 100644 Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/hash.rb rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n.rb (98%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/base.rb (99%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/cache.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/cache_file.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/cascade.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/chain.rb (98%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/fallbacks.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/flatten.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/gettext.rb (98%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/interpolation_compiler.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/key_value.rb (99%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/memoize.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/metadata.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/pluralization.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/simple.rb (91%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/backend/transliterator.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/config.rb (100%) create mode 100644 Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/core_ext/string/interpolate.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/exceptions.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/gettext.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/gettext/helpers.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/gettext/po_parser.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/interpolate/ruby.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale/fallbacks.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale/tag.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale/tag/parents.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale/tag/rfc4646.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/locale/tag/simple.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/middleware.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.2.0 => i18n-1.3.0}/lib/i18n/version.rb (70%) diff --git a/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb b/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb index b063e6b123..544aea1eec 100644 --- a/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb @@ -4,7 +4,7 @@ ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' ruby_version = RbConfig::CONFIG["ruby_version"] path = File.expand_path('..', __FILE__) $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.4/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.2.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib" diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/hash.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/hash.rb deleted file mode 100644 index 085f041fd6..0000000000 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/hash.rb +++ /dev/null @@ -1,37 +0,0 @@ -class Hash - def slice(*keep_keys) - h = {} - keep_keys.each { |key| h[key] = fetch(key) if has_key?(key) } - h - end unless Hash.method_defined?(:slice) - - def except(*less_keys) - slice(*keys - less_keys) - end unless Hash.method_defined?(:except) - - def deep_symbolize_keys - inject({}) { |result, (key, value)| - value = value.deep_symbolize_keys if value.is_a?(Hash) - result[(key.to_sym rescue key) || key] = value - result - } - end unless Hash.method_defined?(:deep_symbolize_keys) - - def deep_stringify_keys - inject({}) { |result, (key, value)| - value = value.deep_stringify_keys if value.is_a?(Hash) - result[key.to_s] = value - result - } - end unless Hash.method_defined?(:deep_stringify_keys) - - # deep_merge_hash! by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809 - MERGER = proc do |key, v1, v2| - Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2 - end - - def deep_merge!(data) - merge!(data, &MERGER) - end unless Hash.method_defined?(:deep_merge!) -end - diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n.rb similarity index 98% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n.rb index afd61ec424..bc81aff2f7 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n.rb @@ -362,7 +362,18 @@ module I18n else keys = key.to_s.split(separator) keys.delete('') - keys.map! { |k| k.to_sym } + keys.map! do |k| + case k + when /\A[-+]?\d+\z/ # integer + k.to_i + when 'true' + true + when 'false' + false + else + k.to_sym + end + end keys end end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/base.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/base.rb similarity index 99% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/base.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/base.rb index 5259fab5db..061d6b1e78 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/base.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/base.rb @@ -7,6 +7,7 @@ require 'i18n/core_ext/hash' module I18n module Backend module Base + using I18n::HashRefinements include I18n::Backend::Transliterator # Accepts a list of paths to translation files. Loads translations from diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cache.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cache.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cache_file.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cache_file.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache_file.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cascade.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cascade.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/cascade.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cascade.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/chain.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/chain.rb similarity index 98% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/chain.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/chain.rb index 79227d3662..b3640ab8a6 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/chain.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/chain.rb @@ -17,6 +17,8 @@ module I18n # The implementation assumes that all backends added to the Chain implement # a lookup method with the same API as Simple backend does. class Chain + using I18n::HashRefinements + module Implementation include Base @@ -34,7 +36,7 @@ module I18n end true end - + def reload! backends.each { |backend| backend.reload! } end @@ -94,7 +96,7 @@ module I18n init_translations unless initialized? translations end - end + end def namespace_lookup?(result, options) result.is_a?(Hash) && !options.has_key?(:count) diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/fallbacks.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/fallbacks.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/flatten.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/flatten.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/flatten.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/flatten.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/gettext.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/gettext.rb similarity index 98% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/gettext.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/gettext.rb index ea2b6a3c9f..72d20f06e7 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/gettext.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/gettext.rb @@ -31,6 +31,8 @@ module I18n # Without it strings containing periods (".") will not be translated. module Gettext + using I18n::HashRefinements + class PoData < Hash def set_comment(msgid_or_sym, comment) # ignore diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/interpolation_compiler.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/interpolation_compiler.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/interpolation_compiler.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/interpolation_compiler.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/key_value.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/key_value.rb similarity index 99% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/key_value.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/key_value.rb index 0a4ccf896d..e391672b47 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/key_value.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/key_value.rb @@ -67,6 +67,8 @@ module I18n # # This is useful if you are using a KeyValue backend chained to a Simple backend. class KeyValue + using I18n::HashRefinements + module Implementation attr_accessor :store diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/memoize.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/memoize.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/memoize.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/memoize.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/metadata.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/metadata.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/metadata.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/metadata.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/pluralization.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/pluralization.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/pluralization.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/pluralization.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/simple.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/simple.rb similarity index 91% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/simple.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/simple.rb index 5931066093..75939499a9 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/simple.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/simple.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'i18n/backend/base' + module I18n module Backend # A simple backend that reads translations from YAML files and stores them in @@ -17,6 +19,8 @@ module I18n # # I18n::Backend::Simple.include(I18n::Backend::Pluralization) class Simple + using I18n::HashRefinements + (class << self; self; end).class_eval { public :include } module Implementation @@ -39,7 +43,7 @@ module I18n end locale = locale.to_sym translations[locale] ||= {} - data = data.deep_stringify_keys.deep_symbolize_keys + data = data.deep_symbolize_keys translations[locale].deep_merge!(data) end @@ -84,8 +88,11 @@ module I18n keys = I18n.normalize_keys(locale, key, scope, options[:separator]) keys.inject(translations) do |result, _key| - _key = _key.to_sym - return nil unless result.is_a?(Hash) && result.has_key?(_key) + return nil unless result.is_a?(Hash) + unless result.has_key?(_key) + _key = _key.to_s.to_sym + return nil unless result.has_key?(_key) + end result = result[_key] result = resolve(locale, _key, result, options.merge(:scope => nil)) if result.is_a?(Symbol) result diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/transliterator.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/transliterator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/backend/transliterator.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/transliterator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/config.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/config.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/config.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/config.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb new file mode 100644 index 0000000000..1987ce32d8 --- /dev/null +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb @@ -0,0 +1,37 @@ +module I18n + module HashRefinements + refine Hash do + def slice(*keep_keys) + h = {} + keep_keys.each { |key| h[key] = fetch(key) if has_key?(key) } + h + end + + def except(*less_keys) + slice(*keys - less_keys) + end + + def deep_symbolize_keys + each_with_object({}) do |(key, value), result| + value = value.deep_symbolize_keys if value.is_a?(Hash) + result[symbolize_key(key)] = value + result + end + end + + # deep_merge_hash! by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809 + def deep_merge!(data) + merger = lambda do |_key, v1, v2| + Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 + end + merge!(data, &merger) + end + + private + + def symbolize_key(key) + key.respond_to?(:to_sym) ? key.to_sym : key + end + end + end +end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/string/interpolate.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/string/interpolate.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/core_ext/string/interpolate.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/string/interpolate.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/exceptions.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/exceptions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/exceptions.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/exceptions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext/helpers.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/helpers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext/helpers.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/helpers.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext/po_parser.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/po_parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/gettext/po_parser.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/po_parser.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/interpolate/ruby.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/interpolate/ruby.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/interpolate/ruby.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/interpolate/ruby.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/fallbacks.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/fallbacks.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/parents.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/parents.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/parents.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/parents.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/rfc4646.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/rfc4646.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/rfc4646.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/rfc4646.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/simple.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/simple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/locale/tag/simple.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/simple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/middleware.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/middleware.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/middleware.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/middleware.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/version.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb similarity index 70% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/version.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb index 08144dc604..d6c33c8198 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.2.0/lib/i18n/version.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module I18n - VERSION = "1.2.0" + VERSION = "1.3.0" end