From 12d0eee7d9d2a46074e8e5ef7683657c4e0dcc30 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sun, 11 Dec 2011 02:49:19 +0100 Subject: [PATCH] use new translation keys for will_paginate instead of the setting --- app/controllers/application_controller.rb | 3 --- config/locales/diaspora/en.yml | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2af6df199..1f0d841ee 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -83,9 +83,6 @@ class ApplicationController < ActionController::Base else I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES end - - WillPaginate::ViewHelpers.pagination_options[:previous_label] = "« #{I18n.t('previous')}" - WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} »" end def clear_gc_stats diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c9d17ecaf..86ac20854 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1015,6 +1015,10 @@ en: email_confirmed: "Email %{email} activated" email_not_confirmed: "Email could not be activated. Wrong link?" + will_paginate: + previous_label: "« previous" + next_label: "next »" + webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"