Fix I18n.t when locale contains separator

ruby-i18n · May 8, 2023 · 3a056ad · 3a056ad
1 parent a5a2ba6
commit 3a056ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/i18n.rb b/lib/i18n.rb
@@ -331,9 +331,8 @@ def with_locale(tmp_locale = nil)
     # keys are Symbols.
     def normalize_keys(locale, key, scope, separator = nil)
       separator ||= I18n.default_separator
-      locale = locale.to_sym if locale
 
-      result = [locale]
+      result = locale ? normalize_key(locale, separator) : [locale]
       result.concat(normalize_key(scope, separator)) if scope
       result.concat(normalize_key(key, separator))
     end

diff --git a/test/i18n_test.rb b/test/i18n_test.rb
@@ -140,6 +140,10 @@ def setup
     assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz|buz', :'foo|bar', '|')
   end
 
+  test "normalize_keys normalizes given locale with separator" do
+    assert_equal [:en, :foo, :bar, :baz], I18n.normalize_keys(:"en.foo", :baz, :bar)
+  end
+
   test "can set the exception_handler" do
     begin
       previous_exception_handler = I18n.exception_handler