Fix overlapping text in markdown help

[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 5b7566fba9730d3482dcccb6ab5c9b087228512d..0c154c968e1f94fa80baf4cbbae7f0a1b70f3b2c 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,21 +1,24 @@
-<p><%= t'notifier.signup_confirm_html.greeting' %></p>
+<p><%= t("notifier.signup_confirm.greeting") %></p>
 
-<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>
+<% if @url -%>
+<p><%= t("notifier.signup_confirm.confirm") %></p>
 
-<p><%= raw(link_to @url, @url) %></p>
+<p><%= link_to @url, @url %></p>
+<% end -%>
 
-<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><%= t("notifier.signup_confirm.welcome") %></p>
 
-<p><%= raw(t'notifier.signup_confirm_html.get_reading') %></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.ask_questions') %></p>
+<p><%= raw(t("notifier.signup_confirm_html.get_reading")) %></p>
 
-<p><%= raw(t'notifier.signup_confirm_html.wiki_signup') %></p>
+<p><%= raw(t("notifier.signup_confirm_html.ask_questions")) %></p>
 
-<p><%= raw(t'notifier.signup_confirm_html.user_wiki_page') %></p> 
+<p><%= raw(t("notifier.signup_confirm_html.wiki_signup")) %></p>
 
-<p><%= raw(t'notifier.signup_confirm_html.current_user') %></p>
+<p><%= raw(t("notifier.signup_confirm_html.user_wiki_page")) %></p> 
+
+<p><%= raw(t("notifier.signup_confirm_html.current_user")) %></p>