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.

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

I18n::Backend::Chain#translations should merge from all backends #470

Merged
merged 4 commits into from
Mar 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/i18n/backend/chain.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,13 @@ def init_translations
end

def translations
backends.first.instance_eval do
init_translations unless initialized?
translations
backends.reverse.each_with_object({}) do |backend, memo|
partial_translations = backend.instance_eval do
init_translations unless initialized?
translations
end

memo.deep_merge!(partial_translations)
end
end

Expand Down
9 changes: 6 additions & 3 deletions test/backend/chain_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,19 @@ def setup
assert @second.initialized?
end

test 'should be able to get all translations of the first backend' do
test 'should be able to get all translations of all backends merged together' do
assert_equal I18n.backend.send(:translations),
en: {
foo: 'Foo',
bar: 'Bar',
formats: {
short: 'short',
subformats: { short: 'short' }
long: 'long',
subformats: { short: 'short', long: 'long' }
},
plural_1: { one: "%{count}" },
dates: { a: 'A' }
plural_2: { one: 'one' },
dates: { a: 'A', b: 'B' }
}
end

Expand Down