From: Tom Hughes Date: Wed, 15 Apr 2020 18:18:10 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2431' X-Git-Tag: live~2208 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3666b674330ec8d14a224932a191d6121c5974e2?hp=7a1615bc55aee72dd03a5dd43c08b4f13f669f06 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 7601a621d..1571f3798 100644 --- a/app/views/notifier/gpx_success.html.erb +++ b/app/views/notifier/gpx_success.html.erb @@ -2,5 +2,6 @@

<%= 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) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 089c31a44..f9ea78ef3 100644 --- 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!"