cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework signup emails a bit

Browse source 
Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.
This commit is contained in:
Tom Hughes 2012-11-05 09:54:58 +00:00
parent 379cb35832
commit 6aaaf5dddb
4 changed files with 52 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/notifier_helper.rb Normal file
View file

@ -0,0 +1,5 @@
module NotifierHelper
def fp(text)
format_paragraph(text, 72, 0)
end
end

33
app/views/notifier/signup_confirm.html.erb
View file

@ -1,27 +1,24 @@
<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>
<% if @url -%>
<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>
<% 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>

60
app/views/notifier/signup_confirm.text.erb
View file

@ -1,56 +1,46 @@
<%= t'notifier.signup_confirm_plain.greeting' %>
<%= fp(t("notifier.signup_confirm.greeting")) %>
<% if @url %>
<%= t'notifier.signup_confirm_plain.hopefully_you' %>
<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %>
<%= SERVER_URL %>
<% if @url -%>
<%= fp(t("notifier.signup_confirm.confirm")) %>
<%= t'notifier.signup_confirm_plain.click_the_link_1' %>
<%= t'notifier.signup_confirm_plain.click_the_link_2' %>
<%= @url %>
<%= @url %>
<% else %>
<%= t'notifier.signup_confirm_plain.created_account' %>
<% end -%>
<%= fp(t("notifier.signup_confirm.welcome")) %>
<%= SERVER_URL %>
<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %>
<%= t'notifier.signup_confirm_plain.welcome_1' %>
<%= t'notifier.signup_confirm_plain.welcome_2' %>
<% end %>
http://showmedo.com/videos/video?name=1800000&fromSeriesID=180
<%= t'notifier.signup_confirm_plain.introductory_video' %>
<%= fp(t("notifier.signup_confirm_plain.more_videos")) %>
http://showmedo.com/videos/video?name=1800000&fromSeriesID=180
http://showmedo.com/videos/series?name=mS2P1ZqS6
<%= t'notifier.signup_confirm_plain.more_videos' %>
<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %>
http://showmedo.com/videos/series?name=mS2P1ZqS6
<%= t("notifier.signup_confirm_plain.the_wiki_url") %>
<%= t'notifier.signup_confirm_plain.the_wiki' %>
<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %>
<%= t'notifier.signup_confirm_plain.the_wiki_url' %>
http://blog.openstreetmap.org/
http://twitter.com/openstreetmap
<%= t'notifier.signup_confirm_plain.blog_and_twitter' %>
<%= fp(t("notifier.signup_confirm_plain.opengeodata")) %>
http://blog.openstreetmap.org/
http://twitter.com/openstreetmap
http://www.opengeodata.org/
<%= t'notifier.signup_confirm_plain.opengeodata' %>
<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %>
http://www.opengeodata.org/
http://help.openstreetmap.org/
<%= t'notifier.signup_confirm_plain.ask_questions' %>
<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %>
http://help.openstreetmap.org/
<%= t("notifier.signup_confirm_plain.wiki_signup_url") %>
<%= t'notifier.signup_confirm_plain.wiki_signup' %>
<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %>
<%= t'notifier.signup_confirm_plain.wiki_signup_url' %>
<%= fp(t("notifier.signup_confirm_plain.current_user")) %>
<%= t'notifier.signup_confirm_plain.user_wiki_1' %>
<%= t'notifier.signup_confirm_plain.user_wiki_2' %>
<%= t'notifier.signup_confirm_plain.current_user_1' %>
<%= t'notifier.signup_confirm_plain.current_user_2' %>
http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region
http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region