aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2025-09-15 23:43:46 +0200
committerGravatar GitHub <noreply@github.com> 2025-09-15 23:43:46 +0200
commitf8310a587c26b0965bab71abfeb2d018e414f572 (patch)
tree096f29ade69a6af2d9ab4b2235a2689253f0150f
parentea366d597f3af164a90eb6d58a7525d23a1418f0 (diff)
Clarify: Visibility hidden vs. archived (#7970)
fix https://github.com/FreshRSS/FreshRSS/issues/7887 We have two concepts: how much a feed is shown or not (controlled by priority), and how often a feed is refreshed (or not, in which case it is archived). This PR removes the wording *Archived* from the *visibility* parameter, since this is not what it does.
-rw-r--r--app/Controllers/entryController.php2
-rw-r--r--app/Controllers/indexController.php4
-rw-r--r--app/Models/Context.php4
-rw-r--r--app/Models/EntryDAO.php8
-rw-r--r--app/Models/Feed.php2
-rw-r--r--app/Models/UserQuery.php4
-rw-r--r--app/i18n/cs/sub.php2
-rw-r--r--app/i18n/de/sub.php2
-rw-r--r--app/i18n/el/sub.php2
-rw-r--r--app/i18n/en-us/sub.php2
-rw-r--r--app/i18n/en/sub.php2
-rw-r--r--app/i18n/es/sub.php2
-rw-r--r--app/i18n/fa/sub.php2
-rw-r--r--app/i18n/fi/sub.php2
-rw-r--r--app/i18n/fr/sub.php2
-rw-r--r--app/i18n/he/sub.php2
-rw-r--r--app/i18n/hu/sub.php2
-rw-r--r--app/i18n/id/sub.php2
-rw-r--r--app/i18n/it/sub.php2
-rw-r--r--app/i18n/ja/sub.php2
-rw-r--r--app/i18n/ko/sub.php2
-rw-r--r--app/i18n/lv/sub.php2
-rw-r--r--app/i18n/nl/sub.php2
-rw-r--r--app/i18n/oc/sub.php2
-rw-r--r--app/i18n/pl/sub.php2
-rw-r--r--app/i18n/pt-br/sub.php2
-rw-r--r--app/i18n/pt-pt/sub.php2
-rw-r--r--app/i18n/ru/sub.php2
-rw-r--r--app/i18n/sk/sub.php2
-rw-r--r--app/i18n/tr/sub.php2
-rw-r--r--app/i18n/uk/sub.php2
-rw-r--r--app/i18n/zh-cn/sub.php2
-rw-r--r--app/i18n/zh-tw/sub.php2
-rw-r--r--app/views/helpers/feed/update.phtml4
34 files changed, 42 insertions, 40 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 8cabce82d..0cf25e24d 100644
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -101,7 +101,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
break;
case 'Z':
- $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_ARCHIVED, FreshRSS_Feed::PRIORITY_IMPORTANT,
+ $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_HIDDEN, FreshRSS_Feed::PRIORITY_IMPORTANT,
FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
break;
case 'i':
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 59d4976ba..736cc8258 100644
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -222,8 +222,8 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
switch ($type) {
case 'a': // All PRIORITY_MAIN_STREAM
- case 'A': // All except PRIORITY_ARCHIVED
- case 'Z': // All including PRIORITY_ARCHIVED
+ case 'A': // All except PRIORITY_HIDDEN
+ case 'Z': // All including PRIORITY_HIDDEN
$this->view->categories = FreshRSS_Context::categories();
break;
case 'c':
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 76a51c7ef..efe36f0e2 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -416,12 +416,12 @@ final class FreshRSS_Context {
self::$description = FreshRSS_Context::systemConf()->meta_description;
self::$get_unread = self::$total_unread;
break;
- case 'A': // All except PRIORITY_ARCHIVED
+ case 'A': // All except PRIORITY_HIDDEN
self::$current_get['A'] = true;
self::$description = FreshRSS_Context::systemConf()->meta_description;
self::$get_unread = self::$total_unread;
break;
- case 'Z': // All including PRIORITY_ARCHIVED
+ case 'Z': // All including PRIORITY_HIDDEN
self::$current_get['Z'] = true;
self::$name = _t('index.feed.title');
self::$description = FreshRSS_Context::systemConf()->meta_description;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index cd7bcd2ff..ec3bde412 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1339,17 +1339,17 @@ SQL;
case 'a': // All PRIORITY_MAIN_STREAM
$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_MAIN_STREAM . ' ';
break;
- case 'A': // All except PRIORITY_ARCHIVED
+ case 'A': // All except PRIORITY_HIDDEN
$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_CATEGORY . ' ';
break;
- case 'Z': // All including PRIORITY_ARCHIVED
- $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' ';
+ case 'Z': // All including PRIORITY_HIDDEN
+ $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_HIDDEN . ' ';
break;
case 'i': // Priority important feeds
$where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_IMPORTANT . ' ';
break;
case 's': //Starred. Deprecated: use $state instead
- $where .= 'f.priority > ' . FreshRSS_Feed::PRIORITY_ARCHIVED . ' ';
+ $where .= 'f.priority > ' . FreshRSS_Feed::PRIORITY_HIDDEN . ' ';
$where .= 'AND e.is_favorite=1 ';
break;
case 'S': //Starred
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f85db0f2f..e368a6807 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -38,6 +38,8 @@ class FreshRSS_Feed extends Minz_Model {
public const PRIORITY_IMPORTANT = 20;
public const PRIORITY_MAIN_STREAM = 10;
public const PRIORITY_CATEGORY = 0;
+ public const PRIORITY_HIDDEN = -10;
+ /** @deprecated use PRIORITY_HIDDEN instead */
public const PRIORITY_ARCHIVED = -10;
public const TTL_DEFAULT = 0;
diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php
index c78eeccd3..077ae0b90 100644
--- a/app/Models/UserQuery.php
+++ b/app/Models/UserQuery.php
@@ -140,10 +140,10 @@ class FreshRSS_UserQuery {
case 'a': // All PRIORITY_MAIN_STREAM
$this->get_type = 'all';
break;
- case 'A': // All except PRIORITY_ARCHIVED
+ case 'A': // All except PRIORITY_HIDDEN
$this->get_type = 'A';
break;
- case 'Z': // All including PRIORITY_ARCHIVED
+ case 'Z': // All including PRIORITY_HIDDEN
$this->get_type = 'Z';
break;
case 'c':
diff --git a/app/i18n/cs/sub.php b/app/i18n/cs/sub.php
index 30d3e3b2a..3552fa830 100644
--- a/app/i18n/cs/sub.php
+++ b/app/i18n/cs/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Viditelnost',
- 'archived' => 'Nezobrazovat (archivováno)',
'category' => 'Zobrazit v jeho kategorii',
+ 'hidden' => 'Nezobrazovat',
'important' => 'Zobrazit v důležitých kanálech',
'main_stream' => 'Zobrazit ve hlavním kanálu',
),
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 8e49e5a36..0e4fdf3d5 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Sichtbarkeit',
- 'archived' => 'Nicht anzeigen (archiviert)',
'category' => 'Zeige in eigener Kategorie',
+ 'hidden' => 'Nicht anzeigen',
'important' => 'Zeige in "Wichtige Feeds"',
'main_stream' => 'In Haupt-Feeds zeigen',
),
diff --git a/app/i18n/el/sub.php b/app/i18n/el/sub.php
index 1075d7bd8..89d770ecc 100644
--- a/app/i18n/el/sub.php
+++ b/app/i18n/el/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibility', // TODO
- 'archived' => 'Do not show (archived)', // TODO
'category' => 'Show in its category', // TODO
+ 'hidden' => 'Do not show', // TODO
'important' => 'Show in important feeds', // TODO
'main_stream' => 'Show in main stream', // TODO
),
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index 3c69d3fc9..4a4a0f487 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // IGNORE
'priority' => array(
'_' => 'Visibility', // IGNORE
- 'archived' => 'Do not show (archived)', // IGNORE
'category' => 'Show in its category', // IGNORE
+ 'hidden' => 'Do not show', // IGNORE
'important' => 'Show in important feeds', // IGNORE
'main_stream' => 'Show in main stream', // IGNORE
),
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index d08bdd55c..1d37ea8e2 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval',
'priority' => array(
'_' => 'Visibility',
- 'archived' => 'Do not show (archived)',
'category' => 'Show in its category',
+ 'hidden' => 'Do not show',
'important' => 'Show in important feeds',
'main_stream' => 'Show in main stream',
),
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index 93e71828b..e9728ce77 100644
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibilidad',
- 'archived' => 'No mostrar (archivado)',
'category' => 'Mostrar en su categoría',
+ 'hidden' => 'No mostrar',
'important' => 'Mostrar en fuentes importantes',
'main_stream' => 'Mostrar en salida principal',
),
diff --git a/app/i18n/fa/sub.php b/app/i18n/fa/sub.php
index bcdd39e62..852548f0c 100644
--- a/app/i18n/fa/sub.php
+++ b/app/i18n/fa/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'شرایط بازیابی محتوا',
'priority' => array(
'_' => ' دید',
- 'archived' => ' نشان داده نشود (بایگانی شده)',
'category' => ' نمایش در دسته بندی خود',
+ 'hidden' => 'نشان ندهید.',
'important' => 'نمایش در فیدهای مهم',
'main_stream' => ' نمایش در جریان اصلی',
),
diff --git a/app/i18n/fi/sub.php b/app/i18n/fi/sub.php
index adc7765f1..ca95faed9 100644
--- a/app/i18n/fi/sub.php
+++ b/app/i18n/fi/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Näkyvyys',
- 'archived' => 'Älä näytä (arkistoitu)',
'category' => 'Näytä luokassaan',
+ 'hidden' => 'Älä näytä',
'important' => 'Näytä tärkeissä syötteissä',
'main_stream' => 'Näytä pääsyötevirrassa',
),
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index e2d196ee9..f821bfa85 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions pour la récupération de contenu',
'priority' => array(
'_' => 'Visibilité',
- 'archived' => 'Ne pas afficher (archivé)',
'category' => 'Afficher dans sa catégorie',
+ 'hidden' => 'Ne pas afficher',
'important' => 'Afficher dans les flux importants',
'main_stream' => 'Afficher dans les flux principaux',
),
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index 1b7019e67..e09a09780 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibility', // TODO
- 'archived' => 'Do not show (archived)', // TODO
'category' => 'Show in its category', // TODO
+ 'hidden' => 'Do not show', // TODO
'important' => 'Show in important feeds', // TODO
'main_stream' => 'הצגה בזרם המרכזי',
),
diff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.php
index 842c731b4..eb143711f 100644
--- a/app/i18n/hu/sub.php
+++ b/app/i18n/hu/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Tartalom beszerzési feltételek',
'priority' => array(
'_' => 'Láthatóság',
- 'archived' => 'Ne jelenjen meg (archivált)',
'category' => 'Jelenjen meg a saját kategóriájában',
+ 'hidden' => 'Ne jelenjen meg',
'important' => 'Megjelenítés a fontos hírforrásokban',
'main_stream' => 'Megjelenítés a Minden cikk között',
),
diff --git a/app/i18n/id/sub.php b/app/i18n/id/sub.php
index c27814570..2e146d118 100644
--- a/app/i18n/id/sub.php
+++ b/app/i18n/id/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Kondisi untuk pengambilan konten',
'priority' => array(
'_' => 'Ketampakan',
- 'archived' => 'Jangan tampilkan (diarsipkan)',
'category' => 'Tampilkan hanya di kategorinya saja',
+ 'hidden' => 'Jangan tampilkan',
'important' => 'Tampilkan di umpan penting',
'main_stream' => 'Tampilkan di bagian utama',
),
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 3a4451271..34e2e5866 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Condizioni per il recupero dei contenuti',
'priority' => array(
'_' => 'Visibilità',
- 'archived' => 'Non mostrare (archiviato)',
'category' => 'Mostra nella sua categoria',
+ 'hidden' => 'Non mostrare',
'important' => 'Mostra nei feed importanti',
'main_stream' => 'Mostra in homepage',
),
diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php
index 9a6b41e8a..6dc2f6eca 100644
--- a/app/i18n/ja/sub.php
+++ b/app/i18n/ja/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'コンテンツを取得する条件',
'priority' => array(
'_' => '表示する場所',
- 'archived' => '非表示にする(アーカイブ)',
'category' => 'カテゴリで表示する',
+ 'hidden' => '非表示にする',
'important' => '重要なフィードに表示する',
'main_stream' => 'メインストリームで表示する',
),
diff --git a/app/i18n/ko/sub.php b/app/i18n/ko/sub.php
index b297a6fc5..50ea6bd91 100644
--- a/app/i18n/ko/sub.php
+++ b/app/i18n/ko/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => '표시',
- 'archived' => '표시하지 않음 (보관됨)',
'category' => '피드가 속한 카테고리에만 표시하기',
+ 'hidden' => '표시하지 않음',
'important' => '중요 피드에서 표시',
'main_stream' => '메인 스트림에 표시하기',
),
diff --git a/app/i18n/lv/sub.php b/app/i18n/lv/sub.php
index 22406b1fb..0690f5d89 100644
--- a/app/i18n/lv/sub.php
+++ b/app/i18n/lv/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Prioritāte',
- 'archived' => 'Nerādīt (arhivēts)',
'category' => 'Rādīt kategorijā',
+ 'hidden' => 'Nerādīt',
'important' => 'Show in important feeds', // TODO
'main_stream' => 'Rādīt galvenajā plūsmā',
),
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index ec7b5bf30..9c8c68d1e 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Voorwaarden voor inhoudsophaling',
'priority' => array(
'_' => 'Zichtbaarheid',
- 'archived' => 'Niet weergeven (gearchiveerd)',
'category' => 'Toon in categorie',
+ 'hidden' => 'Niet weergeven',
'important' => 'In belangrijke feeds tonen',
'main_stream' => 'Zichtbaar in het overzicht',
),
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index 83e5687ce..5c5184d1f 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibilitat',
- 'archived' => 'Mostrar pas (archivat)',
'category' => 'Mostar dins sa categoria',
+ 'hidden' => 'Mostrar pas',
'important' => 'Show in important feeds', // TODO
'main_stream' => 'Mostar al flux màger',
),
diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php
index d64878373..82f49690c 100644
--- a/app/i18n/pl/sub.php
+++ b/app/i18n/pl/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Warunki dla pobrania zawartości',
'priority' => array(
'_' => 'Widoczność',
- 'archived' => 'Nie pokazuj (zarchiwizowany)',
'category' => 'Pokaż w kategorii kanału',
+ 'hidden' => 'Nie pokazuj',
'important' => 'Pokaż w ważnych kanałach',
'main_stream' => 'Pokaż w kanale głównym',
),
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index 6d968bf22..57b02abf6 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibilidade',
- 'archived' => 'Não exibir (arquivado)',
'category' => 'Mostrar na sua categoria',
+ 'hidden' => 'Não exibir',
'important' => 'Mostrar feeds importantes',
'main_stream' => 'Mostrar na tela principal',
),
diff --git a/app/i18n/pt-pt/sub.php b/app/i18n/pt-pt/sub.php
index 58a58e443..c4bfa5b6a 100644
--- a/app/i18n/pt-pt/sub.php
+++ b/app/i18n/pt-pt/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Visibilidade',
- 'archived' => 'Não exibir (arquivado)',
'category' => 'Mostrar na sua categoria',
+ 'hidden' => 'Não exibir',
'important' => 'Mostrar feeds importantes',
'main_stream' => 'Mostrar na tela principal',
),
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index cea97dff3..91f27f2bd 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Видимость',
- 'archived' => 'Не показывать (архивировано)',
'category' => 'Показывать в категории ленты',
+ 'hidden' => 'Не показывать',
'important' => 'Показывать в важных лентах',
'main_stream' => 'Показывать в основном потоке',
),
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index 45233493f..254a9d40b 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => 'Viditeľnosť',
- 'archived' => 'Nezobrazovať (archivované)',
'category' => 'Zobraziť vo svojej kategórii',
+ 'hidden' => 'Nezobrazovať',
'important' => 'Zobraziť v dôležitých kanáloch',
'main_stream' => 'Zobraziť v prehľade kanálov',
),
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 3062ac271..ed17bef59 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'İçerik alma koşulları',
'priority' => array(
'_' => 'Görünürlük',
- 'archived' => 'Gösterilmesin (arşivlenmiş)',
'category' => 'Kategorisinde göster',
+ 'hidden' => 'Gösterilmesin',
'important' => 'Önemli beslemelerde göster',
'main_stream' => 'Ana akışta göster',
),
diff --git a/app/i18n/uk/sub.php b/app/i18n/uk/sub.php
index 7f1854f98..7c5af0d2c 100644
--- a/app/i18n/uk/sub.php
+++ b/app/i18n/uk/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Умови завантаження тексту',
'priority' => array(
'_' => 'Видимість',
- 'archived' => 'Не показувати (архівовано)',
'category' => 'Показати в категорії',
+ 'hidden' => 'Не показувати',
'important' => 'Показати у важливих стрічках',
'main_stream' => 'Показати в головному потоці',
),
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 6b32574db..0647f5710 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => '可见性',
- 'archived' => '不显示(归档)',
'category' => '在分类中显示',
+ 'hidden' => '不显示',
'important' => '在“重要的订阅”中显示',
'main_stream' => '在首页中显示',
),
diff --git a/app/i18n/zh-tw/sub.php b/app/i18n/zh-tw/sub.php
index 3079dac67..2c5f3a3bd 100644
--- a/app/i18n/zh-tw/sub.php
+++ b/app/i18n/zh-tw/sub.php
@@ -209,8 +209,8 @@ return array(
'path_entries_conditions' => 'Conditions for content retrieval', // TODO
'priority' => array(
'_' => '可見性',
- 'archived' => '不顯示(歸檔)',
'category' => '在分類中顯示',
+ 'hidden' => '不顯示',
'important' => '顯示在重要的源',
'main_stream' => '在首頁中顯示',
),
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index e95400953..7c38487f5 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -121,8 +121,8 @@
FreshRSS_Feed::PRIORITY_MAIN_STREAM === $this->feed->priority() ? 'selected="selected"' : '' ?>><?= _t('sub.feed.priority.main_stream') ?></option>
<option value="<?= FreshRSS_Feed::PRIORITY_CATEGORY ?>" <?=
FreshRSS_Feed::PRIORITY_CATEGORY === $this->feed->priority() ? 'selected="selected"' : '' ?>><?= _t('sub.feed.priority.category') ?></option>
- <option value="<?= FreshRSS_Feed::PRIORITY_ARCHIVED ?>" <?=
- FreshRSS_Feed::PRIORITY_ARCHIVED === $this->feed->priority() ? 'selected="selected"' : '' ?>><?= _t('sub.feed.priority.archived') ?></option>
+ <option value="<?= FreshRSS_Feed::PRIORITY_HIDDEN ?>" <?=
+ FreshRSS_Feed::PRIORITY_HIDDEN === $this->feed->priority() ? 'selected="selected"' : '' ?>><?= _t('sub.feed.priority.hidden') ?></option>
</select>
<?= _i('important') ?>
</div>