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

fix build

Browse Source
This commit is contained in:
Régis Hanol 2013-11-19 17:16:07 +01:00
parent 291acca4fa
commit 3a8bc60bf2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/js_locale_helper.rb
View File

@ -11,7 +11,7 @@ module JsLocaleHelper
plugin_translations.merge! YAML::load(File.open(file))
end
# merge translations (plugin translations overwrite default translations)
translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js'])
translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str]
# We used to split the admin versus the client side, but it's much simpler to just
# include both for now due to the small size of the admin section.