From cb318740851672292227b7376434451684ae0360 Mon Sep 17 00:00:00 2001 From: Joris Kinable Date: Wed, 14 Aug 2019 15:16:06 +0200 Subject: Added option to display authors under article titles (#2487) This feature is particularly useful to display authors underneath scientific articles. --- app/Controllers/configureController.php | 1 + app/Models/ConfigurationSetter.php | 3 +++ app/i18n/cz/conf.php | 1 + app/i18n/de/conf.php | 1 + app/i18n/en/conf.php | 1 + app/i18n/es/conf.php | 1 + app/i18n/fr/conf.php | 1 + app/i18n/he/conf.php | 1 + app/i18n/it/conf.php | 1 + app/i18n/kr/conf.php | 1 + app/i18n/nl/conf.php | 1 + app/i18n/oc/conf.php | 1 + app/i18n/pt-br/conf.php | 1 + app/i18n/ru/conf.php | 1 + app/i18n/tr/conf.php | 1 + app/i18n/zh-cn/conf.php | 1 + app/views/configure/display.phtml | 3 +++ app/views/helpers/index/normal/entry_header.phtml | 17 ++++++++++++++++- 18 files changed, 37 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 6d3c4dcce..a839f0005 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -48,6 +48,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { FreshRSS_Context::$user_conf->topline_favorite = Minz_Request::param('topline_favorite', false); FreshRSS_Context::$user_conf->topline_date = Minz_Request::param('topline_date', false); FreshRSS_Context::$user_conf->topline_link = Minz_Request::param('topline_link', false); + FreshRSS_Context::$user_conf->topline_display_authors = Minz_Request::param('topline_display_authors', false); FreshRSS_Context::$user_conf->bottomline_read = Minz_Request::param('bottomline_read', false); FreshRSS_Context::$user_conf->bottomline_favorite = Minz_Request::param('bottomline_favorite', false); FreshRSS_Context::$user_conf->bottomline_sharing = Minz_Request::param('bottomline_sharing', false); diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index ec6380df4..778513f17 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -257,6 +257,9 @@ class FreshRSS_ConfigurationSetter { private function _topline_read(&$data, $value) { $data['topline_read'] = $this->handleBool($value); } + private function _topline_display_authors(&$data, $value) { + $data['topline_display_authors'] = $this->handleBool($value); + } /** * The (not so long) list of setters for system configuration. diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index ce3a4e418..8a21067ee 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Datum vydání', 'related_tags' => 'Související tagy', //TODO - Translation 'sharing' => 'Sdílení', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Horní řádek', ), 'language' => 'Jazyk', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index b73d76f72..37a67eb15 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Datum der Veröffentlichung', 'related_tags' => 'Verwandte Tags', 'sharing' => 'Teilen', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Kopfzeile', ), 'language' => 'Sprache', diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index b21061513..8193233ce 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Date of publication', 'related_tags' => 'Article tags', 'sharing' => 'Sharing', + 'display_authors' => 'Authors', 'top_line' => 'Top line', ), 'language' => 'Language', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index 612d81a1b..2eeeee052 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Fecha de publicación', 'related_tags' => 'Etiquetas relacionadas', 'sharing' => 'Compartir', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Línea superior', ), 'language' => 'Idioma', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index 5d1bb1a90..5f6730b53 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Date de publication', 'related_tags' => 'Tags de l’article', 'sharing' => 'Partage', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Ligne du haut', ), 'language' => 'Langue', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index 08769aeb0..1da5c292c 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'תאריך הפרסום', 'related_tags' => 'תגיות קשורות', //TODO - Translation 'sharing' => 'שיתוף', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'שורה עליונה', ), 'language' => 'שפה', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index c66644446..f3c59ed8c 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Data di pubblicazione', 'related_tags' => 'Tags correlati', //TODO - Translation 'sharing' => 'Condivisione', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Barra in alto', ), 'language' => 'Lingua', diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index 0307ac455..1efaee88b 100644 --- a/app/i18n/kr/conf.php +++ b/app/i18n/kr/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => '발행일', 'related_tags' => '관련 태그', 'sharing' => '공유', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => '상단', ), 'language' => '언어', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index aed4e352e..b7ba7bbeb 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Publicatie datum', 'related_tags' => 'Gerelateerde labels', 'sharing' => 'Delen', + 'display_authors' => 'Auteurs', 'top_line' => 'Bovenaan', ), 'language' => 'Taal', diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 2f08bfc1c..b37785a7e 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Data de publicacion', 'related_tags' => 'Etiquetas ligadas', 'sharing' => 'Partatge', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Linha amont', ), 'language' => 'Lenga', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index e4da7a729..082027328 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Data da publicação', 'related_tags' => 'Tags relacionadas', //TODO - Translation 'sharing' => 'Compartilhar', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Linha superior', ), 'language' => 'Ídioma', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index cea7c2f63..48ce4b9f3 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Date of publication', //TODO - Translation 'related_tags' => 'Related tags', //TODO - Translation 'sharing' => 'Sharing', //TODO - Translation + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Top line', //TODO - Translation ), 'language' => 'Язык', diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 16ff8b7d5..855bca6c8 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => 'Yayınlama Tarihi', 'related_tags' => 'İlgili etiketler', //TODO - Translation 'sharing' => 'Paylaşım', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => 'Üst çizgi', ), 'language' => 'Dil', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 21f9a920c..ebe069c2c 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -21,6 +21,7 @@ return array( 'publication_date' => '更新日期', 'related_tags' => '相关标签', 'sharing' => '分享', + 'display_authors' => 'Authors', //TODO - Translation 'top_line' => '顶栏', ), 'language' => '语言', diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 58c4e219a..60b7748c5 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -81,6 +81,7 @@ + @@ -92,6 +93,7 @@ topline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="topline_favorite; ?>"/> + topline_display_authors ? ' checked="checked"' : ''; ?> data-leave-validation="topline_display_authors; ?>"/> topline_date ? ' checked="checked"' : ''; ?> data-leave-validation="topline_date; ?>"/> topline_link ? ' checked="checked"' : ''; ?> data-leave-validation="topline_link; ?>"/> @@ -100,6 +102,7 @@ bottomline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_favorite; ?>"/> bottomline_tags ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_tags; ?>"/> bottomline_sharing ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_sharing; ?>"/> + bottomline_date ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_date; ?>"/> bottomline_link ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_link; ?>"/> diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml index 86298e59f..7873b16e4 100644 --- a/app/views/helpers/index/normal/entry_header.phtml +++ b/app/views/helpers/index/normal/entry_header.phtml @@ -1,6 +1,7 @@ topline_read; $topline_favorite = FreshRSS_Context::$user_conf->topline_favorite; + $topline_display_authors = FreshRSS_Context::$user_conf->topline_display_authors; $topline_date = FreshRSS_Context::$user_conf->topline_date; $topline_link = FreshRSS_Context::$user_conf->topline_link; ?> -- cgit v1.2.3