Adding title for role icons when viewing user isn't an admin, re-adding translations...

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index dfd26e609edc95cbfea1b0f047f6180e0bc63221..ab455461f264b7c90bfa21dac31360d4ff366482 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -7,7 +7,7 @@
 <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>
 <% end %>
 <% elsif @this_user.has_role? role %>
 <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>
 <% end %>
 <% elsif @this_user.has_role? role %>

-<%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}")) %>
+<%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %>

 <% end %>
 <% end %></h2>
 <div id="userinformation">
 <% end %>
 <% end %></h2>
 <div id="userinformation">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9105a2d425ac2bd03c521e05e6dc0cc5dd670d79..f0b9cb235b296a4825ecf3c6362c7bbbb1d1115c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -948,6 +948,8 @@ en:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:

+        administrator: "Administrator"
+        moderator: "Moderator"

         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"
         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"