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: Plugin "admin_js" translations bundle was not fetched.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-09-29 04:26:36 +08:00
parent 50d4f9d016
commit 72ccb4e11d
3 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/js_locale_helper.rb
View File

@ -1,5 +1,19 @@
module JsLocaleHelper
def self.plugin_translations(locale_str)
@plugin_translations ||= HashWithIndifferentAccess.new
@plugin_translations[locale_str] ||= begin
translations = {}
Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file|
translations.deep_merge! YAML::load(File.open(file))[locale_str]
end
translations
end
end
def self.load_translations(locale, opts=nil)
opts ||= {}
@ -11,14 +25,9 @@ module JsLocaleHelper
# load default translations
translations = YAML::load(File.open("#{Rails.root}/config/locales/client.#{locale_str}.yml"))
# load plugins translations
plugin_translations = {}
Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file|
plugin_translations.deep_merge! YAML::load(File.open(file))
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']
translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if translations[locale_str] && plugin_translations(locale_str) && plugin_translations(locale_str)['js']
translations
end
@ -71,17 +80,16 @@ module JsLocaleHelper
site_locale = SiteSetting.default_locale.to_sym
if Rails.env.development?
translations = load_translations(locale_sym, force: true)
else
if locale_sym == :en
translations = load_translations(locale_sym)
translations =
if Rails.env.development?
load_translations(locale_sym, force: true)
elsif locale_sym == :en
load_translations(locale_sym)
elsif locale_sym == site_locale || site_locale == :en
translations = load_translations_merged(locale_sym, :en)
load_translations_merged(locale_sym, :en)
else
translations = load_translations_merged(locale_sym, site_locale, :en)
load_translations_merged(locale_sym, site_locale, :en)
end
end
I18n.locale = current_locale