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

DEV: Yarn-manage moment and moment-timezone libraries

Browse Source
This commit is contained in:
Penar Musaraj
2019-02-12 13:57:52 -05:00
parent c23411cc69
commit 5cef5b34ef
132 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/js_locale_helper.rb
View File

@@ -153,8 +153,8 @@ module JsLocaleHelper
result << "I18n.pluralizationRules.#{locale_str} = MessageFormat.locale.#{mf_locale};\n" if mf_locale != "en"
# moment
result << File.read("#{Rails.root}/lib/javascripts/moment.js")
result << File.read("#{Rails.root}/lib/javascripts/moment-timezone-with-data.js")
result << File.read("#{Rails.root}/vendor/assets/javascripts/moment.js")
result << File.read("#{Rails.root}/vendor/assets/javascripts/moment-timezone-with-data.js")
result << moment_locale(locale_str)
result << moment_formats
@@ -162,7 +162,7 @@ module JsLocaleHelper
end
def self.find_moment_locale(locale_chain)
path = "#{Rails.root}/lib/javascripts/moment_locale"
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 }