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.

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':

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':

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;

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

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;

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':

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',
 		),

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',
 		),

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
 		),

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
 		),

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',
 		),

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',
 		),

app/i18n/fa/sub.php

@@ -209,8 +209,8 @@ return array(
 		'path_entries_conditions' => 'شرایط بازیابی محتوا',
 		'priority' => array(
 			'_' => ' دید',
-			'archived' => ' نشان داده نشود (بایگانی شده)',
 			'category' => ' نمایش در دسته بندی خود',
+			'hidden' => 'نشان ندهید.',
 			'important' => 'نمایش در فیدهای مهم',
 			'main_stream' => ' نمایش در جریان اصلی',
 		),

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',
 		),

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',
 		),

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' => 'הצגה בזרם המרכזי',
 		),

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',
 		),

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',
 		),

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',
 		),

app/i18n/ja/sub.php

@@ -209,8 +209,8 @@ return array(
 		'path_entries_conditions' => 'コンテンツを取得する条件',
 		'priority' => array(
 			'_' => '表示する場所',
-			'archived' => '非表示にする(アーカイブ)',
 			'category' => 'カテゴリで表示する',
+			'hidden' => '非表示にする',
 			'important' => '重要なフィードに表示する',
 			'main_stream' => 'メインストリームで表示する',
 		),

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' => '메인 스트림에 표시하기',
 		),

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ā',
 		),

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',
 		),

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',
 		),

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',
 		),

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',
 		),

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',
 		),

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' => 'Показывать в основном потоке',
 		),

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',
 		),

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',
 		),

app/i18n/uk/sub.php

@@ -209,8 +209,8 @@ return array(
 		'path_entries_conditions' => 'Умови завантаження тексту',
 		'priority' => array(
 			'_' => 'Видимість',
-			'archived' => 'Не показувати (архівовано)',
 			'category' => 'Показати в категорії',
+			'hidden' => 'Не показувати',
 			'important' => 'Показати у важливих стрічках',
 			'main_stream' => 'Показати в головному потоці',
 		),

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' => '在首页中显示',
 		),

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' => '在首頁中顯示',
 		),

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>