From: Andy Allan Date: Thu, 1 Sep 2022 08:17:11 +0000 (+0100) Subject: Merge pull request #3672 from AntonKhorev/geolink-button X-Git-Tag: live~2372 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bf11e06e635ecb86e31f60c9dfc0e575c8f2a937?hp=351a7859498065ada18927a4847baaf09d425b58 Merge pull request #3672 from AntonKhorev/geolink-button Remove geolink and close button nesting --- diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index 640c59773..414381101 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -4,7 +4,7 @@

<%= t ".introduction" %>

-<% sites = %w[beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki] %> +<% sites = %w[beginners_guide help mailing_lists forums community irc switch2osm welcomemat wiki] %> <% sites.prepend("welcome") if current_user %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index ea85cef19..55bd1c0a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2125,8 +2125,12 @@ en: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: url: https://forum.openstreetmap.org/ - title: Forums + title: Forums (Legacy) description: Questions and discussions for those that prefer a bulletin board style interface. + community: + url: https://community.openstreetmap.org/ + title: Community forum + description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC