From: Tom Hughes <tom@compton.nu>
Date: Fri, 10 Sep 2010 10:20:00 +0000 (+0100)
Subject: Mention help.openstreetmap.org in the welcome message
X-Git-Tag: live~6297^2~10
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d9f9cf40560671d5d5a2661e298e80e1f09a8e5d?hp=f3132f94f8e8ae1a215e4c00a7d1a57e8dafa3b1

Mention help.openstreetmap.org in the welcome message
---

diff --git a/app/views/notifier/signup_confirm.text.html.erb b/app/views/notifier/signup_confirm.text.html.erb
index eaeb7dce8..c0883382e 100644
--- a/app/views/notifier/signup_confirm.text.html.erb
+++ b/app/views/notifier/signup_confirm.text.html.erb
@@ -11,6 +11,8 @@
 
 <p><%= t'notifier.signup_confirm_html.get_reading' %></p>
 
+<p><%= t'notifier.signup_confirm_html.ask_questions' %></p>
+
 <p><%= t'notifier.signup_confirm_html.wiki_signup' %></p>
 
 <p><%= t'notifier.signup_confirm_html.user_wiki_page' %></p> 
diff --git a/app/views/notifier/signup_confirm.text.plain.erb b/app/views/notifier/signup_confirm.text.plain.erb
index a3c4ee92a..a53f27dda 100644
--- a/app/views/notifier/signup_confirm.text.plain.erb
+++ b/app/views/notifier/signup_confirm.text.plain.erb
@@ -29,6 +29,10 @@
 
 	http://www.opengeodata.org/
 
+<%= t'notifier.signup_confirm_plain.ask_questions' %>
+
+	http://help.openstreetmap.org/
+
 <%= t'notifier.signup_confirm_plain.wiki_signup' %>
 
 	<%= t'notifier.signup_confirm_plain.wiki_signup_url' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d2e25b51f..e68eb0220 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1098,6 +1098,7 @@ en:
       the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
       opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
+      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately
@@ -1114,6 +1115,7 @@ en:
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
       get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'