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

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

diff --git a/app/views/user_mailer/gpx_failure.html.erb b/app/views/user_mailer/gpx_failure.html.erb
index a398661a693aea9857ff5c33c9ddf45cd9d57699..d2059af38209904c473ec7310d6a113a59db12de 100644 (file)
--- a/app/views/user_mailer/gpx_failure.html.erb
+++ b/app/views/user_mailer/gpx_failure.html.erb
@@ -1,8 +1,8 @@
-<p><%= t "user_mailer.gpx_notification.greeting" %></p>
+<p><%= t ".hi", :to_user => @to_user %></p>
 
 <p>
   <%= render :partial => "gpx_description" %>
-  <%= t "user_mailer.gpx_notification.failure.failed_to_import" %>
+  <%= t ".failed_to_import" %>
 </p>
 
 <blockquote>
@@ -10,7 +10,5 @@
 </blockquote>
 
 <p>
-  <%= t "user_mailer.gpx_notification.failure.more_info_1" %>
-  <%= t "user_mailer.gpx_notification.failure.more_info_2" %>
-  <%= t "user_mailer.gpx_notification.failure.import_failures_url" %>
+  <%= t ".more_info_html", :url => link_to(t(".import_failures_url"), t(".import_failures_url")) %>
 </p>