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

Disable in development (js)

This commit is contained in:
Kane York 2015-07-15 14:25:24 -07:00
parent cb395662d0
commit 15905be788
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/js_locale_helper.rb
View File

@ -78,12 +78,16 @@ module JsLocaleHelper
site_locale = SiteSetting.default_locale.to_sym
if locale_sym == :en
if Rails.env.development?
translations = load_translations(locale_sym)
elsif locale_sym == site_locale || site_locale == :en
translations = load_translations_merged(locale_sym, :en)
else
translations = load_translations_merged(locale_sym, site_locale, :en)
if locale_sym == :en
translations = load_translations(locale_sym)
elsif locale_sym == site_locale || site_locale == :en
translations = load_translations_merged(locale_sym, :en)
else
translations = load_translations_merged(locale_sym, site_locale, :en)
end
end
message_formats = strip_out_message_formats!(translations[locale_str]['js'])