From f3f355a8bf43558717ce4cf6b8470fafd553f484 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 2 Jan 2022 02:38:32 +0000 Subject: [PATCH] Fix that encoding drop-down in the import settings defaults to US-ASCII instead of general_csv_encoding in Thai (#36377). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@21336 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/setting.rb | 1 + config/locales/th.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 13d534664..7b7a1cdf5 100644 --- 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 57b997d05..b282544e4 100644 --- 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' -- 2.39.5