Merge pull request #678 from fatkodima/fix-interpolate-reserved-keywords

Raise when translated entry contains interpolations for reserved keywords and no substitutions provided
ruby-i18n · Nov 14, 2023 · baf8a88 · baf8a88
2 parents 59674c2 + d1762c6
commit baf8a88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb
@@ -55,12 +55,14 @@ def translate(locale, key, options = EMPTY_HASH)
 
         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

diff --git a/lib/i18n/tests/interpolation.rb b/lib/i18n/tests/interpolation.rb
@@ -112,6 +112,10 @@ module Interpolation
         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