From 0b2ead2248720eaa46cfa7d8e892fc8f97d9a404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 15 Jan 2014 21:52:11 +0100 Subject: [PATCH] rename topics_per_period_in_summary settings to topics_per_period_in_top_summary --- app/controllers/list_controller.rb | 2 +- config/locales/server.da.yml | 2 +- config/locales/server.en.yml | 2 +- config/locales/server.fr.yml | 2 +- config/site_settings.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 47f7dc210f..526d9f5aeb 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -203,7 +203,7 @@ class ListController < ApplicationController def generate_top_lists top = {} options = { - per_page: SiteSetting.topics_per_period_in_summary, + per_page: SiteSetting.topics_per_period_in_top_summary, category: params[:category] } topic_query = TopicQuery.new(current_user, options) diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index b202d367e0..205a895e21 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -610,7 +610,7 @@ da: suppress_reply_directly_below: "Vis ikke antallet af svar på et indlæg når der er et enkelt svar umiddelbart nedenfor" suppress_reply_directly_above: "Vis ikke “svar til“ på et indlæg når der er et enkelt svar umiddelbart nedenfor" - topics_per_period_in_summary: "Hvor mange emner der som standard indlæses på siden med populære emner." + topics_per_period_in_top_summary: "Hvor mange emner der som standard indlæses på siden med populære emner." allow_index_in_robots_txt: "Sitet skal indekseres af søgemaskiner (opdatér robots.txt)" email_domains_blacklist: "En liste af e-mail-domæner som ikke er tilladte, adskilt af pipe-tegn. Eksempel: mailinator.com|trashmail.net." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 119e829f50..253a4b0f05 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -611,7 +611,7 @@ en: suppress_reply_directly_below: "Don't show reply count on a post when there is a single reply directly below" suppress_reply_directly_above: "Don't show in-reply-to on a post when there is a single reply directly above" - topics_per_period_in_summary: "How many topics loaded by default on the top topics page" + topics_per_period_in_top_summary: "How many topics loaded by default on the top topics page" allow_index_in_robots_txt: "Site should be indexed by search engines (update robots.txt)" email_domains_blacklist: "A pipe-delimited list of email domains that are not allowed. Example: mailinator.com|trashmail.net" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index ece4532df2..19d9a4e7a8 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -561,7 +561,7 @@ fr: send_welcome_message: "Les nouveaux utilisateurs reçoivent-ils un message privé de bienvenue ?" suppress_reply_directly_below: "Ne pas afficher le nombre de réponses d'un message quand la seule réponse est juste en dessous" suppress_reply_directly_above: "Ne pas afficher 'en réponse à' sur un message quand la seule réponse est juste en dessus" - topics_per_period_in_summary: "Combien de discussions chargées par défaut sur la page des meilleures discussions" + topics_per_period_in_top_summary: "Combien de discussions chargées par défaut sur la page des meilleures discussions" allow_index_in_robots_txt: "Le site doit-être indexé par les moteurs de recherche (met à jour le fichier robots.txt)" email_domains_blacklist: "Liste des domaines d'email interdits, délimités par un pipe. Exemple: mailinator.com|trashmail.net" email_domains_whitelist: "Liste des domaines d'email autorisés, délimités par un pipe. ATTENTION : les utilisateurs ayant un email sur un autre domaine ne pourrons pas s'enregistrer." diff --git a/config/site_settings.yml b/config/site_settings.yml index 5168828515..64ea6237d6 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -56,7 +56,7 @@ basic: relative_date_duration: client: true default: 30 - topics_per_period_in_summary: + topics_per_period_in_top_summary: default: 20 users: