未验证 提交 ff3c06f7 编写于 作者: V Vipul A M

Allow translate default option to accept an array similar to i18n.t. Fixes #29441

上级 db7398f7
...@@ -13,7 +13,7 @@ def translate(key, options = {}) ...@@ -13,7 +13,7 @@ def translate(key, options = {})
path = controller_path.tr("/", ".") path = controller_path.tr("/", ".")
defaults = [:"#{path}#{key}"] defaults = [:"#{path}#{key}"]
defaults << options[:default] if options[:default] defaults << options[:default] if options[:default]
options[:default] = defaults options[:default] = defaults.flatten
key = "#{path}.#{action_name}#{key}" key = "#{path}.#{action_name}#{key}"
end end
I18n.translate(key, options) I18n.translate(key, options)
......
...@@ -62,6 +62,7 @@ def test_lazy_lookup_fallback ...@@ -62,6 +62,7 @@ def test_lazy_lookup_fallback
def test_default_translation def test_default_translation
@controller.stub :action_name, :index do @controller.stub :action_name, :index do
assert_equal "bar", @controller.t("one.two") assert_equal "bar", @controller.t("one.two")
assert_equal "baz", @controller.t(".twoz", default: ["baz", :twoz])
end end
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册