summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-29 10:21:34 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-29 10:21:34 +0100
commitcf7350af4768809c8b5117ba586f5165a4e2b1a8 (patch)
treeeeb3d441d0ea63be189a36e97a34809e8b80f078 /app
parent1ea996c4eaa0f07f4fd906e7cade68a9bee3b11d (diff)
Update i18n for limit of feeds
See https://github.com/marienfressinaud/FreshRSS/issues/680
Diffstat (limited to 'app')
-rwxr-xr-xapp/Controllers/feedController.php4
-rw-r--r--app/i18n/en.php1
-rw-r--r--app/i18n/fr.php1
3 files changed, 4 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7ac083d56..8563b1c0f 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -71,8 +71,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$limits = Minz_Configuration::limits();
$this->view->feeds = $feedDAO->listFeeds();
if (count($this->view->feeds) >= $limits['max_feeds']) {
- Minz_Request::bad(_t('over_max_feeds', $limits['max_feeds']), $url_redirect);
- return;
+ Minz_Request::bad(_t('sub.feeds.over_max', $limits['max_feeds']),
+ $url_redirect);
}
if (Minz_Request::isPost()) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 2c61d822d..a35a6ccf1 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -474,6 +474,7 @@
'steps' => 'Steps',
'sticky_post' => 'Stick the article to the top when opened',
'sub.categories.over_max' => 'You have reached your limit of categories (%d)',
+ 'sub.feeds.over_max' => 'You have reached your limit of feeds (%d)',
'submit' => 'Submit',
'subscription_management' => 'Subscriptions management',
'sun' => 'Sun',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2420b20c3..c29b6c9ac 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -474,6 +474,7 @@
'steps' => 'Étapes',
'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
'sub.categories.over_max' => 'Vous avez atteint votre limite de catégories (%d)',
+ 'sub.feeds.over_max' => 'Vous avez atteint votre limite de flux (%d)',
'submit' => 'Valider',
'subscription_management' => 'Gestion des abonnements',
'sun' => 'dim.',