updated bootstrap-datepicker and fixed zh locale problem #30 next try

This commit is contained in:
Alexander Meindl 2016-05-12 18:07:41 +02:00
parent 21a3f35428
commit 8aeea1f885
3 changed files with 1 additions and 2 deletions

View File

@ -1 +0,0 @@
!function(a){a.fn.datepicker.dates["zh-CN"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["周日","周一","周二","周三","周四","周五","周六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今日",clear:"清除",format:"yyyy年mm月dd日",titleFormat:"yyyy年mm月",weekStart:1}}(jQuery);

View File

@ -0,0 +1 @@
!function(a){a.fn.datepicker.dates["zh"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["周日","周一","周二","周三","周四","周五","周六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今日",clear:"清除",format:"yyyy年mm月dd日",titleFormat:"yyyy年mm月",weekStart:1}}(jQuery);

View File

@ -107,7 +107,6 @@ module RedmineTweaks
def bootstrap_datepicker_locale
s = ''
locale = User.current.language.blank? ? ::I18n.locale : User.current.language
locale = 'zh-CN' if locale == 'zh'
s = javascript_include_tag("locales/bootstrap-datepicker.#{locale}.min.js", plugin: 'redmine_tweaks') unless locale == 'en'
s
end