i18n 1.14.0 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56f42c8544a7ce959616902c3a1dcabe350581001f708b43883504995c29835a
-  data.tar.gz: 8502fbd1b16386dc75b9feac93e023915671ade132423b04538324e8c855de8c
+  metadata.gz: ea48f292aece0bdb7828a9105d15760ad8668254eecd8877e312f8381d179f6a
+  data.tar.gz: ba1a7fe8f3998571013e4c72fcd8c047944ecdc6d0561058e03dd5a5242b1020
 SHA512:
-  metadata.gz: 8b19cf52d0c49c3f521d3917958b47a235d61d374af806ade81da6092bf68577153012cf98cb61c85b4f951284a96aeace9280c8ca64d78e6f0b7546ef3f8d64
-  data.tar.gz: ac025237950bb63b2f66ff28ceb9cadb9de16bd9b55853ee47a48f61552c5192805bbc4415e4f8394481c74130c8163938707cf861ad65d58438636be096ccae
+  metadata.gz: 0b8fdf47e5b10f58a8a214527ab5cece35ba22fb08df89e5f258fc3436a5d5be55318222f667c027025df2535d8acf0177f1ee3a5c16efa1b6e85aa3a50e9ad2
+  data.tar.gz: 77925068fc786fa599830414bc466da240254754be3b6e64929e4becb1ae678ad50220128caee95fad963c916b3c8c2cc5bf3766944c8b9d067aaaccf1c6e384

data/README.md

@@ -13,10 +13,14 @@ Currently maintained by @radar.
 
 You will most commonly use this library within a Rails app.
 
+We support Rails versions from 6.0 and up.
+
 [See the Rails Guide](https://guides.rubyonrails.org/i18n.html) for an example of its usage.
 
 ### Ruby (without Rails)
 
+We support Ruby versions from 3.0 and up.
+
 If you want to use this library without Rails, you can simply add `i18n` to your `Gemfile`:
 
 ```ruby

data/lib/i18n/backend/base.rb

@@ -55,12 +55,14 @@ module I18n
 
         deep_interpolation = options[:deep_interpolation]
         values = Utils.except(options, *RESERVED_KEYS) unless options.empty?
-        if values
+        if values && !values.empty?
           entry = if deep_interpolation
             deep_interpolate(locale, entry, values)
           else
             interpolate(locale, entry, values)
           end
+        elsif entry.is_a?(String) && entry =~ I18n.reserved_keys_pattern
+          raise ReservedInterpolationKey.new($1.to_sym, entry)
         end
         entry
       end

data/lib/i18n/backend/chain.rb

@@ -16,6 +16,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.
+    # 
+    # Fallback translations using the :default option are only used by the last backend of a chain.
     class Chain
       module Implementation
         include Base

data/lib/i18n/backend/fallbacks.rb

@@ -95,7 +95,7 @@ module I18n
         return super unless options.fetch(:fallback, true)
         I18n.fallbacks[locale].each do |fallback|
           begin
-            return true if super(fallback, key)
+            return true if super(fallback, key, options)
           rescue I18n::InvalidLocale
             # we do nothing when the locale is invalid, as this is a fallback anyways.
           end

data/lib/i18n/backend/interpolation_compiler.rb

@@ -21,8 +21,7 @@ module I18n
       module Compiler
         extend self
 
-        TOKENIZER                    = /(%%\{[^\}]+\}|%\{[^\}]+\})/
-        INTERPOLATION_SYNTAX_PATTERN = /(%)?(%\{([^\}]+)\})/
+        TOKENIZER = /(%%?\{[^}]+\})/
 
         def compile_if_an_interpolation(string)
           if interpolated_str?(string)
@@ -37,7 +36,7 @@ module I18n
         end
 
         def interpolated_str?(str)
-          str.kind_of?(::String) && str =~ INTERPOLATION_SYNTAX_PATTERN
+          str.kind_of?(::String) && str =~ TOKENIZER
         end
 
         protected
@@ -48,13 +47,12 @@ module I18n
 
         def compiled_interpolation_body(str)
           tokenize(str).map do |token|
-            (matchdata = token.match(INTERPOLATION_SYNTAX_PATTERN)) ? handle_interpolation_token(token, matchdata) : escape_plain_str(token)
+            token.match(TOKENIZER) ? handle_interpolation_token(token) : escape_plain_str(token)
           end.join
         end
 
-        def handle_interpolation_token(interpolation, matchdata)
-          escaped, pattern, key = matchdata.values_at(1, 2, 3)
-          escaped ? pattern : compile_interpolation_token(key.to_sym)
+        def handle_interpolation_token(token)
+          token.start_with?('%%') ? token[1..] : compile_interpolation_token(token[2..-2])
         end
 
         def compile_interpolation_token(key)

data/lib/i18n/exceptions.rb

@@ -63,8 +63,8 @@ module I18n
       end
 
       def message
-        if options[:default].is_a?(Array)
-          other_options = ([key, *options[:default]]).map { |k| normalized_option(k).prepend('- ') }.join("\n")
+        if (default = options[:default]).is_a?(Array) && default.any?
+          other_options = ([key, *default]).map { |k| normalized_option(k).prepend('- ') }.join("\n")
           "Translation missing. Options considered were:\n#{other_options}"
         else
           "Translation missing: #{keys.join('.')}"

data/lib/i18n/locale/fallbacks.rb

@@ -79,6 +79,14 @@ module I18n
         end
       end
 
+      def empty?
+        @map.empty? && @defaults.empty?
+      end
+
+      def inspect
+       "#<#{self.class.name} @map=#{@map.inspect} @defaults=#{@defaults.inspect}>"
+      end
+
       protected
 
       def compute(tags, include_defaults = true, exclude = [])

data/lib/i18n/tests/interpolation.rb

@@ -112,6 +112,10 @@ module I18n
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{default}') }
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{separator}') }
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{scope}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:default => '%{scope}') }
+
+        I18n.backend.store_translations(:en, :interpolate => 'Hi %{scope}!')
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:interpolate) }
       end
 
       test "interpolation: deep interpolation for default string" do

data/lib/i18n/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18n
-  VERSION = "1.14.0"
+  VERSION = "1.14.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -29,6 +29,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
@@ -106,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: New wave Internationalization support for Ruby