Improve error message whan importing CSV files with incorrect character encoding [SCI-815]

This commit is contained in:
Oleksii Kriuchykhin 2017-01-05 17:00:21 +01:00
parent 09ef3b3ad5
commit cba064dfcc
2 changed files with 3 additions and 2 deletions

View file

@ -74,7 +74,8 @@ class OrganizationsController < ApplicationController
end
end
rescue ArgumentError, CSV::MalformedCSVError
error = t("organizations.parse_sheet.errors.invalid_file")
error = t('organizations.parse_sheet.errors.invalid_file',
encoding: ''.encoding)
format.html {
flash[:alert] = error
redirect_to session.delete(:return_to)

View file

@ -922,7 +922,7 @@ en:
import_samples: "Import samples"
do_not_include_column: "Do not include this column"
errors:
invalid_file: "The file you provided is invalid."
invalid_file: "The file you provided is invalid. Make sure the file is encoded using %{encoding}."
invalid_extension: "The file has invalid extension."
empty_file: "You've selected empty file. There's not much to import."
temp_file_failure: "We couldn't create temporary file. Please contact administrator."