diff options
| -rw-r--r-- | app/models/import.rb | 2 | ||||
| -rw-r--r-- | test/unit/issue_import_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index e048867c8..f64fe7d06 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -72,7 +72,7 @@ class Import < ActiveRecord::Base separator = [',', ';'].max_by {|sep| content.count(sep)} - guessed_encoding = Redmine::CodesetUtil.guess_encoding(file_content) + guessed_encoding = Redmine::CodesetUtil.guess_encoding(content) encoding = (guessed_encoding && ( Setting::ENCODINGS.detect {|e| e.casecmp?(guessed_encoding)} || diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb index 3f98f0372..79038ace4 100644 --- a/test/unit/issue_import_test.rb +++ b/test/unit/issue_import_test.rb @@ -414,6 +414,9 @@ class IssueImportTest < ActiveSupport::TestCase def test_set_default_settings_should_guess_encoding import = generate_import('import_iso8859-1.csv') + user = User.generate!(:language => 'ja') + import.user = user + assert_equal 'CP932', lu(user, :general_csv_encoding) with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do import.set_default_settings guessed_encoding = import.settings['encoding'] |