From e922f10f4e9e688f2fa0f9c6b9374909d9d7854d Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 25 Jul 2013 11:16:07 +1000 Subject: [PATCH] correct locale helper so it falls back to english message format if mf is missing --- lib/javascripts/moment_locale/ko.js | 2 +- lib/js_locale_helper.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/javascripts/moment_locale/ko.js b/lib/javascripts/moment_locale/ko.js index 7a59cb783b..53c509b9bb 100644 --- a/lib/javascripts/moment_locale/ko.js +++ b/lib/javascripts/moment_locale/ko.js @@ -2,7 +2,7 @@ // language : korean (ko) // author : Kyungwook, Park : https://github.com/kyungw00k -require('../moment').lang('ko', { +moment.lang('ko', { months : "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"), monthsShort : "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"), weekdays : "일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"), diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index eb18e3ea32..7956ccdb55 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -50,7 +50,11 @@ module JsLocaleHelper formats = message_formats.map{|k,v| k.inspect << " : " << compile_message_format(locale_str ,v)}.join(" , ") result = "MessageFormat = {locale: {}};\n" - result << File.read(Rails.root + "lib/javascripts/locale/#{locale_str}.js") << "\n" + + filename = Rails.root + "lib/javascripts/locale/#{locale_str}.js" + filename = Rails.root + "lib/javascripts/locale/en.js" unless File.exists?(filename) + + result << File.read(filename) << "\n" result << "I18n.messageFormat = (function(formats){ var f = formats;