From 1bc386fa47a8ff66bae97aa409aae1e555799421 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 2 Jan 2019 09:57:12 +0000 Subject: [PATCH] brew vendor-gems: commit updates. --- .../vendor/bundle-standalone/bundler/setup.rb | 4 +-- .../lib/i18n/core_ext/string/interpolate.rb | 9 ------ .../{i18n-1.3.0 => i18n-1.4.0}/lib/i18n.rb | 0 .../lib/i18n/backend.rb | 0 .../lib/i18n/backend/base.rb | 0 .../lib/i18n/backend/cache.rb | 0 .../lib/i18n/backend/cache_file.rb | 0 .../lib/i18n/backend/cascade.rb | 0 .../lib/i18n/backend/chain.rb | 0 .../lib/i18n/backend/fallbacks.rb | 0 .../lib/i18n/backend/flatten.rb | 0 .../lib/i18n/backend/gettext.rb | 0 .../i18n/backend/interpolation_compiler.rb | 0 .../lib/i18n/backend/key_value.rb | 0 .../lib/i18n/backend/memoize.rb | 0 .../lib/i18n/backend/metadata.rb | 0 .../lib/i18n/backend/pluralization.rb | 0 .../lib/i18n/backend/simple.rb | 0 .../lib/i18n/backend/transliterator.rb | 0 .../lib/i18n/config.rb | 0 .../lib/i18n/core_ext/hash.rb | 30 ++++++++++++------- .../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 +- 34 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/string/interpolate.rb rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/base.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/cache.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/cache_file.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/cascade.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/chain.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/fallbacks.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/flatten.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/gettext.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/interpolation_compiler.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/key_value.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/memoize.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/metadata.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/pluralization.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/simple.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/backend/transliterator.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/config.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/core_ext/hash.rb (55%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/exceptions.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/gettext.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/gettext/helpers.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/gettext/po_parser.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/interpolate/ruby.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale/fallbacks.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale/tag.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale/tag/parents.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale/tag/rfc4646.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/locale/tag/simple.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.0}/lib/i18n/middleware.rb (100%) rename Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/{i18n-1.3.0 => i18n-1.4.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 8fe414c419..4a246e3b73 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.3.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.4.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" @@ -20,7 +20,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/powerpack-0.1.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.61.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.30.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.1.0/lib" diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.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 deleted file mode 100644 index a353310bef..0000000000 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/string/interpolate.rb +++ /dev/null @@ -1,9 +0,0 @@ -# This file used to backport the Ruby 1.9 String interpolation syntax to Ruby 1.8. -# -# Since I18n has dropped support to Ruby 1.8, this file is not required anymore, -# however, Rails 3.2 still requires it directly: -# -# https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/core_ext/string/interpolation.rb#L2 -# -# So we can't just drop the file entirely, which would then break Rails users -# under Ruby 1.9. This file can be removed once Rails 3.2 support is dropped. diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/base.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/base.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/base.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/base.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cache.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cache.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache_file.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cache_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cache_file.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cache_file.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cascade.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cascade.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/cascade.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/cascade.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/chain.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/chain.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/chain.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/chain.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/fallbacks.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/fallbacks.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/flatten.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/flatten.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/flatten.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/flatten.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/gettext.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/gettext.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/gettext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/interpolation_compiler.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/interpolation_compiler.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/interpolation_compiler.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/interpolation_compiler.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/key_value.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/key_value.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/key_value.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/key_value.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/memoize.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/memoize.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/memoize.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/memoize.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/metadata.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/metadata.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/metadata.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/metadata.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/pluralization.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/pluralization.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/pluralization.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/pluralization.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/simple.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/simple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/simple.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/simple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/transliterator.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/transliterator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/backend/transliterator.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/backend/transliterator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/config.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/config.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/config.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.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.4.0/lib/i18n/core_ext/hash.rb similarity index 55% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/core_ext/hash.rb index 1987ce32d8..95434acda0 100644 --- 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.4.0/lib/i18n/core_ext/hash.rb @@ -1,20 +1,19 @@ 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 + using I18n::HashRefinements + def except(*keys) + dup.except!(*keys) end - def except(*less_keys) - slice(*keys - less_keys) + def except!(*keys) + keys.each { |key| delete(key) } + self 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[symbolize_key(key)] = deep_symbolize_keys_in_object(value) result end end @@ -27,11 +26,22 @@ module I18n merge!(data, &merger) end - private - def symbolize_key(key) key.respond_to?(:to_sym) ? key.to_sym : key end + + private + + def deep_symbolize_keys_in_object(value) + case value + when Hash + value.deep_symbolize_keys + when Array + value.map { |e| deep_symbolize_keys_in_object(e) } + else + value + end + end end end end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/exceptions.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/exceptions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/exceptions.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/exceptions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/helpers.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext/helpers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/helpers.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext/helpers.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/po_parser.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext/po_parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/gettext/po_parser.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/gettext/po_parser.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/interpolate/ruby.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/interpolate/ruby.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/interpolate/ruby.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/interpolate/ruby.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/fallbacks.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/fallbacks.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/parents.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/parents.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/parents.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/parents.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/rfc4646.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/rfc4646.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/rfc4646.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/rfc4646.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/simple.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/simple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/locale/tag/simple.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/locale/tag/simple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/middleware.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/middleware.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/middleware.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/middleware.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/version.rb similarity index 70% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb rename to Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/version.rb index d6c33c8198..860a66ab9c 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.3.0/lib/i18n/version.rb +++ b/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.4.0/lib/i18n/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module I18n - VERSION = "1.3.0" + VERSION = "1.4.0" end