Commit 01528914 authored by marutosijp's avatar marutosijp

rename jQuery Datepicker i18n file name

jquery-ui renamed these files.
https://github.com/jquery/jquery-ui/commit/21154cfa2e02ef1814a6aff68b14553bdad165cb

git-svn-id: https://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent ed034f12
......@@ -1190,7 +1190,7 @@ module ApplicationHelper
"beforeShow: beforeShowDatePicker};")
jquery_locale = l('jquery.locale', :default => current_language.to_s)
unless jquery_locale == 'en'
tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js")
tags << javascript_include_tag("i18n/datepicker-#{jquery_locale}.js")
end
tags
end
......
......@@ -73,37 +73,37 @@ class LayoutTest < ActionController::IntegrationTest
def test_calendar_header_tags
with_settings :default_language => 'fr' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-fr.js", response.body
assert_include "/javascripts/i18n/datepicker-fr.js", response.body
end
with_settings :default_language => 'en-GB' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-en-GB.js", response.body
assert_include "/javascripts/i18n/datepicker-en-GB.js", response.body
end
with_settings :default_language => 'en' do
get '/issues'
assert_not_include "/javascripts/i18n/jquery.ui.datepicker", response.body
assert_not_include "/javascripts/i18n/datepicker", response.body
end
with_settings :default_language => 'zh' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-zh-CN.js", response.body
assert_include "/javascripts/i18n/datepicker-zh-CN.js", response.body
end
with_settings :default_language => 'zh-TW' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-zh-TW.js", response.body
assert_include "/javascripts/i18n/datepicker-zh-TW.js", response.body
end
with_settings :default_language => 'pt' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-pt.js", response.body
assert_include "/javascripts/i18n/datepicker-pt.js", response.body
end
with_settings :default_language => 'pt-BR' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.datepicker-pt-BR.js", response.body
assert_include "/javascripts/i18n/datepicker-pt-BR.js", response.body
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment