Fix double escaping of date markup in note feed

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

diff --git a/app/views/notifier/signup_confirm.text.erb b/app/views/notifier/signup_confirm.text.erb
index a53f27dda99e8c0ba5dffaee7b3de640e7eb92fb..76bc65808dca38bb4dfa7ae72eff0987c9c290eb 100644 (file)
--- a/app/views/notifier/signup_confirm.text.erb
+++ b/app/views/notifier/signup_confirm.text.erb
@@ -1,46 +1,46 @@
-<%= t'notifier.signup_confirm_plain.greeting' %>
+<%= fp(t("notifier.signup_confirm.greeting")) %>
 
-<%= t'notifier.signup_confirm_plain.hopefully_you' %>
-<%= SERVER_URL %>
+<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %>
 
-<%= t'notifier.signup_confirm_plain.click_the_link_1' %>
-<%= t'notifier.signup_confirm_plain.click_the_link_2' %>
+<% if @url -%>
+<%= fp(t("notifier.signup_confirm.confirm")) %>
 
-<%= @url %>
+  <%= @url %>
 
-<%= t'notifier.signup_confirm_plain.introductory_video' %>
+<% end -%>
+<%= fp(t("notifier.signup_confirm.welcome")) %>
 
-       http://showmedo.com/videos/video?name=1800000&fromSeriesID=180  
+<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %>
 
-<%= t'notifier.signup_confirm_plain.more_videos' %>
+  http://showmedo.com/videos/video?name=1800000&fromSeriesID=180       
 
-       http://showmedo.com/videos/series?name=mS2P1ZqS6        
+<%= fp(t("notifier.signup_confirm_plain.more_videos")) %>
 
-<%= t'notifier.signup_confirm_plain.the_wiki' %>
+  http://showmedo.com/videos/series?name=mS2P1ZqS6     
 
-       <%= t'notifier.signup_confirm_plain.the_wiki_url' %>
+<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %>
 
-<%= t'notifier.signup_confirm_plain.blog_and_twitter' %>
+  <%= t("notifier.signup_confirm_plain.the_wiki_url") %>
 
-       http://blog.openstreetmap.org/
-       http://twitter.com/openstreetmap
+<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %>
 
-<%= t'notifier.signup_confirm_plain.opengeodata' %>
+  http://blog.openstreetmap.org/
+  http://twitter.com/openstreetmap
 
-       http://www.opengeodata.org/
+<%= fp(t("notifier.signup_confirm_plain.opengeodata")) %>
 
-<%= t'notifier.signup_confirm_plain.ask_questions' %>
+  http://www.opengeodata.org/
 
-       http://help.openstreetmap.org/
+<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %>
 
-<%= t'notifier.signup_confirm_plain.wiki_signup' %>
+  http://help.openstreetmap.org/
 
-       <%= t'notifier.signup_confirm_plain.wiki_signup_url' %>
+<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %>
 
-<%= t'notifier.signup_confirm_plain.user_wiki_1' %>
-<%= t'notifier.signup_confirm_plain.user_wiki_2' %>
+  <%= t("notifier.signup_confirm_plain.wiki_signup_url") %>
 
-<%= t'notifier.signup_confirm_plain.current_user_1' %>
-<%= t'notifier.signup_confirm_plain.current_user_2' %>
+<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %>
 
-http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region
+<%= fp(t("notifier.signup_confirm_plain.current_user")) %>
+
+  http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region