Make the name of the "Data" layer in OpenLayers translatable: Most of

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index f3b310d895f71843dbd147c0a5d355b6145a690f..3a80c33a69551bd021716ede164c34ac3f2920fe 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -24,7 +24,12 @@
       <% if @user and @user.id %>
         <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> | 
         <%= yield :greeting %>
       <% if @user and @user.id %>
         <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> | 
         <%= yield :greeting %>

-        <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, case @user.new_messages.size when 0 then { :title => t('layouts.inbox_tooltip_0') } when 1 then { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_1') } else { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_n', :size => @user.new_messages.size) } end %> |
+        <%
+        inbox_attributes = {}
+        inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
+        inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
+        %>
+        <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |

         <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
         <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>


@@ -80,8 +85,8 @@
         </p>
         <p>
         <%= t 'layouts.intro_3', 
         </p>
         <p>
         <%= t 'layouts.intro_3', 

-              :ucl => '<a href="http://www.vr.ucl.ac.uk">' + t('layouts.intro_3_ucl') + '</a>', 
-              :bytemark => '<a href="http://www.bytemark.co.uk">' + t('layouts.intro_3_bytemark') + '</a>' %>
+              :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), 
+              :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>

         </p>
       </div>
       <% end %>
         </p>
       </div>
       <% end %>


@@ -102,9 +107,9 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
       <% end %>
 
       <div id="left_menu" class="left_menu">

-        <a href="<%= t 'layouts.help_wiki_url' %>"><%= t 'layouts.help_wiki' %></a><br />
-        <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />
-        <a href="<%= t 'layouts.shop_url' %>"><%= t 'layouts.shop' %></a><br />
+        <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
+        <a href="http://www.opengeodata.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 />

         <%= yield :left_menu %>
       </div>
 
         <%= yield :left_menu %>
       </div>