Browse Source

Update i18n for limit of category.

Marien Fressinaud 11 years ago
parent
commit
1ea996c4ea
3 changed files with 5 additions and 10 deletions
  1. 3 2
      app/Controllers/categoryController.php
  2. 1 4
      app/i18n/en.php
  3. 1 4
      app/i18n/fr.php

+ 3 - 2
app/Controllers/categoryController.php

@@ -35,9 +35,10 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 		$limits = Minz_Configuration::limits();
 		$this->view->categories = $catDAO->listCategories(false);
+
 		if (count($this->view->categories) >= $limits['max_categories']) {
-			Minz_Request::bad(_t('over_max_categories', $limits['max_categories']), $url_redirect);
-			return;
+			Minz_Request::bad(_t('sub.categories.over_max', $limits['max_categories']),
+			                  $url_redirect);
 		}
 
 		if (Minz_Request::isPost()) {

+ 1 - 4
app/i18n/en.php

@@ -53,10 +53,6 @@
   'admin.check_install.pcre.ok' => 'You have the required library for regular expressions (PCRE).',
   'admin.check_install.pdo.nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
   'admin.check_install.pdo.ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo_mysql.nok' => 'You lack PDO for MySQL (it\'s ok if PDO is good).',
-  'admin.check_install.pdo_mysql.ok' => 'You have PDO for MySQL.',
-  'admin.check_install.pdo_sqlite.nok' => 'You lack PDO for SQLite (it\'s ok if PDO is good).',
-  'admin.check_install.pdo_sqlite.ok' => 'You have PDO for SQLite.',
   'admin.check_install.persona.nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
   'admin.check_install.persona.ok' => 'Permissions on Mozilla Persona directory are good.',
   'admin.check_install.php' => 'PHP installation',
@@ -477,6 +473,7 @@
   'status_unread' => 'Unread',
   'steps' => 'Steps',
   'sticky_post' => 'Stick the article to the top when opened',
+  'sub.categories.over_max' => 'You have reached your limit of categories (%d)',
   'submit' => 'Submit',
   'subscription_management' => 'Subscriptions management',
   'sun' => 'Sun',

+ 1 - 4
app/i18n/fr.php

@@ -53,10 +53,6 @@
   'admin.check_install.pcre.ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
   'admin.check_install.pdo.nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
   'admin.check_install.pdo.ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo_mysql.nok' => 'Vous ne possédez pas PDO pour MySQL (ok si PDO est bon).',
-  'admin.check_install.pdo_mysql.ok' => 'Vous possédez PDO pour MySQL.',
-  'admin.check_install.pdo_sqlite.nok' => 'Vous ne possédez pas PDO pour SQLite (ok si PDO est bon).',
-  'admin.check_install.pdo_sqlite.ok' => 'Vous possédez PDO pour SQLite.',
   'admin.check_install.persona.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'admin.check_install.persona.ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
   'admin.check_install.php' => 'Installation de PHP',
@@ -477,6 +473,7 @@
   'status_unread' => 'non lus',
   '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)',
   'submit' => 'Valider',
   'subscription_management' => 'Gestion des abonnements',
   'sun' => 'dim.',