Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure that the right locale exists before merging.

This commit is contained in:
Guo Xiang Tan 2016-09-30 15:01:42 +08:00
parent 1c3992e575
commit ccd75cf987
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/js_locale_helper.rb
View File

@ -7,7 +7,9 @@ module JsLocaleHelper
translations = {} translations = {}
Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file| Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file|
translations.deep_merge! YAML::load(File.open(file))[locale_str] if plugin_translations = YAML::load(File.open(file))[locale_str]
translations.deep_merge!(plugin_translations)
end
end end
translations translations