Merge remote-tracking branch 'upstream/pull/1851'

[rails.git] / app / views / user / list.html.erb

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index fcd0c41fcfd7f49a349ecd2f1035f0f24ad804e2..960cf112854219d138c9f6db1b9df9159a71c8b4 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,11 +1,11 @@
-<% @title = t('user.list.title') %>
+<% @title = t('.title') %>

 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>
 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t('user.list.heading') %></h1>
+  <h1><%= t('.heading') %></h1>

 <% end %>
 
 <% unless @users.empty? %>
 <% end %>
 
 <% unless @users.empty? %>


@@ -16,7 +16,7 @@
     <table id="user_list">
       <tr>
         <td colspan="2">
     <table id="user_list">
       <tr>
         <td colspan="2">

-          <%= t 'user.list.showing',
+          <%= t '.showing',

               :page => @user_pages.current_page.number,
               :first_item => @user_pages.current_page.first_item,
               :last_item => @user_pages.current_page.last_item,
               :page => @user_pages.current_page.number,
               :first_item => @user_pages.current_page.first_item,
               :last_item => @user_pages.current_page.last_item,


@@ -24,7 +24,7 @@
               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>
               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>

-          | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, params.merge(:page => n) } %>
+          | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>

           <% end %>
         </td>
         <td>
           <% end %>
         </td>
         <td>


@@ -35,10 +35,10 @@
     </table>
 
     <div id="user_list_actions buttons">
     </table>
 
     <div id="user_list_actions buttons">

-      <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
-      <%= submit_tag t('user.list.hide'), :name => "hide" %>
+      <%= submit_tag t('.confirm'), :name => "confirm" %>
+      <%= submit_tag t('.hide'), :name => "hide" %>

     </div>
   <% end %>
 <% else %>
     </div>
   <% end %>
 <% else %>

-  <p><%= t "user.list.empty" %></p>
+  <p><%= t ".empty" %></p>

 <% end %>
 <% end %>