Pluralize notifier message when other than 1

Correctly pluralize the word point in the notification message based
on the given possible points.

diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb
index 7601a621dc752c8d427628ce601e9b873721955f..d9d184a6d88a56b90ba3a11ef162c8752ce108be 100644 (file)
--- a/app/views/notifier/gpx_success.html.erb
+++ b/app/views/notifier/gpx_success.html.erb
@@ -2,5 +2,8 @@
 
 <p>
   <%= render :partial => "gpx_description" %>
 
 <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>
 </p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 917c06a954de363ac0252424575fc8208b6fa87d..92197f614b13e74bb1672024a63de0ef3902c00a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1200,7 +1200,9 @@ en:
         import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
         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!"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"