Add links to Welcome Mat on /welcome and /help

Closes #2056

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 085ea63d53eb69bccd5660d2e2765dc937f071c5..3ca92398ba4c2a18993216a73e642c8a6ce530a7 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -4,7 +4,7 @@
 
 <p class='introduction'><%= t ".introduction" %></p>
 
-<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'wiki'].each do |site| %>
+<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'welcomemat', 'wiki'].each do |site| %>
   <% unless site == 'welcome' && !current_user %>
   <div class='<%= site %> help-item'>
   <h3>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a0c62b03695f18fb421f9ef0d50f62cdedf880c..ad825ef67162a42665620139595c7e7f8a9862c0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1531,6 +1531,10 @@ en:
         url: https://switch2osm.org/
         title: switch2osm
         description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+      welcomemat:
+        url: https://welcome.openstreetmap.org/
+        title: For Organizations
+        description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
       wiki:
         url: https://wiki.openstreetmap.org/
         title: wiki.openstreetmap.org
@@ -1677,7 +1681,7 @@ en:
         paragraph_1_html: |
           OpenStreetMap has several resources for learning about the project, asking and answering
           questions, and collaboratively discussing and documenting mapping topics.
-          <a href='%{help_url}'>Get help here</a>.
+          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.
       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!