Merge branch 'pull/5117'

This commit is contained in:
Anton Khorev 2024-09-19 16:49:29 +03:00
commit 6595d43e3c
2 changed files with 8 additions and 7 deletions

View file

@ -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,

View file

@ -122,7 +122,7 @@ en:
longitude: "Longitude"
public: "Public"
description: "Description"
gpx_file: Upload GPX File
gpx_file: Choose GPS Trace File
visibility: Visibility
tagstring: Tags
message:
@ -1617,13 +1617,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"