Display total user count correctly in user list
authorTom Hughes <tom@compton.nu>
Fri, 7 May 2010 08:05:55 +0000 (09:05 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 7 May 2010 08:05:55 +0000 (09:05 +0100)
app/views/user/list.html.erb
config/locales/en.yml

index 6f010e2..c91ce71 100644 (file)
@@ -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,
+              :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 %>
index e521299..b7513a0 100644 (file)
@@ -1648,8 +1648,8 @@ en:
       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