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

FIX: moment_js locale files provided by plugins were ignored

Browse Source
This commit is contained in:
Gerhard Schlager
2019-02-19 15:27:30 +01:00
parent 84c56e16f9
commit 4799cf2811
10 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/js_locale_helper.rb
View File

@@ -164,10 +164,10 @@ module JsLocaleHelper
def self.find_moment_locale(locale_chain)
path = "#{Rails.root}/vendor/assets/javascripts/moment-locale"
# moment.js uses a different naming scheme for locale files
locale_chain = locale_chain.map { |l| l.tr('_', '-').downcase }
find_locale(locale_chain, path, :moment_js, fallback_to_english: false)
find_locale(locale_chain, path, :moment_js, fallback_to_english: false) do
# moment.js uses a different naming scheme for locale files
locale_chain.map { |l| l.tr('_', '-').downcase }
end
end
def self.find_message_format_locale(locale_chain, fallback_to_english:)
@@ -184,6 +184,8 @@ module JsLocaleHelper
return [locale, filename] if File.exist?(filename)
end
locale_chain = yield if block_given?
# try again, but this time only with the language itself
locale_chain = locale_chain.map { |l| l.split(/[-_]/)[0] }
.uniq.reject { |l| locale_chain.include?(l) }