Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 16:26:03 +01:00
Code Issues Packages Projects Releases Activity

Set UTF-8 as the default CSV export encoding (#41202).

Browse Source 
Patch by Go MAEDA (user:maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@23007 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-09-01 04:25:23 +00:00
parent eee5d73ee1
commit e26ae4f5be
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/application_helper.rb
View File

@@ -1830,12 +1830,12 @@ module ApplicationHelper
def export_csv_encoding_select_tag def export_csv_encoding_select_tag
return if l(:general_csv_encoding).casecmp('UTF-8') == 0 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 content_tag(:p) do
concat( concat(
content_tag(:label) do content_tag(:label) do
concat l(:label_encoding) + ' ' concat "#{l(:label_encoding)} "
concat select_tag('encoding', options_for_select(options, l(:general_csv_encoding))) concat select_tag('encoding', options_for_select(options, 'UTF-8'))
end end
) )
end end

8
test/helpers/application_helper_test.rb
View File

@@ -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 def test_export_csv_encoding_select_tag_should_have_two_option_when_general_csv_encoding_is_not_UTF8
with_locale 'en' do 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 result = export_csv_encoding_select_tag
assert_select_in result, assert_select_in result, "option[selected='selected'][value='UTF-8']", :text => 'UTF-8'
"option[selected='selected'][value=#{l(:general_csv_encoding)}]", assert_select_in result, "option[value='ISO-8859-1']", :text => 'ISO-8859-1'
:text => l(:general_csv_encoding)
assert_select_in result, "option[value='UTF-8']", :text => 'UTF-8'
end end
end end