From 347fbb41e0e2a857e27939c922c460061b50d745 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 14 Aug 2010 23:19:08 -0300 Subject: [PATCH] Generate translatable pagination links --- app/helpers/application_helper.rb | 5 +++++ app/helpers/friends_helper.rb | 5 ----- app/helpers/profile_helper.rb | 5 ----- app/helpers/search_helper.rb | 5 ----- app/views/browse/communities.rhtml | 2 +- app/views/browse/people.rhtml | 2 +- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6312d81..4994d59 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1110,4 +1110,9 @@ module ApplicationHelper link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger') end + def pagination_links(collection, options={}) + options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) + will_paginate(collection, options) + end + end diff --git a/app/helpers/friends_helper.rb b/app/helpers/friends_helper.rb index a2fd2c3..1b01380 100644 --- a/app/helpers/friends_helper.rb +++ b/app/helpers/friends_helper.rb @@ -5,9 +5,4 @@ module FriendsHelper link_to text, options end - def pagination_links(collection, options={}) - options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) - will_paginate(collection, options) - end - end diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index 132caae..fbfb6dd 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -15,9 +15,4 @@ module ProfileHelper end end - def pagination_links(collection, options={}) - options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) - will_paginate(collection, options) - end - end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index def426d..f4a7659 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -98,11 +98,6 @@ module SearchHelper ), :class => 'profile-info') end - def pagination_links(collection, options={}) - options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) - will_paginate(collection, options) - end - def product_categories_menu(asset, product_category, object_ids = nil) cats = ProductCategory.menu_categories(@product_category, environment) cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten diff --git a/app/views/browse/communities.rhtml b/app/views/browse/communities.rhtml index 411774d..df1c709 100644 --- a/app/views/browse/communities.rhtml +++ b/app/views/browse/communities.rhtml @@ -4,6 +4,6 @@ <%= render :partial => 'display_results' %> -<%= will_paginate @results %> +<%= pagination_links @results %>
diff --git a/app/views/browse/people.rhtml b/app/views/browse/people.rhtml index 8610c0d..2a4f142 100644 --- a/app/views/browse/people.rhtml +++ b/app/views/browse/people.rhtml @@ -4,6 +4,6 @@ <%= render :partial => 'display_results' %> -<%= will_paginate @results %> +<%= pagination_links @results %>
-- libgit2 0.21.2