diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-19 14:35:02 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-19 14:35:02 +0200 |
| commit | 08cc7c4cd4f652da551964a7f5ac584ec18884ab (patch) | |
| tree | c336ec0d96ef47da5a2b8fe922e32250a78d4546 | |
| parent | ba378791c2f36251a22e8a98351ab9b23a640c17 (diff) | |
Add an error message when a query is deprecated.
See https://github.com/marienfressinaud/FreshRSS/issues/625
| -rw-r--r-- | app/i18n/en.php | 1 | ||||
| -rw-r--r-- | app/i18n/fr.php | 1 | ||||
| -rw-r--r-- | app/views/configure/queries.phtml | 15 |
3 files changed, 13 insertions, 4 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index c53adb409..e2bd21623 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -46,6 +46,7 @@ return array ( 'no_query' => 'You haven’t created any user query yet.', 'query_filter' => 'Filter applied:', 'no_query_filter' => 'No filter', + 'query_deprecated' => 'This query is no longer valid. The concerned category or feed has been deleted.', 'about' => 'About', 'stats' => 'Statistics', 'stats_idle' => 'Idle feeds', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 58dccd2d4..e06bba487 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -46,6 +46,7 @@ return array ( 'no_query' => 'Vous n’avez pas encore créé de filtre.', 'query_filter' => 'Filtres appliqués :', 'no_query_filter' => 'Aucun filtre appliqué', + 'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.', 'about' => 'À propos', 'stats' => 'Statistiques', 'stats_idle' => 'Flux inactifs', diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index 2895f584c..e778ce078 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -42,30 +42,37 @@ + (isset($query['get']) ? 1 : 0); // If the only filter is "all" articles, we consider there is no filter $exist = ($exist === 1 && isset($query['get']) && $query['get'] === 'a') ? 0 : $exist; + + $deprecated = (isset($this->query_get[$key]) && + $this->query_get[$key]['deprecated']); ?> <?php if ($exist === 0) { ?> <div class="alert alert-warn"> <div class="alert-head"><?php echo _t('no_query_filter'); ?></div> </div> + <?php } elseif ($deprecated) { ?> + <div class="alert alert-error"> + <div class="alert-head"><?php echo _t('query_deprecated'); ?></div> + </div> <?php } else { ?> <div class="alert alert-success"> <div class="alert-head"><?php echo _t('query_filter'); ?></div> <ul> - <?php if (isset($query['search'])) { $exist = true; ?> + <?php if (isset($query['search'])) { ?> <li class="item"><?php echo _t('query_search', $query['search']); ?></li> <?php } ?> - <?php if (isset($query['state'])) { $exist = true; ?> + <?php if (isset($query['state'])) { ?> <li class="item"><?php echo _t('query_state_' . $query['state']); ?></li> <?php } ?> - <?php if (isset($query['order'])) { $exist = true; ?> + <?php if (isset($query['order'])) { ?> <li class="item"><?php echo _t('query_order_' . strtolower($query['order'])); ?></li> <?php } ?> - <?php if (isset($query['get'])) { $exist = true; ?> + <?php if (isset($query['get'])) { ?> <li class="item"><?php echo _t('query_get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li> <?php } ?> </ul> |