Merge remote-tracking branch 'openstreetmap/pull/1437'

[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 74aae6af14a86ce8f23914c0dd773d7ab6bcb61d..814deee9171220d93896643b05484d1bb9133076 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,27 +1,9 @@
-<p><%= t'notifier.signup_confirm_html.greeting' %></p>
+<p><%= t("notifier.signup_confirm.greeting") %></p>

 
 

-<% if @url %>
-<p><%= t'notifier.signup_confirm_html.hopefully_you' %>
-   <%= SERVER_URL %>.</p>
+<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>

 
 

-<p><%= t'notifier.signup_confirm_html.click_the_link' %></p>
+<p><%= t("notifier.signup_confirm.confirm") %></p>

 
 

-<p><%= raw(link_to @url, @url) %></p>
-<% else %>
-<p><%= t'notifier.signup_confirm_html.created_account' %>
-    <%= SERVER_URL %>.</p>
-<p><%= t'notifier.signup_confirm_html.welcome' %></p>
-<% end %>
+<p><%= link_to @url, @url %></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("notifier.signup_confirm.welcome") %></p>