Fix that encoding drop-down in the import settings defaults to US-ASCII instead of...

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21336 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 13d5346648c4cedc0c41a2abb03ec10963c0813b..7b7a1cdf50e6268e4e155e05231046af61e7932e 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -53,6 +53,7 @@ class Setting < ActiveRecord::Base
                   windows-1257
                   windows-1258
                   windows-31j
+                  windows-874
                   ISO-2022-JP
                   ISO-8859-1
                   ISO-8859-2

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 57b997d05dec82339d754c3dc8fc810983b558a3..b282544e4f5d949b232b1dd53936221d8eb44681 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -144,7 +144,7 @@ th:
   general_lang_name: 'Thai (ไทย)'
   general_csv_separator: ','
   general_csv_decimal_separator: '.'
-  general_csv_encoding: Windows-874
+  general_csv_encoding: windows-874
   general_pdf_fontname: freeserif
   general_pdf_monospaced_fontname: freeserif
   general_first_day_of_week: '1'