Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep the translation missing message when default is not nil #389

Merged
merged 1 commit into from Nov 3, 2017
Merged

Keep the translation missing message when default is not nil #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/i18n/backend/fallbacks.rb
View file
Open in desktop
Expand Up @@ -37,8 +37,7 @@ module Fallbacks
def translate(locale, key, options = {})
return super unless options.fetch(:fallback, true)
return super if options[:fallback_in_progress]
original_default = options[:default]
extract_non_symbol_default!(options)
default = extract_non_symbol_default!(options) if options[:default]

begin
options[:fallback_in_progress] = true
Expand All @@ -56,7 +55,9 @@ def translate(locale, key, options = {})
options.delete(:fallback_in_progress)
end

return super(locale, nil, options.merge(:default => original_default)) if options.key?(:default)
return if options.key?(:default) && options[:default].nil?

return super(locale, nil, options.merge(:default => default)) if default
throw(:exception, I18n::MissingTranslation.new(locale, key, options))
end

Expand Down
4 changes: 4 additions & 0 deletions test/backend/fallbacks_test.rb
View file
Open in desktop
Expand Up @@ -64,6 +64,10 @@ def setup
assert_nil I18n.t(:missing_bar, :locale => :'de-DE', :default => nil)
end

test "returns the translation missing message if the default is also missing" do
assert_equal 'translation missing: de-DE.missing_bar', I18n.t(:missing_bar, :locale => :'de-DE', :default => [:missing_baz])
end

test "returns the :'de-DE' default :baz translation for a missing :'de-DE' when defaults contains Symbol" do
assert_equal 'Baz in :de-DE', I18n.t(:missing_foo, :locale => :'de-DE', :default => [:baz, "Default Bar"])
end
Expand Down