From 8698a0da165c842f20fc0feac9cd79ffddc28662 Mon Sep 17 00:00:00 2001 From: maTh Date: Fri, 4 Feb 2022 15:44:23 +0100 Subject: Improvement: Configuration; Reading Section: Options reordered (#4087) * Reordering - First Draft * i18n * Update conf.php * Update conf.php * fixed label for attribute --- app/i18n/cz/conf.php | 7 + app/i18n/de/conf.php | 7 + app/i18n/en-us/conf.php | 7 + app/i18n/en/conf.php | 7 + app/i18n/es/conf.php | 7 + app/i18n/fr/conf.php | 7 + app/i18n/he/conf.php | 7 + app/i18n/it/conf.php | 7 + app/i18n/ja/conf.php | 7 + app/i18n/ko/conf.php | 7 + app/i18n/nl/conf.php | 7 + app/i18n/oc/conf.php | 7 + app/i18n/pl/conf.php | 7 + app/i18n/pt-br/conf.php | 7 + app/i18n/ru/conf.php | 7 + app/i18n/sk/conf.php | 7 + app/i18n/tr/conf.php | 7 + app/i18n/zh-cn/conf.php | 7 + app/views/configure/reading.phtml | 442 +++++++++++++++++++++----------------- 19 files changed, 367 insertions(+), 201 deletions(-) diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index c1c46fb7c..f25382a3d 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Zobrazit potvrzovací dialové okno pro akce „označit vše jako přečtené“', 'display_articles_unfolded' => 'Ve výchozím nastavení zobrazovat články rozbalené', 'display_categories_unfolded' => 'Kategorii, které rozbalovat', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Skrýt kategorie a kanály bez nepřečtených článků (nefunguje s nastavením „Zobrazit všechny články“)', 'img_with_lazyload' => 'Použít režim „líné načítání“ pro načítaní obrázků', 'jump_next' => 'skočit na další nepřečtenou položku na stejné úrovni (kanál nebo kategorie)', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 0277dcba6..bc1fdc14f 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Bei der Aktion „Alle als gelesen markieren“ einen Bestätigungsdialog anzeigen', 'display_articles_unfolded' => 'Artikel standardmäßig ausgeklappt zeigen', 'display_categories_unfolded' => 'Ausgeklappte Kategorien', + 'headline' => array( + 'articles' => 'Artikel: Öffnen/Schließen', + 'categories' => 'Linke Navigation: Kategorien', + 'mark_as_read' => 'Artikel als gelesen markieren', + 'misc' => 'Sonstiges', + 'view' => 'Ansicht', + ), 'hide_read_feeds' => 'Kategorien & Feeds ohne ungelesene Artikel verstecken (funktioniert nicht mit der Einstellung „Alle Artikel zeigen“)', 'img_with_lazyload' => 'Verwende die "träges Laden"-Methode zum Laden von Bildern', 'jump_next' => 'springe zum nächsten ungelesenen Geschwisterelement (Feed oder Kategorie)', diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php index ddd9ed278..de51f5881 100644 --- a/app/i18n/en-us/conf.php +++ b/app/i18n/en-us/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions', // IGNORE 'display_articles_unfolded' => 'Show articles unfolded by default', // IGNORE 'display_categories_unfolded' => 'Categories to unfold', // IGNORE + 'headline' => array( + 'articles' => 'Articles: Open/Close', // IGNORE + 'categories' => 'Left navigation: Categories', // IGNORE + 'mark_as_read' => 'Mark article as read', // IGNORE + 'misc' => 'Miscellaneous', // IGNORE + 'view' => 'View', // IGNORE + ), 'hide_read_feeds' => 'Hide categories & feeds with no unread articles (does not work with “Show all articles” configuration)', // IGNORE 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', // IGNORE 'jump_next' => 'jump to next unread sibling (feed or category)', // IGNORE diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 9dfba080e..2bbceafca 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions', 'display_articles_unfolded' => 'Show articles unfolded by default', 'display_categories_unfolded' => 'Categories to unfold', + 'headline' => array( + 'articles' => 'Articles: Open/Close', + 'categories' => 'Left navigation: Categories', + 'mark_as_read' => 'Mark article as read', + 'misc' => 'Miscellaneous', + 'view' => 'View', + ), 'hide_read_feeds' => 'Hide categories & feeds with no unread articles (does not work with “Show all articles” configuration)', 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', 'jump_next' => 'jump to next unread sibling (feed or category)', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index bb453a9d1..d5b25469d 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Mostrar ventana de confirmación al usar la función “marcar todos como leídos”', 'display_articles_unfolded' => 'Mostrar los artículos expandidos por defecto', 'display_categories_unfolded' => 'Categorías a desarrollar', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Ocultar categorías & fuentes sin artículos no leídos (no funciona con la configuración "Mostrar todos los artículos")', 'img_with_lazyload' => 'Usar el modo de "carga perezosa" para las imágenes', 'jump_next' => 'saltar al siguiente archivo sin leer emparentado (fuente o categoría)', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index 7ef87d343..eec838b79 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”', 'display_articles_unfolded' => 'Afficher les articles dépliés par défaut', 'display_categories_unfolded' => 'Catégories à déplier', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)', 'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images', 'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index 62be3af7e..62dca4b11 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'הצגת דו-שיח לאישור “סימון הכל כנקרא” ', 'display_articles_unfolded' => 'הצגת מאמרים בשלמותם כברירת מחדל', 'display_categories_unfolded' => 'Categories to unfold', // TODO + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'הסתרת קטגוריות & הזנות ללא מאמרים שלא נקראו (לא עובד יחד עם “הצגת כל המאמרים”)', 'img_with_lazyload' => 'שימוש ב "טעינה עצלה" על מנת לטעון תמונות', 'jump_next' => 'קפיצה לפריט הבא שלא נקרא (הזנה או קטגוריה)', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index 16fd868bc..a9fc1a6d8 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Mostra una conferma per “segna tutto come letto”', 'display_articles_unfolded' => 'Mostra articoli aperti di predefinito', 'display_categories_unfolded' => 'Categories to unfold', // TODO + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Nascondi categorie e feeds con articoli già letti (non funziona se “Mostra tutti gli articoli” è selezionato)', 'img_with_lazyload' => 'Usa la modalità "caricamento ritardato" per le immagini', 'jump_next' => 'Salta al successivo feed o categoria non letto', diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.php index 8d845ef0c..113d385dd 100644 --- a/app/i18n/ja/conf.php +++ b/app/i18n/ja/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => '“すべてに既読を付ける” を押したとき確認ダイアログを表示する', 'display_articles_unfolded' => 'デフォルトでフォルダーに入れてない記事を表示する', 'display_categories_unfolded' => '展開されていない記事', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'カテゴリーを非表示 & 未読の記事がないフィード ("すべてに既読を付ける”では適用しません)', 'img_with_lazyload' => '"lazy load"を写真の読み込み時に使う', 'jump_next' => '次の未読の姉妹記事へ移る (フィードあるいはカテゴリー)', diff --git a/app/i18n/ko/conf.php b/app/i18n/ko/conf.php index 12a14a020..1c9674d3c 100644 --- a/app/i18n/ko/conf.php +++ b/app/i18n/ko/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => '“모두 읽음으로 표시” 실행시 확인 창 표시', 'display_articles_unfolded' => '글을 펼쳐진 상태로 보여주기', 'display_categories_unfolded' => '다음 카테고리를 펼치기', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => '읽지 않은 글이 없는 카테고리와 피드 감추기 (“모든 글 표시”가 설정된 경우 동작하지 않습니다)', 'img_with_lazyload' => '그림을 불러오는 데에 "lazy load" 모드 사용하기', 'jump_next' => '다음 읽지 않은 항목으로 이동 (피드 또는 카테고리)', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 14f23c701..6e266c350 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Toon een bevestigings dialoog op “markeer alles als gelezen” acties', 'display_articles_unfolded' => 'Artikelen standaard uitklappen', 'display_categories_unfolded' => 'Categoriën om uit te klappen', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Categorieën en feeds zonder ongelezen artikelen verbergen (werkt niet met “Toon alle artikelen” configuratie)', 'img_with_lazyload' => 'Gebruik "lazy load" methode om afbeeldingen te laden', 'jump_next' => 'Ga naar volgende ongelezen (feed of categorie)', diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 9c32a45f6..28f11798a 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Mostrar una confirmacion per las accions del tipe « o marcar tot coma legit »', 'display_articles_unfolded' => 'Mostrar los articles desplegats per defaut', 'display_categories_unfolded' => 'Categorias a desplegar', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Rescondre las categorias & fluxes sens articles pas legits (fonciona pas amb la configuracion « Mostrar totes los articles »)', 'img_with_lazyload' => 'Utilizar lo mòde “cargament tardiu” pels imatges', 'jump_next' => 'sautar al vesin venent pas legit (flux o categoria)', diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.php index edbf2ac32..4c5dd0646 100644 --- a/app/i18n/pl/conf.php +++ b/app/i18n/pl/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Pytaj o potwierdzenie przed oznaczeniem wszystkich wiadomości jako przeczytane.', 'display_articles_unfolded' => 'Domyślnie wyświetlaj rozwinięte wiadomości', 'display_categories_unfolded' => 'Kategorie do rozwinięcia', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Ukryj kategorie i kanały nie zawierające nieprzeczytanych wiadomości (nie działa gdy włączone jest wyświetlanie wszystkich wiadomości)', 'img_with_lazyload' => 'Opóźnij ładowanie obrazów dopóki nie będą widoczne', 'jump_next' => 'przejdź do następnego nieprzeczytanego kanału bądź kategorii', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index 510ad0297..2b6241449 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Exibir uma caixa de diálogo de confirmação quando acionar "marcar todos como lido"', 'display_articles_unfolded' => 'Mostrar artigos abertos por padrão', 'display_categories_unfolded' => 'Categorias abertas', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Esconder categorias e feeds com nenhum artigo não lido (não funciona com a configuração "Mostrar todos os artigos”)', 'img_with_lazyload' => 'Utilizar o modo "lazy load" para carregar as imagens', 'jump_next' => 'Vá para o próximo irmão não lido (feed ou categoria)', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index 0a3664c41..577076805 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Показывать диалог подтверждения при выпыполнении действия «отметить всё прочитанным»', 'display_articles_unfolded' => 'Показывать статьи развёрнутыми по умолчанию', 'display_categories_unfolded' => 'Какие категории развёртывать', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Скрывать категории и ленты без непрочитанных статей (не работает с «Показывать все статьи»)', 'img_with_lazyload' => 'Использовать режим "ленивой загрузки" для загрузки картинок', 'jump_next' => 'перейти к следующей ленте или категории', diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php index bf74f8da2..cbade872d 100644 --- a/app/i18n/sk/conf.php +++ b/app/i18n/sk/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => 'Zobraziť potvrdzovací dialóg po kliknutí na “Označiť všetko ako prečítané”', 'display_articles_unfolded' => 'Zobraziť články otvorené', 'display_categories_unfolded' => 'Kategórie na rozbalenie', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Skryť kategórie a kanály s nulovým počtom neprečítaných článkov (nefunguje s nastaveným “Zobraziť všetky články”)', 'img_with_lazyload' => 'Pre načítanie obrázkov použiť "lazy load"', 'jump_next' => 'skočiť na ďalší neprečítaný (kanál ale kategóriu)', diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 5ab08fd62..ae1a2bf47 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => '"Hepsini okundu say" eylemi için onay iste', 'display_articles_unfolded' => 'Katlaması açılmış makaleleri öntanımlı olarak göster', 'display_categories_unfolded' => 'Katlaması açılacak kategoriler', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => 'Okunmamış makalesi olmayan kategori veya akışı gizle ("Tüm makaleleri göster" komutunda çalışmaz)', 'img_with_lazyload' => 'Resimleri yüklemek için "tembel modu" kullan', 'jump_next' => 'Bir sonraki benzer okunmamışa geç (akış veya kategori)', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 1f563262c..44d27e3b0 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -130,6 +130,13 @@ return array( 'confirm_enabled' => '「全部标记为已读」时显示确认对话框', 'display_articles_unfolded' => '默认展开显示文章', 'display_categories_unfolded' => '展开的分类', + 'headline' => array( + 'articles' => 'Articles: Open/Close', // TODO + 'categories' => 'Left navigation: Categories', // TODO + 'mark_as_read' => 'Mark article as read', // TODO + 'misc' => 'Miscellaneous', // TODO + 'view' => 'View', // TODO + ), 'hide_read_feeds' => '隐藏没有未读文章的分类或订阅源 (启用「显示所有文章」后不生效))', 'img_with_lazyload' => '延迟加载图片', 'jump_next' => '跳转到下一未读项（订阅源或分类）', diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index c021132aa..825655102 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -12,244 +12,284 @@
+
+ +
+ +
+ +
+
-
- -
- -

+
+ +
+ +
-
-
- -
- +
+ +
+ +

+
-
-
- -
- +
+
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
+ +
+ +
- -
-
- +
+
+ +
-
-
-
- +
+
+ +
-
+
-
-
- +
+ +
+
+ +
-
-
-
- +
+
+ +
-
-
-
- +
+
+ +
-
+ -
-
- +
+ +
+
+ +
-
-
-
- +
+
+ +
-
-
-
- +
+ +
+ +
-
-
-
- +
+
+ +
-
-
-
- +
+ +
+ +
-
-
- -
- - - +
+ +
+ +
+
+ +
+ +
+ +
+
- +
+ +
+ +
+
- +
+
+ +
+
- +
+
+ +
-
+ -
- -
- +
+ +
+
+ +
-
+
-- cgit v1.2.3