From 91659d7b55dbc968a8c655ba43958319067df3f1 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sun, 27 Nov 2011 16:05:56 -0200 Subject: [PATCH] Replace deprecated parameter to will_paginate. --- app/helpers/application_helper.rb | 2 +- app/helpers/blog_helper.rb | 2 +- app/helpers/cms_helper.rb | 2 +- app/helpers/forum_helper.rb | 2 +- app/views/cms/view.rhtml | 2 +- app/views/shared/articles_list.rhtml | 2 +- debian/control | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e8de6b6..5c7a03d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1142,7 +1142,7 @@ module ApplicationHelper end def pagination_links(collection, options={}) - options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) + options = {:previous_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) will_paginate(collection, options) end diff --git a/app/helpers/blog_helper.rb b/app/helpers/blog_helper.rb index 97e4003..407d399 100644 --- a/app/helpers/blog_helper.rb +++ b/app/helpers/blog_helper.rb @@ -17,7 +17,7 @@ module BlogHelper def list_posts(articles, format = 'full') pagination = will_paginate(articles, { :param_name => 'npage', - :prev_label => _('« Newer posts'), + :previous_label => _('« Newer posts'), :next_label => _('Older posts »') }) content = [] diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index a205c3c..06f7f93 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -16,7 +16,7 @@ module CmsHelper end def pagination_links(collection, options={}) - options = {:prev_label => '« ', :next_label => ' »', :page_links => false}.merge(options) + options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options) will_paginate(collection, options) end diff --git a/app/helpers/forum_helper.rb b/app/helpers/forum_helper.rb index e37ab89..bf0e873 100644 --- a/app/helpers/forum_helper.rb +++ b/app/helpers/forum_helper.rb @@ -11,7 +11,7 @@ module ForumHelper def list_forum_posts(articles) pagination = will_paginate(articles, { :param_name => 'npage', - :prev_label => _('« Newer posts'), + :previous_label => _('« Newer posts'), :next_label => _('Older posts »') }) content = [content_tag('tr', diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml index 9eea642..807ac94 100644 --- a/app/views/cms/view.rhtml +++ b/app/views/cms/view.rhtml @@ -62,4 +62,4 @@ -<%= pagination_links @articles, {:param_name => 'npage', :prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »', :page_links => true} %> +<%= pagination_links @articles, {:param_name => 'npage', :page_links => true} %> diff --git a/app/views/shared/articles_list.rhtml b/app/views/shared/articles_list.rhtml index f47b4bf..089a36d 100644 --- a/app/views/shared/articles_list.rhtml +++ b/app/views/shared/articles_list.rhtml @@ -11,4 +11,4 @@ <% end %> -

<%= pagination_links(articles, {:param_name => 'npage', :prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »', :page_links => true}) %>

+

<%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %>

diff --git a/debian/control b/debian/control index ceae885..42fab5b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git Package: noosfero Architecture: all -Depends: rails (>= 2.3.5-1~), rails-ruby1.8 (>= 2.3.5-1~), ruby1.8, ruby, rake, libgettext-rails-ruby1.8, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby, iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, ${misc:Depends} +Depends: rails (>= 2.3.5-1~), rails-ruby1.8 (>= 2.3.5-1~), ruby1.8, ruby, rake, libgettext-rails-ruby1.8, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby (>= 2.3.12-1~), iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, ${misc:Depends} Recommends: postgresql-client Description: free web-based platform for social networks Noosfero is a web platform for social and solidarity economy networks with -- libgit2 0.21.2