github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Translation should return overrides first before attempting to fallback.

Browse Source 
https://meta.discourse.org/t/errors-after-migrating-to-a-new-version-1-9-0-beta3/65709/14?u=tgxworld
This commit is contained in:
Guo Xiang Tan
2017-07-11 12:51:12 +09:00
parent f529cb1674
commit b605d5d61b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/i18n/backend/discourse_i18n.rb
View File

@ -74,9 +74,8 @@ module I18n
existing_translations = super(locale, key, scope, options) existing_translations = super(locale, key, scope, options)
overrides = options.dig(:overrides, locale) overrides = options.dig(:overrides, locale)
if overrides && existing_translations if overrides && !scope&.include?(:models)
if options[:count] if existing_translations && options[:count]
remapped_translations = remapped_translations =
if existing_translations.is_a?(Hash) if existing_translations.is_a?(Hash)
Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }] Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }]

13
spec/components/discourse_i18n_spec.rb
View File

@ -163,6 +163,19 @@ describe I18n::Backend::DiscourseI18n do
.to eq('snow is the new queen') .to eq('snow is the new queen')
end end
it "returns override if it exists before falling back" do
I18n.backend.store_translations(:en, got: 'winter')
expect(I18n.translate('got', default: '')).to eq('winter')
expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('winter')
TranslationOverride.upsert!('ru', 'got', "summer")
I18n.backend.store_translations(:en, got: 'winter')
expect(I18n.translate('got', default: '')).to eq('winter')
expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('summer')
end
it 'supports ActiveModel::Naming#human' do it 'supports ActiveModel::Naming#human' do
Fish = Class.new(ActiveRecord::Base) Fish = Class.new(ActiveRecord::Base)