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

[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 e52396462ee96825c290358c4a614b01911ea710..e170564687ec0e6f581053fc1033904e44f1de05 100644 (file)
--- a/app/views/notifier/signup_confirm.text.erb
+++ b/app/views/notifier/signup_confirm.text.erb
@@ -1,42 +1,9 @@
-<%= fp(t("notifier.signup_confirm.greeting")) %>
+<%= fp(t(".greeting")) %>
 
-<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %>
+<%= fp(t(".created", :site_url => SERVER_URL)) %>
 
-<% if @url -%>
-<%= fp(t("notifier.signup_confirm.confirm")) %>
+<%= fp(t(".confirm")) %>
 
   <%= @url %>
 
-<% end -%>
-<%= fp(t("notifier.signup_confirm.welcome")) %>
-
-<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %>
-
-  http://showmedo.com/videos/video?name=1800000&fromSeriesID=180       
-
-<%= fp(t("notifier.signup_confirm_plain.more_videos")) %>
-
-  http://showmedo.com/videos/series?name=mS2P1ZqS6     
-
-<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %>
-
-  <%= t("notifier.signup_confirm_plain.the_wiki_url") %>
-
-<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %>
-
-  http://blog.openstreetmap.org/
-  http://twitter.com/openstreetmap
-
-<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %>
-
-  http://help.openstreetmap.org/
-
-<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %>
-
-  <%= t("notifier.signup_confirm_plain.wiki_signup_url") %>
-
-<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %>
-
-<%= fp(t("notifier.signup_confirm_plain.current_user")) %>
-
-  http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region
+<%= fp(t(".welcome")) %>