36377.patch

Go MAEDA, 2022-01-01 09:13

Download (2.69 KB)

View differences:

app/models/setting.rb
53 53
                  windows-1257
54 54
                  windows-1258
55 55
                  windows-31j
56
                  windows-874
56 57
                  ISO-2022-JP
57 58
                  ISO-8859-1
58 59
                  ISO-8859-2
......
73 74
                  EUC-JP
74 75
                  Shift_JIS
75 76
                  CP932
77
                  CP949
76 78
                  GB18030
77 79
                  GBK
78 80
                  EUC-KR
config/locales/th.yml
144 144
  general_lang_name: 'Thai (ไทย)'
145 145
  general_csv_separator: ','
146 146
  general_csv_decimal_separator: '.'
147
  general_csv_encoding: Windows-874
147
  general_csv_encoding: windows-874
148 148
  general_pdf_fontname: freeserif
149 149
  general_pdf_monospaced_fontname: freeserif
150 150
  general_first_day_of_week: '1'
config/locales/zh.yml
150 150
  general_lang_name: 'Chinese/Simplified (简体中文)'
151 151
  general_csv_separator: ','
152 152
  general_csv_decimal_separator: '.'
153
  general_csv_encoding: gb18030
153
  general_csv_encoding: GB18030
154 154
  general_pdf_fontname: stsongstdlight
155 155
  general_pdf_monospaced_fontname: stsongstdlight
156 156
  general_first_day_of_week: '7'
test/functional/imports_controller_test.rb
34 34
           :custom_fields_projects,
35 35
           :custom_fields_trackers
36 36

  
37
  include Redmine::I18n
38

  
37 39
  def setup
38 40
    User.current = nil
39 41
    @request.session[:user_id] = 2
......
72 74
    assert_response :success
73 75
    assert_select 'select[name=?]', 'import_settings[separator]'
74 76
    assert_select 'select[name=?]', 'import_settings[wrapper]'
75
    assert_select 'select[name=?]', 'import_settings[encoding]'
77
    assert_select 'select[name=?]', 'import_settings[encoding]' do
78
      encodings = valid_languages.map do |lang|
79
        ll(lang.to_s, :general_csv_encoding)
80
      end.uniq
81
      encodings.each do |encoding|
82
        assert_select 'option[value=?]', encoding
83
      end
84
    end
76 85
    assert_select 'select[name=?]', 'import_settings[date_format]'
77 86
  end
78 87