Link to help.openstreetmap.org from the sidebar

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a026c059479081cb7712eb8cf20cb8ed799a3719..3c050203dda1d692c8f08922561762e222c96705 100644 (file)
--- 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 870ea3276025ffa81e7145df6eaa63cbb8bc652d..d2e25b51f42115bf02878d54486163ecb57fef05 100644 (file)
--- 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 & Wiki"
-    help_wiki_tooltip: "Help & 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."