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

[rails.git] / app / views / user_mailer / gpx_success.html.erb

diff --git a/app/views/user_mailer/gpx_success.html.erb b/app/views/user_mailer/gpx_success.html.erb
index 78af1166cd0febf70fc709b8566da871f4b8db60..4354db20afa708ca0e8753577e54bb83acf3cabd 100644 (file)
--- a/app/views/user_mailer/gpx_success.html.erb
+++ b/app/views/user_mailer/gpx_success.html.erb
@@ -1,7 +1,10 @@
-<p><%= t "user_mailer.gpx_notification.greeting" %></p>
+<p><%= t ".hi", :to_user => @to_user %></p>

 
 <p>
   <%= render :partial => "gpx_description" %>
 
 <p>
   <%= render :partial => "gpx_description" %>

-  <%= t("user_mailer.gpx_notification.success.loaded_successfully",
-        :trace_points => @trace_points, :possible_points => @possible_points, :count => @possible_points) %>
+  <%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>
+</p>
+
+<p>
+  <%= t ".all_your_traces_html", :url => link_to(@my_traces_url, @my_traces_url) %>

 </p>
 </p>