diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-09-01 04:25:23 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-09-01 04:25:23 +0000 |
| commit | e26ae4f5beb92e2b053ed25eb2b44ca691a97edc (patch) | |
| tree | 17a0507955dcf98c801265fc19a913b2c9e0d471 | |
| parent | eee5d73ee11328e225104efaf8bc82a100f3ff23 (diff) | |
| download | redmine-e26ae4f5beb92e2b053ed25eb2b44ca691a97edc.tar.gz redmine-e26ae4f5beb92e2b053ed25eb2b44ca691a97edc.zip | |
Set UTF-8 as the default CSV export encoding (#41202).
Patch by Go MAEDA (user:maeda).
git-svn-id: https://svn.redmine.org/redmine/trunk@23007 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 6 | ||||
| -rw-r--r-- | test/helpers/application_helper_test.rb | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 49e8b0a82..a677b80a8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1830,12 +1830,12 @@ module ApplicationHelper def export_csv_encoding_select_tag return if l(:general_csv_encoding).casecmp('UTF-8') == 0 - options = [l(:general_csv_encoding), 'UTF-8'] + options = ['UTF-8', l(:general_csv_encoding)] content_tag(:p) do concat( content_tag(:label) do - concat l(:label_encoding) + ' ' - concat select_tag('encoding', options_for_select(options, l(:general_csv_encoding))) + concat "#{l(:label_encoding)} " + concat select_tag('encoding', options_for_select(options, 'UTF-8')) end ) end diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index c91ca37a0..ab0d8f91f 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -2277,12 +2277,10 @@ class ApplicationHelperTest < Redmine::HelperTest def test_export_csv_encoding_select_tag_should_have_two_option_when_general_csv_encoding_is_not_UTF8 with_locale 'en' do - assert_not_equal l(:general_csv_encoding), 'UTF-8' + assert_equal l(:general_csv_encoding), 'ISO-8859-1' result = export_csv_encoding_select_tag - assert_select_in result, - "option[selected='selected'][value=#{l(:general_csv_encoding)}]", - :text => l(:general_csv_encoding) - assert_select_in result, "option[value='UTF-8']", :text => 'UTF-8' + assert_select_in result, "option[selected='selected'][value='UTF-8']", :text => 'UTF-8' + assert_select_in result, "option[value='ISO-8859-1']", :text => 'ISO-8859-1' end end |