From b9deb68de1a9025cf36ed617655a4ce7c38ed47f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 7 May 2010 09:05:55 +0100 Subject: [PATCH] Display total user count correctly in user list --- app/views/user/list.html.erb | 1 + config/locales/en.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb index 6f010e267..c91ce71e6 100644 --- 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, + :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 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index e521299e7..b7513a0f2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 -- 2.39.5