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: I18n Fallbacks were not applying correctly

Browse Source
This commit is contained in:
Robin Ward
2015-12-23 12:09:18 -05:00
parent 47410f1b99
commit d1ebb9d0b5
5 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/js_locale_helper.rb
View File

@ -81,9 +81,9 @@ module JsLocaleHelper
site_locale = SiteSetting.default_locale.to_sym
if Rails.env.development?
translations = load_translations(locale_sym, force: true)
else
# if Rails.env.development?
# translations = load_translations(locale_sym, force: true)
# else
if locale_sym == :en
translations = load_translations(locale_sym)
elsif locale_sym == site_locale || site_locale == :en
@ -91,7 +91,7 @@ module JsLocaleHelper
else
translations = load_translations_merged(locale_sym, site_locale, :en)
end
end
# end
message_formats = strip_out_message_formats!(translations[locale_str]['js'])