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

diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb
index 7601a621dc752c8d427628ce601e9b873721955f..1571f3798041b42916e54dd981b2a62af989c99e 100644 (file)
--- a/app/views/notifier/gpx_success.html.erb
+++ b/app/views/notifier/gpx_success.html.erb
@@ -2,5 +2,6 @@
 
 <p>
   <%= render :partial => "gpx_description" %>
-  <%= t "notifier.gpx_notification.success.loaded_successfully", :trace_points => @trace_points, :possible_points => @possible_points %>
+  <%= t("notifier.gpx_notification.success.loaded_successfully",
+        :trace_points => @trace_points, :possible_points => @possible_points, :count => @possible_points) %>
 </p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 089c31a44301c9d8459f166b24e86f9636884203..f9ea78ef3704abf956ec42d09d7e31a736d6866f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1210,7 +1210,9 @@ en:
         import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+        loaded_successfully:
+          one: loaded successfully with %{trace_points} out of a possible 1 point.
+          other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"