Display total user count correctly in user list

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index 6f010e267452eb788d03f07cec3f48b010c949a4..c91ce71e691db1137355a41822c8274745d9ffa6 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -11,6 +11,7 @@
               :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,

+              :items => @user_pages.item_count,

               :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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e521299e722f332a81a974809c5bee4ceaab5266..b7513a0f251ba7ffc6430fa8736863227f9657a4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1648,8 +1648,8 @@ en:
       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing:

-        one: Showing page {{page}} ({{first_item}} of {{count}})
-        other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{count}})
+        one: Showing page {{page}} ({{first_item}} of {{items}})
+        other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}})

       summary: "{{name}} created from {{ip_address}} on {{date}}"
       confirm: Confirm Selected Users
       hide: Hide Selected Users
       summary: "{{name}} created from {{ip_address}} on {{date}}"
       confirm: Confirm Selected Users
       hide: Hide Selected Users