From 225f99377af1dd6b745697d617411d11bcef065d Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 25 Mar 2013 14:50:55 +0000 Subject: [PATCH] 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 --- config/locales/zh-TW.yml | 2 ++ test/integration/layout_test.rb | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 4224cb026..196b0ce98 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -4,6 +4,8 @@ "zh-TW": direction: ltr + jquery: + locale: "zh-TW" date: formats: # Use the strftime parameters for formats. diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index 34a29354c..557ce4663 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -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 -- 2.39.5