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

Merge branch 'master' into notes

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
This commit is contained in:
Tom Hughes 2012-11-20 19:08:30 +00:00
commit 7599f98957
133 changed files with 4192 additions and 1690 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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>

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

@ -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