Merge remote-tracking branch 'upstream/pull/5487'

diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_description.html.erb
index 85b4c7cae1c0e9f198a69d75128e722f42a09dac..d4eefeb25f739236a76701a4900f20e5ba55c2f8 100644 (file)
--- a/app/views/user_mailer/_gpx_description.html.erb
+++ b/app/views/user_mailer/_gpx_description.html.erb
@@ -1,9 +1,16 @@
-<% trace_name = tag.strong(@trace_name) %>
-<% trace_name = link_to(trace_name, @trace_url) if @trace_url %>
-<% trace_description = tag.em(@trace_description) %>
-<% if @trace_tags.length > 0 %>
-  <% tags = safe_join @trace_tags.map { |trace_tag| tag.em trace_tag.tag }, ", " %>
-  <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
-<% else %>
-  <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>
-<% end %>
+<p><%= t ".details" %></p>
+
+<dl>
+  <dt><%= t ".filename" %>
+  <% if @trace_url %>
+    <dd><%= link_to(@trace_name, @trace_url) %>
+  <% else %>
+    <dd><%= @trace_name %>
+  <% end %>
+  <dt><%= t ".description" %>
+  <dd><%= @trace_description %>
+  <% if @trace_tags.length > 0 %>
+    <dt><%= t ".tags" %>
+    <dd><%= @trace_tags.map(&:tag).join(", ") %>
+  <% end %>
+</dl>

diff --git a/app/views/user_mailer/_gpx_description.text.erb b/app/views/user_mailer/_gpx_description.text.erb
index 6f7a9784452eba74a58d891591a33e62b1686c2b..f0ce97e61474d7051d6b16fde13444fb82a8323f 100644 (file)
--- a/app/views/user_mailer/_gpx_description.text.erb
+++ b/app/views/user_mailer/_gpx_description.text.erb
@@ -1,8 +1,14 @@
-<% trace_name = @trace_name %>
-<% trace_description = @trace_description %>
+<%= t ".details" %>
+
+<%= t ".filename" %>
+       <%= @trace_name %>
+<% if @trace_url %>
+<%= t ".url" %>
+       <%= @trace_url %>
+<% end %>
+<%= t ".description" %>
+       <%= @trace_description %>
 <% if @trace_tags.length > 0 %>
-  <% tags = @trace_tags.map { |trace_tag| trace_tag.tag }.join(", ") %>
-  <%= t ".description_with_tags", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
-<% else %>
-  <%= t ".description_with_no_tags", :trace_name => trace_name, :trace_description => trace_description %>
+<%= t ".tags" %>
+       <%= @trace_tags.map(&:tag).join(", ") %>
 <% end %>

diff --git a/app/views/user_mailer/gpx_failure.html.erb b/app/views/user_mailer/gpx_failure.html.erb
index d2059af38209904c473ec7310d6a113a59db12de..5427339f9fcc38020d2bc211316d729deb35d387 100644 (file)
--- a/app/views/user_mailer/gpx_failure.html.erb
+++ b/app/views/user_mailer/gpx_failure.html.erb
@@ -1,9 +1,10 @@
 <p><%= t ".hi", :to_user => @to_user %></p>
 
-<p>
-  <%= render :partial => "gpx_description" %>
-  <%= t ".failed_to_import" %>
-</p>
+<p><%= t ".failed_to_import" %>
+
+<%= render :partial => "gpx_description" %>
+
+<p><%= t ".verify" %></p>
 
 <blockquote>
   <%= @error %>

diff --git a/app/views/user_mailer/gpx_failure.text.erb b/app/views/user_mailer/gpx_failure.text.erb
index 9544c74a9dcf46bf00408eb29af2a2cf54713bf0..860f6765906bb5c6cd2057bf625109479821dd5c 100644 (file)
--- a/app/views/user_mailer/gpx_failure.text.erb
+++ b/app/views/user_mailer/gpx_failure.text.erb
@@ -1,8 +1,11 @@
 <%= t ".hi", :to_user => @to_user %>
 
-<%= render :partial => "gpx_description" %>
 <%= t ".failed_to_import" %>
 
+<%= render :partial => "gpx_description" %>
+
+<%= t ".verify" %>
+
 ==
 <%= @error %>
 ==

diff --git a/app/views/user_mailer/gpx_success.html.erb b/app/views/user_mailer/gpx_success.html.erb
index 4354db20afa708ca0e8753577e54bb83acf3cabd..3307e471b5ccc8f3cec1fcc92bf9ad06e0a675d6 100644 (file)
--- a/app/views/user_mailer/gpx_success.html.erb
+++ b/app/views/user_mailer/gpx_success.html.erb
@@ -1,9 +1,8 @@
 <p><%= t ".hi", :to_user => @to_user %></p>
 
-<p>
-  <%= render :partial => "gpx_description" %>
-  <%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>
-</p>
+<p><%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
+
+<%= render :partial => "gpx_description" %>
 
 <p>
   <%= t ".all_your_traces_html", :url => link_to(@my_traces_url, @my_traces_url) %>

diff --git a/app/views/user_mailer/gpx_success.text.erb b/app/views/user_mailer/gpx_success.text.erb
index aee3a0f11f954799b597a12043545977768bb945..7ce08cf0be5c82235ab173bb9c68621ec8669c66 100644 (file)
--- a/app/views/user_mailer/gpx_success.text.erb
+++ b/app/views/user_mailer/gpx_success.text.erb
@@ -1,8 +1,7 @@
 <%= t ".hi", :to_user => @to_user %>
 
-<%= render :partial => "gpx_description" %>
-<%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>
+<%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
 
-<%= t ".trace_location", :trace_url => @trace_url %>
+<%= render :partial => "gpx_description" %>
 
 <%= t ".all_your_traces", :url => @my_traces_url %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69e220a21a8591347d5ab064c316ed83c0891f3d..9e8502f4a2ca8db818894f75539d33e1ab6214ac 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1669,23 +1669,24 @@ 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 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"
+      details: "Your file details:"
+      filename: Filename
+      url: URL
+      description: Description
+      tags: Tags
     gpx_failure:
       hi: "Hi %{to_user},"
-      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}."
+      failed_to_import: "It looks like your file failed to be imported as a GPS trace."
+      verify: "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"
       subject: "[OpenStreetMap] GPX Import failure"
     gpx_success:
       hi: "Hi %{to_user},"
-      loaded:
-        one: "loaded successfully with %{trace_points} out of a possible %{count} point."
-        other: "loaded successfully with %{trace_points} out of a possible %{count} points."
-      trace_location: "Your trace is available at %{trace_url}"
+      loaded_successfully:
+        one: "It looks like your file loaded successfully with %{trace_points} out of a possible %{count} point."
+        other: "It looks like your file loaded successfully with %{trace_points} out of a possible %{count} points."
       all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"
       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"

diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 2a547e752aff6fa901340eee7edc619380eff06e..3b7119ff645ae467a2f29e06ad25d44c4ec5e260 100644 (file)
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -15,7 +15,7 @@ class UserMailerTest < ActionMailer::TestCase
     end
     email = UserMailer.gpx_success(trace, 100)
 
-    assert_match("<em>one</em>, <em>two&amp;three</em>, <em>four&lt;five</em>", email.html_part.body.to_s)
+    assert_match("one, two&amp;three, four&lt;five", email.html_part.body.to_s)
     assert_match("one, two&three, four<five", email.text_part.body.to_s)
   end