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

fixup: support merging N languages (js)

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

15
lib/js_locale_helper.rb
View File

@ -55,15 +55,14 @@ module JsLocaleHelper
def self.load_translations_merged(*locales) def self.load_translations_merged(*locales)
@loaded_merges ||= {} @loaded_merges ||= {}
@loaded_merges[locales.join('-')] ||= begin @loaded_merges[locales.join('-')] ||= begin
# TODO - this will need to be reworked to support N fallbacks in the future all_translations = {}
all_translations = locales.map { |l| JsLocaleHelper.load_translations l }
merged_translations = {} merged_translations = {}
merged_translations[locales[0].to_s] = all_translations[0][locales[0].to_s] loaded_locales = []
if locales[1]
merged_translations[locales[1].to_s] = deep_delete_matches(all_translations[1][locales[1].to_s].dup, merged_translations[locales[0].to_s]) locales.map(&:to_s).each do |locale|
end all_translations[locale] = JsLocaleHelper.load_translations locale
if locales[2] merged_translations[locale] = deep_delete_matches(all_translations[locale][locale], *loaded_locales.map { |l| merged_translations[l] })
merged_translations[locales[2].to_s] = deep_delete_matches(all_translations[2][locales[2].to_s].dup, merged_translations[locales[0].to_s], merged_translations[locales[1].to_s]) loaded_locales << locale
end end
merged_translations merged_translations
end end