Download as
Browse Code »

Commit 91659d7b55dbc968a8c655ba43958319067df3f1

Authored by Antonio Terceiro
1 parent d1462974
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Replace deprecated parameter to will_paginate. 

Also, removed explicit :previous_label and :next_label from calls to the
pagination_links helper that used the same string as the default ones
already provided by the helper. This needs will_paginate from Debian
Squeeze at least.
Showing 7 changed files with 7 additions and 7 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @91659d7
... ... @@ -1142,7 +1142,7 @@ module ApplicationHelper
1142 1142 end
1143 1143  
1144 1144 def pagination_links(collection, options={})
1145   - options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)
  1145 + options = {:previous_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)
1146 1146 will_paginate(collection, options)
1147 1147 end
1148 1148  
... ...
app/helpers/blog_helper.rb
  Diff comments   View file @91659d7
... ... @@ -17,7 +17,7 @@ module BlogHelper
17 17 def list_posts(articles, format = 'full')
18 18 pagination = will_paginate(articles, {
19 19 :param_name => 'npage',
20   - :prev_label => _('« Newer posts'),
  20 + :previous_label => _('« Newer posts'),
21 21 :next_label => _('Older posts »')
22 22 })
23 23 content = []
... ...
app/helpers/cms_helper.rb
  Diff comments   View file @91659d7
... ... @@ -16,7 +16,7 @@ module CmsHelper
16 16 end
17 17  
18 18 def pagination_links(collection, options={})
19   - options = {:prev_label => '« ', :next_label => ' »', :page_links => false}.merge(options)
  19 + options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options)
20 20 will_paginate(collection, options)
21 21 end
22 22  
... ...
app/helpers/forum_helper.rb
  Diff comments   View file @91659d7
... ... @@ -11,7 +11,7 @@ module ForumHelper
11 11 def list_forum_posts(articles)
12 12 pagination = will_paginate(articles, {
13 13 :param_name => 'npage',
14   - :prev_label => _('« Newer posts'),
  14 + :previous_label => _('« Newer posts'),
15 15 :next_label => _('Older posts »')
16 16 })
17 17 content = [content_tag('tr',
... ...
app/views/cms/view.rhtml
  Diff comments   View file @91659d7
... ... @@ -62,4 +62,4 @@
62 62  
63 63 </table>
64 64  
65   -<%= pagination_links @articles, {:param_name => 'npage', :prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;', :page_links => true} %>
  65 +<%= pagination_links @articles, {:param_name => 'npage', :page_links => true} %>
... ...
app/views/shared/articles_list.rhtml
  Diff comments   View file @91659d7
... ... @@ -11,4 +11,4 @@
11 11 <% end %>
12 12 </table>
13 13  
14   -<p><%= pagination_links(articles, {:param_name => 'npage', :prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;', :page_links => true}) %></p>
  14 +<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
... ...
debian/control
  Diff comments   View file @91659d7
... ... @@ -11,7 +11,7 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
11 11  
12 12 Package: noosfero
13 13 Architecture: all
14   -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}
  14 +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}
15 15 Recommends: postgresql-client
16 16 Description: free web-based platform for social networks
17 17 Noosfero is a web platform for social and solidarity economy networks with
... ...