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

[rails.git] / app / views / notifier / signup_confirm.html.erb

diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb
index 0c154c968e1f94fa80baf4cbbae7f0a1b70f3b2c..ea7d101d0e94fbccd2f0511f59d45805be99805e 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,24 +1,9 @@
-<p><%= t("notifier.signup_confirm.greeting") %></p>
+<p><%= t(".greeting") %></p>
 
-<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
+<p><%= t(".created", :site_url => Settings.server_url) %></p>
 
-<% if @url -%>
-<p><%= t("notifier.signup_confirm.confirm") %></p>
+<p><%= t(".confirm") %></p>
 
 <p><%= link_to @url, @url %></p>
-<% end -%>
 
-<p><%= t("notifier.signup_confirm.welcome") %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.introductory_video", :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180"))) %>
-   <%= raw(t("notifier.signup_confirm_html.more_videos", :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6"))) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.get_reading")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.ask_questions")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.wiki_signup")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.user_wiki_page")) %></p> 
-
-<p><%= raw(t("notifier.signup_confirm_html.current_user")) %></p>
+<p><%= t(".welcome") %></p>