From f3132f94f8e8ae1a215e4c00a7d1a57e8dafa3b1 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 10 Sep 2010 11:14:00 +0100
Subject: [PATCH] Link to help.openstreetmap.org from the sidebar

---
 app/views/layouts/site.html.erb | 2 +-
 config/locales/en.yml           | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a026c0594..3c050203d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -117,7 +117,7 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
-        <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
+        <%= t 'layouts.help_and_wiki' %><br />
         <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %><br />
         <a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
         <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 870ea3276..d2e25b51f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -924,9 +924,7 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
-    help_wiki_tooltip: "Help &amp; Wiki site for the project"
-    help_wiki_url: "http://wiki.openstreetmap.org"
+    help_and_wiki: '<a href="http://help.openstreetmap.org/" title="Help site for the project">Help</a> &amp; <a href="http://wiki.openstreetmap.org/" title="Wiki site for the project">Wiki</a>'
     copyright: "Copyright &amp; License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-- 
2.39.5