IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Support for other i18n bundles

Browse Source
This commit is contained in:
Robin Ward
2016-08-25 16:33:29 -04:00
parent 7acbd63d92
commit 6070939daa
6 changed files with 103 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/js_locale_helper.rb
View File

@@ -20,15 +20,6 @@ module JsLocaleHelper
# 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']
# We used to split the admin versus the client side, but it's much simpler to just
# include both for now due to the small size of the admin section.
#
# For now, let's leave it split out in the translation file in case we want to split
# it again later, so we'll merge the JSON ourselves.
admin_contents = translations[locale_str].delete('admin_js')
translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present?
translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js']
translations
end
end
@@ -72,9 +63,8 @@ module JsLocaleHelper
end
end
def self.output_locale(locale)
locale_sym = locale.to_sym
locale_str = locale.to_s
def self.translations_for(locale_str)
locale_sym = locale_str.to_sym
current_locale = I18n.locale
I18n.locale = locale_sym
@@ -93,6 +83,19 @@ module JsLocaleHelper
end
end
I18n.locale = current_locale
translations
end
def self.output_locale(locale)
locale_str = locale.to_s
translations = translations_for(locale_str).dup
translations[locale_str].keys.each do |k|
translations[locale_str].delete(k) unless k == "js"
end
message_formats = strip_out_message_formats!(translations[locale_str]['js'])
result = generate_message_format(message_formats, locale_str)
@@ -104,8 +107,6 @@ module JsLocaleHelper
result << moment_locale(locale_str)
result << moment_formats
I18n.locale = current_locale
result
end