From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Jan 2025 16:02:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5492'
X-Git-Tag: live~637
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5d76ec051e2c429b6647401674e13688c1251956?hp=5d79f1233b8846eefc56b9ade602a1c94493316d

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

diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_details.html.erb
similarity index 64%
rename from app/views/user_mailer/_gpx_description.html.erb
rename to app/views/user_mailer/_gpx_details.html.erb
index d4eefeb25..0ca88bb24 100644
--- a/app/views/user_mailer/_gpx_description.html.erb
+++ b/app/views/user_mailer/_gpx_details.html.erb
@@ -13,4 +13,12 @@
     <dt><%= t ".tags" %>
     <dd><%= @trace_tags.map(&:tag).join(", ") %>
   <% end %>
+  <% if @possible_points %>
+    <dt><%= t ".total_points" %>
+    <dd><%= @possible_points %>
+  <% end %>
+  <% if @trace_points %>
+    <dt><%= t ".imported_points" %>
+    <dd><%= @trace_points %>
+  <% end %>
 </dl>
diff --git a/app/views/user_mailer/_gpx_description.text.erb b/app/views/user_mailer/_gpx_details.text.erb
similarity index 62%
rename from app/views/user_mailer/_gpx_description.text.erb
rename to app/views/user_mailer/_gpx_details.text.erb
index f0ce97e61..e828068b9 100644
--- a/app/views/user_mailer/_gpx_description.text.erb
+++ b/app/views/user_mailer/_gpx_details.text.erb
@@ -12,3 +12,11 @@
 <%= t ".tags" %>
 	<%= @trace_tags.map(&:tag).join(", ") %>
 <% end %>
+<% if @possible_points %>
+<%= t ".total_points" %>
+	<%= @possible_points %>
+<% end %>
+<% if @trace_points %>
+<%= t ".imported_points" %>
+	<%= @trace_points %>
+<% end %>
diff --git a/app/views/user_mailer/gpx_failure.html.erb b/app/views/user_mailer/gpx_failure.html.erb
index 5427339f9..2e5a283b8 100644
--- a/app/views/user_mailer/gpx_failure.html.erb
+++ b/app/views/user_mailer/gpx_failure.html.erb
@@ -2,7 +2,7 @@
 
 <p><%= t ".failed_to_import" %>
 
-<%= render :partial => "gpx_description" %>
+<%= render :partial => "gpx_details" %>
 
 <p><%= t ".verify" %></p>
 
diff --git a/app/views/user_mailer/gpx_failure.text.erb b/app/views/user_mailer/gpx_failure.text.erb
index 860f67659..0c5edebde 100644
--- a/app/views/user_mailer/gpx_failure.text.erb
+++ b/app/views/user_mailer/gpx_failure.text.erb
@@ -2,7 +2,7 @@
 
 <%= t ".failed_to_import" %>
 
-<%= render :partial => "gpx_description" %>
+<%= render :partial => "gpx_details" %>
 
 <%= t ".verify" %>
 
diff --git a/app/views/user_mailer/gpx_success.html.erb b/app/views/user_mailer/gpx_success.html.erb
index 3307e471b..b7f6beadc 100644
--- a/app/views/user_mailer/gpx_success.html.erb
+++ b/app/views/user_mailer/gpx_success.html.erb
@@ -1,8 +1,8 @@
 <p><%= t ".hi", :to_user => @to_user %></p>
 
-<p><%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
+<p><%= t ".imported_successfully" %></p>
 
-<%= render :partial => "gpx_description" %>
+<%= render :partial => "gpx_details" %>
 
 <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 7ce08cf0b..fa4fed7d6 100644
--- a/app/views/user_mailer/gpx_success.text.erb
+++ b/app/views/user_mailer/gpx_success.text.erb
@@ -1,7 +1,7 @@
 <%= t ".hi", :to_user => @to_user %>
 
-<%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
+<%= t ".imported_successfully" %>
 
-<%= render :partial => "gpx_description" %>
+<%= render :partial => "gpx_details" %>
 
 <%= t ".all_your_traces", :url => @my_traces_url %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9e8502f4a..a62f4d34f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1668,12 +1668,14 @@ en:
       see_their_profile_html: "You can see their profile at %{userurl}."
       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:
+    gpx_details:
       details: "Your file details:"
       filename: Filename
       url: URL
       description: Description
       tags: Tags
+      total_points: Total number of points
+      imported_points: Number of imported points
     gpx_failure:
       hi: "Hi %{to_user},"
       failed_to_import: "It looks like your file failed to be imported as a GPS trace."
@@ -1684,9 +1686,7 @@ en:
       subject: "[OpenStreetMap] GPX Import failure"
     gpx_success:
       hi: "Hi %{to_user},"
-      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."
+      imported_successfully: "It looks like your file was imported successfully as a GPS trace."
       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"