From 7cbfdb4e0932230742060b1d04e86f221a7cb10d Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 1 Dec 2018 22:12:42 +0100 Subject: Filter feeds in error (#2160) https://github.com/FreshRSS/FreshRSS/issues/2146 --- app/Controllers/subscriptionController.php | 2 ++ app/i18n/cz/sub.php | 7 +++++++ app/i18n/de/sub.php | 7 +++++++ app/i18n/en/sub.php | 7 +++++++ app/i18n/es/sub.php | 7 +++++++ app/i18n/fr/sub.php | 7 +++++++ app/i18n/he/sub.php | 7 +++++++ app/i18n/it/sub.php | 7 +++++++ app/i18n/kr/sub.php | 7 +++++++ app/i18n/nl/sub.php | 7 +++++++ app/i18n/oc/sub.php | 7 +++++++ app/i18n/pt-br/sub.php | 7 +++++++ app/i18n/ru/sub.php | 7 +++++++ app/i18n/tr/sub.php | 7 +++++++ app/i18n/zh-cn/sub.php | 7 +++++++ app/views/subscription/index.phtml | 17 +++++++++++++++++ 16 files changed, 117 insertions(+) (limited to 'app') diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 0b1439ba5..46503fc19 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -33,6 +33,8 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { @filemtime(PUBLIC_PATH . '/scripts/category.js'))); Minz_View::prependTitle(_t('sub.title') . ' · '); + $this->view->onlyFeedsWithError = Minz_Request::paramTernary('error'); + $id = Minz_Request::param('id'); if ($id !== false) { $feedDAO = FreshRSS_Factory::createFeedDao(); diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index fc06fb4dc..ec4c6f374 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistika', 'think_to_add' => 'Můžete přidat kanály.', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 32446c3fa..c4455c4be 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Zeige in eigener Kategorie', ), 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Überprüfe SSL Sicherheit', 'stats' => 'Statistiken', 'think_to_add' => 'Sie können Feeds hinzufügen.', diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 154d42e95..1dac808b0 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', + 'error' => 'Show only feeds with error', + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', + ), 'ssl_verify' => 'Verify SSL security', 'stats' => 'Statistics', 'think_to_add' => 'You may add some feeds.', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 02f4b270f..b6a7eb568 100755 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estadísticas', 'think_to_add' => 'Puedes añadir fuentes.', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index c48aaf6c7..b5eaccef4 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Afficher dans sa catégorie', ), 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', + 'show' => array( + 'all' => 'Montrer tous les flux', + 'error' => 'Montrer seulement les flux en erreur', + ), + 'showing' => array( + 'error' => 'Montre seulement les flux en erreur', + ), 'ssl_verify' => 'Vérification sécurité SSL', 'stats' => 'Statistiques', 'think_to_add' => 'Vous pouvez ajouter des flux.', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 474abb8ad..f467df28c 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'סטטיסטיקות', 'think_to_add' => 'ניתן להוסיף הזנות חדשות.', diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 3cf869dd4..cbb488f3e 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistiche', 'think_to_add' => 'Aggiungi feed.', diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index 9595a045e..785a3ea96 100644 --- a/app/i18n/kr/sub.php +++ b/app/i18n/kr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '피드가 속한 카테고리에만 표시하기', ), 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL 유효성 검사', 'stats' => '통계', 'think_to_add' => '피드를 추가할 수 있습니다.', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index 7b1e3727e..53954ad3f 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Toon in categorie', ), 'pubsubhubbub' => 'Directe notificaties met PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL-veiligheid controleren', 'stats' => 'Statistieken', 'think_to_add' => 'Voeg wat feeds toe.', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index c553a8af4..1d2e0007b 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -45,6 +45,13 @@ return array( 'normal' => 'Mostar dins sa categoria', ), 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verificacion de la seguretat SSL', 'stats' => 'Estatisticas', 'think_to_add' => 'Podètz ajustar de fluxes.', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index 15986d6c3..03ae9d014 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estatísticas', 'think_to_add' => 'Você deve adicionar alguns feeds.', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index eccbf818d..ccd3b0020 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistics', //TODO - Translation 'think_to_add' => 'You may add some feeds.', //TODO - Translation diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index e6adc0353..4d71e3dbf 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'İstatistikler', 'think_to_add' => 'Akış ekleyebilirsiniz.', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index aab4b1359..49b6e4304 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '在分类中显示', ), 'pubsubhubbub' => 'PubSubHubbub 即时通知', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => '统计', 'think_to_add' => '你可以添加一些 RSS 源。', diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 41dd8a7df..8b196cb00 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -52,6 +52,12 @@ default_category->name()); ?>

+ onlyFeedsWithError): ?> +

+ +

+ +
@@ -122,6 +128,9 @@ onlyFeedsWithError && !$feed->inError()) { + continue; + } $error = $feed->inError() ? ' error' : ''; $empty = $feed->nbEntries() == 0 ? ' empty' : ''; ?> @@ -140,6 +149,14 @@
+ + feed) ? ' class="active"' : ''; ?> -- cgit v1.2.3