Split the help and wiki into two links - help centre and documentation

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 7836464936e5528aebb208d2f2affd2080a52dd4..4497e7e812a344f5cbf92e85e581ff36bfe46235 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -131,10 +131,8 @@
 
       <div id="left_menu" class="left_menu">
         <ul>
 
       <div id="left_menu" class="left_menu">
         <ul>

-          <li><%= t 'layouts.help_and_wiki',
-              :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')),
-              :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title'))
-          %></li>
+          <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
+          <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>

           <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li>
           <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li>
           <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li>
           <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li>
           <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li>
           <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5b41acca3ea4ba072b74720cc468a46ec096b22e..95bd2b63f91709008b8aad6ee7966565bc663d79 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -938,11 +938,14 @@ en:
     donate_link_text: donating
     help_and_wiki: "{{help}} & {{wiki}}"
     help: Help
     donate_link_text: donating
     help_and_wiki: "{{help}} & {{wiki}}"
     help: Help

+    help_centre: Help Centre

     help_url: http://help.openstreetmap.org/
     help_title: Help site for the project
     wiki: Wiki
     wiki_url: http://wiki.openstreetmap.org/
     wiki_title: Wiki site for the project
     help_url: http://help.openstreetmap.org/
     help_title: Help site for the project
     wiki: Wiki
     wiki_url: http://wiki.openstreetmap.org/
     wiki_title: Wiki site for the project

+    documentation: Documentation
+    documentation_title: Documentation for the project

     copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."