github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 13:11:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Use keyword argument for fallback_to_english flag

Browse Source
This commit is contained in:
Gerhard Schlager
2019-02-19 14:42:58 +01:00
parent 05ee1d1aba
commit 84c56e16f9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/translation_override.rb
View File

@ -21,7 +21,7 @@ class TranslationOverride < ActiveRecord::Base
data = { value: value } data = { value: value }
if key.end_with?('_MF') if key.end_with?('_MF')
_, filename = JsLocaleHelper.find_message_format_locale([locale], false) _, filename = JsLocaleHelper.find_message_format_locale([locale], fallback_to_english: false)
data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, value) data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, value)
end end

2
lib/i18n/locale_file_checker.rb
View File

@ -112,7 +112,7 @@ class LocaleFileChecker
end end
def check_message_format def check_message_format
mf_locale, mf_filename = JsLocaleHelper.find_message_format_locale([@locale], true) mf_locale, mf_filename = JsLocaleHelper.find_message_format_locale([@locale], fallback_to_english: true)
traverse_hash(@locale_yaml, []) do |keys, value| traverse_hash(@locale_yaml, []) do |keys, value|
next unless keys.last.ends_with?("_MF") next unless keys.last.ends_with?("_MF")

12
lib/js_locale_helper.rb
View File

@ -137,7 +137,7 @@ module JsLocaleHelper
message_formats = strip_out_message_formats!(translations[locale_str]['js']) message_formats = strip_out_message_formats!(translations[locale_str]['js'])
message_formats.merge!(strip_out_message_formats!(translations[locale_str]['admin_js'])) message_formats.merge!(strip_out_message_formats!(translations[locale_str]['admin_js']))
mf_locale, mf_filename = find_message_format_locale([locale_str], true) mf_locale, mf_filename = find_message_format_locale([locale_str], fallback_to_english: true)
result = generate_message_format(message_formats, mf_locale, mf_filename) result = generate_message_format(message_formats, mf_locale, mf_filename)
translations.keys.each do |l| translations.keys.each do |l|
@ -167,15 +167,15 @@ module JsLocaleHelper
# moment.js uses a different naming scheme for locale files # moment.js uses a different naming scheme for locale files
locale_chain = locale_chain.map { |l| l.tr('_', '-').downcase } locale_chain = locale_chain.map { |l| l.tr('_', '-').downcase }
find_locale(locale_chain, path, :moment_js, false) find_locale(locale_chain, path, :moment_js, fallback_to_english: false)
end end
def self.find_message_format_locale(locale_chain, fallback_to_english) def self.find_message_format_locale(locale_chain, fallback_to_english:)
path = "#{Rails.root}/lib/javascripts/locale" path = "#{Rails.root}/lib/javascripts/locale"
find_locale(locale_chain, path, :message_format, fallback_to_english) find_locale(locale_chain, path, :message_format, fallback_to_english: fallback_to_english)
end end
def self.find_locale(locale_chain, path, type, fallback_to_english) def self.find_locale(locale_chain, path, type, fallback_to_english:)
locale_chain.each do |locale| locale_chain.each do |locale|
plugin_locale = DiscoursePluginRegistry.locales[locale] plugin_locale = DiscoursePluginRegistry.locales[locale]
return plugin_locale[type] if plugin_locale&.has_key?(type) return plugin_locale[type] if plugin_locale&.has_key?(type)
@ -188,7 +188,7 @@ module JsLocaleHelper
locale_chain = locale_chain.map { |l| l.split(/[-_]/)[0] } locale_chain = locale_chain.map { |l| l.split(/[-_]/)[0] }
.uniq.reject { |l| locale_chain.include?(l) } .uniq.reject { |l| locale_chain.include?(l) }
unless locale_chain.empty? unless locale_chain.empty?
locale_data = find_locale(locale_chain, path, type, false) locale_data = find_locale(locale_chain, path, type, fallback_to_english: false)
return locale_data if locale_data return locale_data if locale_data
end end

2
lib/plugin/instance.rb
View File

@ -632,7 +632,7 @@ class Plugin::Instance
path = File.join(lib_locale_path, "message_format") path = File.join(lib_locale_path, "message_format")
opts[:message_format] = find_locale_file(locale_chain, path) opts[:message_format] = find_locale_file(locale_chain, path)
opts[:message_format] = JsLocaleHelper.find_message_format_locale(locale_chain, false) unless opts[:message_format] opts[:message_format] = JsLocaleHelper.find_message_format_locale(locale_chain, fallback_to_english: false) unless opts[:message_format]
path = File.join(lib_locale_path, "moment_js") path = File.join(lib_locale_path, "moment_js")
opts[:moment_js] = find_locale_file(locale_chain, path) opts[:moment_js] = find_locale_file(locale_chain, path)