diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-06 20:56:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-06 20:56:47 +0000 |
| commit | ba4744d4c48e21f3f640fca860993e36998e943d (patch) | |
| tree | 75a9970ed5e1fde44bce526cba0c14342b13d474 /app/controllers/imports_controller.rb | |
| parent | 433e88717027040b2aadaa66e77c196011c7179d (diff) | |
| download | redmine-ba4744d4c48e21f3f640fca860993e36998e943d.tar.gz redmine-ba4744d4c48e21f3f640fca860993e36998e943d.zip | |
Merged r16572 (#25861).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16618 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/imports_controller.rb')
| -rw-r--r-- | app/controllers/imports_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb index 79a5ced4b..555f4547b 100644 --- a/app/controllers/imports_controller.rb +++ b/app/controllers/imports_controller.rb @@ -50,7 +50,7 @@ class ImportsController < ApplicationController rescue CSV::MalformedCSVError => e flash.now[:error] = l(:error_invalid_csv_file_or_settings) - rescue ArgumentError, Encoding::InvalidByteSequenceError => e + rescue ArgumentError, EncodingError => e flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding'])) rescue SystemCallError => e flash.now[:error] = l(:error_can_not_read_import_file) |