From 98262d3ab1e7e90d3b1c8c4cc6344f8c4cce8847 Mon Sep 17 00:00:00 2001
From: Mikel Maron <mikel_maron@yahoo.com>
Date: Tue, 20 Nov 2018 18:46:22 +0000
Subject: [PATCH 1/1] Add links to Welcome Mat on /welcome and /help

Closes #2056
---
 app/views/site/help.html.erb | 2 +-
 config/locales/en.yml        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 085ea63d5..3ca92398b 100644
--- 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 8a0c62b03..ad825ef67 100644
--- 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!
-- 
2.43.2