Make locale data for help and wiki links a bit cleaner

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 3c050203dda1d692c8f08922561762e222c96705..b514fef990943e7ab5dd22e24820a5ba0d6583b8 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -117,7 +117,10 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
       <% end %>
 
       <div id="left_menu" class="left_menu">

-        <%= t 'layouts.help_and_wiki' %><br />
+        <%= 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'))
+        %><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 />
         <%= 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 e68eb0220b19a16d519be943b6f323af11a72116..e090c02121fd3ea3effee32234fe0dca01468652 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -924,7 +924,13 @@ 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
     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_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>'
+    help_and_wiki: "{{help}} & {{wiki}}"
+    help: Help
+    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

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