diff options
| author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-31 16:39:43 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2019-01-07 11:16:58 +0800 |
| commit | e2698d5d7455d91fa94f9bbf1fc838f8cb142700 (patch) | |
| tree | 900a7abd2983a5a31843c25a13ce06898c1e02d6 /app/views/notify/import_issues_csv_email.text.erb | |
| parent | 63e9969ca3ac57839b78d9cc44bcf32bc9a45248 (diff) | |
| download | gitlab-ce-e2698d5d7455d91fa94f9bbf1fc838f8cb142700.tar.gz | |
Improve email messages
Also refactored cleanup view to use the same localized string
Diffstat (limited to 'app/views/notify/import_issues_csv_email.text.erb')
| -rw-r--r-- | app/views/notify/import_issues_csv_email.text.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/notify/import_issues_csv_email.text.erb b/app/views/notify/import_issues_csv_email.text.erb index 54a1762c4ec..1117f90714d 100644 --- a/app/views/notify/import_issues_csv_email.text.erb +++ b/app/views/notify/import_issues_csv_email.text.erb @@ -1,11 +1,11 @@ Your CSV import for project <%= @project.full_name %> (<%= project_url(@project) %>) has been completed. -<%= pluralize(@results[:success], 'issue') %> imported successfully. +<%= pluralize(@results[:success], 'issue') %> imported. -<% if @results[:errors].present? %> -Errors found on line <%= 'number'.pluralize(@results[:errors].size) %>: <%= @results[:errors].join(', ') %>. +<% if @results[:error_lines].present? %> +Errors found on line <%= 'number'.pluralize(@results[:error_lines].size) %>: <%= @results[:error_lines].join(', ') %>. Please check if these lines have an issue title. <% end %> -<% unless @results[:valid_file] %> -Error parsing CSV file. +<% if @results[:parse_error] %> +Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values. <% end %> |