From ef2c6ef026f263303d8c9fdd633c437f288d362c Mon Sep 17 00:00:00 2001 From: Nenad Vujicic Date: Thu, 5 Sep 2024 17:50:19 +0200 Subject: [PATCH] Improved error reporting when trace upload fails Fixes #2630. Added supported file formats below Choose File (traces/new.html.erb) and improved error / success messages. --- app/views/traces/new.html.erb | 3 ++- config/locales/en.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb index bff8cd3bc..ae5ffe565 100644 --- a/app/views/traces/new.html.erb +++ b/app/views/traces/new.html.erb @@ -3,7 +3,8 @@ <% end %> <%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %> - <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %> + <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt"), + :help => ".gpx, .tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2" %> <%= f.text_field :description, :maxlength => 255 %> <%= f.text_field :tagstring %> <%= f.select :visibility, diff --git a/config/locales/en.yml b/config/locales/en.yml index e2f2de059..d3826f23c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -124,7 +124,7 @@ en: longitude: "Longitude" public: "Public" description: "Description" - gpx_file: Upload GPX File + gpx_file: Choose GPS Trace File visibility: Visibility tagstring: Tags message: @@ -1627,13 +1627,13 @@ en: befriend_them: "You can also add them as a friend at %{befriendurl}." befriend_them_html: "You can also add them as a friend at %{befriendurl}." gpx_description: - description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" - description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" - description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags" - description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags" + description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" + description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" + description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags" + description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags" gpx_failure: hi: "Hi %{to_user}," - failed_to_import: "failed to import. Here is the error:" + failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:" more_info: "More information about GPX import failures and how to avoid them can be found at %{url}." more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}." import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures" -- 2.39.5