Merged r11682 and r11685 from trunk to 2.3-stable (#13579)

fix that datepicker uses Simplified Chinese in Traditional Chinese locale.

Contributed by Chage Juan.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11689 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-03-25 14:50:55 +00:00
parent d8cf4c57d3
commit 225f99377a
2 changed files with 12 additions and 0 deletions

View File

@ -4,6 +4,8 @@
"zh-TW":
direction: ltr
jquery:
locale: "zh-TW"
date:
formats:
# Use the strftime parameters for formats.

View File

@ -85,6 +85,16 @@ class LayoutTest < ActionController::IntegrationTest
get '/issues'
assert_not_include "/javascripts/i18n/jquery.ui.datepicker", response.body
end
with_settings :default_language => 'zh' do
get '/issues'
assert_include "/javascripts/i18n/jquery.ui.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
end
end
def test_search_field_outside_project_should_link_to_global_search