Refs #2482: updating i18n, pagination helper

1 files changed, 9 insertions, 5 deletions

diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb
index 43bd48796..e604d47c3 100644
--- a/app/helpers/pagination_helper.rb
+++ b/app/helpers/pagination_helper.rb
@@ -20,13 +20,17 @@ module PaginationHelper
   end
 
   def new_pagination collection, cls = nil
-    pinfos = page_entries_info collection, html: false
+    pinfos = page_entries_info collection, model: t("will_paginate.page_entries_info.#{collection.first.class.name.downcase}"), html: false
 
-    links = content_tag :div, '', class: 'page_links' do
-      will_paginate collection, container: false, page_links: false, previous_label: '', next_label: ''
-    end
+    if collection.total_pages > 1
+      links = content_tag :div, '', class: 'page_links' do
+        will_paginate collection, container: false, page_links: false, previous_label: '', next_label: ''
+      end
 
-    content_tag :div, pinfos.concat(links).html_safe, class: "pagination #{cls}"
+      content_tag :div, pinfos.concat(links).html_safe, class: "pagination #{cls}"
+    else
+      content_tag :div, pinfos, class: "pagination #{cls}"
+    end
   end
 
 end