Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 522330d3bad1b251a607b8e1d163ec288d16fcb4..4497e7e812a344f5cbf92e85e581ff36bfe46235 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -131,12 +131,11 @@
 
       <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>
           <%= yield :left_menu %>
         </ul>
       </div>