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

FIX: admin strings in plugins should fallback to english when untranslated

Browse Source
This commit is contained in:
Neil Lalonde
2017-11-24 14:11:01 -05:00
parent c2da25dd5c
commit 6f8f2c494d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/js_locale_helper.rb
View File

@ -52,7 +52,10 @@ module JsLocaleHelper
end
# merge translations (plugin translations overwrite default translations)
translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if translations[locale_str] && plugin_translations(locale_str) && plugin_translations(locale_str)['js']
if translations[locale_str] && plugin_translations(locale_str)
translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if plugin_translations(locale_str)['js']
translations[locale_str]['admin_js'].deep_merge!(plugin_translations(locale_str)['admin_js']) if plugin_translations(locale_str)['admin_js']
end
translations
end