github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 02:48:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not override existing translations.

Browse Source
This commit is contained in:
Guo Xiang Tan
2015-12-31 23:20:19 +08:00
parent eb7417ea0c
commit 556cd1e3f8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ module I18n
if options[:overrides] && existing_translations
if options[:count]
existing_translations =
remapped_translations =
if existing_translations.is_a?(Hash)
Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }]
elsif existing_translations.is_a?(String)
@ -79,7 +79,7 @@ module I18n
result = {}
existing_translations.merge(options[:overrides]).each do |k, v|
remapped_translations.merge(options[:overrides]).each do |k, v|
result[k.split('.').last.to_sym] = v if k != key && k.start_with?(key.to_s)
end
return result if result.size > 0