From 2c113bb822ff1c0de005535a47795e824611ca15 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Wed, 1 Feb 2017 18:10:50 -0500 Subject: [PATCH] Add option to not redirect user when having nothing to read --- app/controllers/item.php | 5 ++++- app/locales/ar_AR/translations.php | 2 ++ app/locales/cs_CZ/translations.php | 2 ++ app/locales/de_DE/translations.php | 3 ++- app/locales/es_ES/translations.php | 2 ++ app/locales/fr_FR/translations.php | 4 +++- app/locales/it_IT/translations.php | 2 ++ app/locales/ja_JP/translations.php | 2 ++ app/locales/pt_BR/translations.php | 2 ++ app/locales/ru_RU/translations.php | 2 ++ app/locales/sr_RS/translations.php | 2 ++ app/locales/sr_RS@latin/translations.php | 2 ++ app/locales/tr_TR/translations.php | 2 ++ app/locales/zh_CN/translations.php | 2 ++ app/models/config.php | 1 + 15 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/controllers/item.php b/app/controllers/item.php index 3087dad..968b29d 100644 --- a/app/controllers/item.php +++ b/app/controllers/item.php @@ -17,7 +17,10 @@ Router\get_action('unread', function () { if ($params['nb_unread_items'] === 0) { $action = Helper\config('redirect_nothing_to_read', 'feeds'); - Response\redirect('?action='.$action.'¬hing_to_read=1'); + + if ($action !== 'nowhere') { + Response\redirect('?action='.$action.'¬hing_to_read=1'); + } } Response\html(Template\layout('unread/items', $params + array( diff --git a/app/locales/ar_AR/translations.php b/app/locales/ar_AR/translations.php index df710e3..0687787 100644 --- a/app/locales/ar_AR/translations.php +++ b/app/locales/ar_AR/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/cs_CZ/translations.php b/app/locales/cs_CZ/translations.php index e050797..3b5e8a6 100644 --- a/app/locales/cs_CZ/translations.php +++ b/app/locales/cs_CZ/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/de_DE/translations.php b/app/locales/de_DE/translations.php index 6fd62c2..8a8eb77 100644 --- a/app/locales/de_DE/translations.php +++ b/app/locales/de_DE/translations.php @@ -89,7 +89,6 @@ return array( 'Previous item' => 'Vorheriger Eintrag', 'Next item' => 'Nächster Eintrag', 'Mark as read or unread' => 'Als gelesen oder ungelesen markieren', - 'Mark all unread items as read' => 'Alle ungelesenen Einträge als gelesen markieren', 'Open original link' => 'Original-Link öffnen', 'Open item' => 'Eintrag öffnen', 'About' => 'Über', @@ -267,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + 'Mark all unread items as read' => 'Alle ungelesenen Einträge als gelesen markieren', + // 'Do not redirect me' => '', ); diff --git a/app/locales/es_ES/translations.php b/app/locales/es_ES/translations.php index dd98eff..6517d9d 100644 --- a/app/locales/es_ES/translations.php +++ b/app/locales/es_ES/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/fr_FR/translations.php b/app/locales/fr_FR/translations.php index 808ed76..74c44c2 100644 --- a/app/locales/fr_FR/translations.php +++ b/app/locales/fr_FR/translations.php @@ -93,7 +93,7 @@ return array( 'Open item' => 'Ouvrir un élément', 'About' => 'A propos', 'Miniflux version:' => 'Version de Miniflux :', - 'Nothing to read' => 'Rien à lire', + 'Nothing to read' => 'Il n\'y a rien à lire.', 'mark all as read' => 'tout marquer comme lu', 'original link' => 'lien original', 'mark as read' => 'marquer comme lu', @@ -266,4 +266,6 @@ return array( 'This field is required' => 'Ce champ est requis', 'This value must be an integer' => 'Cette valeur doit être un entier', 'This text is too long (max. %d)' => 'Ce texte est trop long (max. %d)', + 'Mark all unread items as read' => 'Marquer tous les éléments non lus comme lus', + 'Do not redirect me' => 'Ne pas me rediriger' ); diff --git a/app/locales/it_IT/translations.php b/app/locales/it_IT/translations.php index c57e82f..1a6a89b 100644 --- a/app/locales/it_IT/translations.php +++ b/app/locales/it_IT/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/ja_JP/translations.php b/app/locales/ja_JP/translations.php index 98a8098..45477a2 100644 --- a/app/locales/ja_JP/translations.php +++ b/app/locales/ja_JP/translations.php @@ -268,4 +268,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/pt_BR/translations.php b/app/locales/pt_BR/translations.php index 4c587c8..136b73b 100644 --- a/app/locales/pt_BR/translations.php +++ b/app/locales/pt_BR/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/ru_RU/translations.php b/app/locales/ru_RU/translations.php index 992edc8..584db0c 100644 --- a/app/locales/ru_RU/translations.php +++ b/app/locales/ru_RU/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/sr_RS/translations.php b/app/locales/sr_RS/translations.php index 32e4e4b..8187d17 100644 --- a/app/locales/sr_RS/translations.php +++ b/app/locales/sr_RS/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/sr_RS@latin/translations.php b/app/locales/sr_RS@latin/translations.php index 35773be..c628816 100644 --- a/app/locales/sr_RS@latin/translations.php +++ b/app/locales/sr_RS@latin/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/tr_TR/translations.php b/app/locales/tr_TR/translations.php index f73de71..48caf23 100644 --- a/app/locales/tr_TR/translations.php +++ b/app/locales/tr_TR/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/locales/zh_CN/translations.php b/app/locales/zh_CN/translations.php index 2cf458e..808d77f 100644 --- a/app/locales/zh_CN/translations.php +++ b/app/locales/zh_CN/translations.php @@ -266,4 +266,6 @@ return array( // 'This field is required' => '', // 'This value must be an integer' => '', // 'This text is too long (max. %d)' => '', + // 'Mark all unread items as read' => '', + // 'Do not redirect me' => '', ); diff --git a/app/models/config.php b/app/models/config.php index 043e29c..9034b20 100644 --- a/app/models/config.php +++ b/app/models/config.php @@ -144,6 +144,7 @@ function get_nothing_to_read_redirections() 'feeds' => t('Subscriptions'), 'history' => t('History'), 'bookmarks' => t('Bookmarks'), + 'nowhere' => t('Do not redirect me'), ); }