4
0
Эх сурвалжийг харах

Default dark mode to auto (#5582)

* Default dark mode to auto
Set default dark mode to automatic instead of disabled.
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/4843

* Selected themes

* For compatible themes only
Alexandre Alapetite 1 жил өмнө
parent
commit
e98c57841b

+ 2 - 2
app/Controllers/configureController.php

@@ -27,7 +27,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
 	 * The options available on the page are:
 	 *   - language (default: en)
 	 *   - theme (default: Origin)
-	 *   - darkMode (default: no)
+	 *   - darkMode (default: auto)
 	 *   - content width (default: thin)
 	 *   - display of read action in header
 	 *   - display of favorite action in header
@@ -48,7 +48,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
 			FreshRSS_Context::userConf()->language = Minz_Request::paramString('language') ?: 'en';
 			FreshRSS_Context::userConf()->timezone = Minz_Request::paramString('timezone');
 			FreshRSS_Context::userConf()->theme = Minz_Request::paramString('theme') ?: FreshRSS_Themes::$defaultTheme;
-			FreshRSS_Context::userConf()->darkMode = Minz_Request::paramString('darkMode') ?: 'no';
+			FreshRSS_Context::userConf()->darkMode = Minz_Request::paramString('darkMode') ?: 'auto';
 			FreshRSS_Context::userConf()->content_width = Minz_Request::paramString('content_width') ?: 'thin';
 			FreshRSS_Context::userConf()->topline_read = Minz_Request::paramBoolean('topline_read');
 			FreshRSS_Context::userConf()->topline_favorite = Minz_Request::paramBoolean('topline_favorite');

+ 2 - 1
app/i18n/cs/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Zobrazení',
 		'darkMode' => array(
-			'_' => 'Automatický tmavý režim (beta)',
+			'_' => 'Automatický tmavý režim',
 			'auto' => 'Automatický',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Ne',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/de/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Anzeige',
 		'darkMode' => array(
-			'_' => 'Automatischer Dunkel-Modus (Beta)',
+			'_' => 'Automatischer Dunkel-Modus',
 			'auto' => 'Automatisch',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Nein',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/el/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Display',	// TODO
 		'darkMode' => array(
-			'_' => 'Automatic dark mode (beta)',	// TODO
+			'_' => 'Automatic dark mode',	// TODO
 			'auto' => 'Auto',	// TODO
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'No',	// TODO
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/en-us/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Display',	// IGNORE
 		'darkMode' => array(
-			'_' => 'Automatic dark mode (beta)',	// IGNORE
+			'_' => 'Automatic dark mode',	// IGNORE
 			'auto' => 'Auto',	// IGNORE
+			'help' => 'For compatible themes only',	// IGNORE
 			'no' => 'No',	// IGNORE
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/en/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Display',
 		'darkMode' => array(
-			'_' => 'Automatic dark mode (beta)',
+			'_' => 'Automatic dark mode',
 			'auto' => 'Auto',
+			'help' => 'For compatible themes only',
 			'no' => 'No',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/es/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Visualización',
 		'darkMode' => array(
-			'_' => 'Modo oscuro automatico (beta)',
+			'_' => 'Modo oscuro automatico',
 			'auto' => 'Automatico',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'No',	// IGNORE
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/fa/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => ' نمایش',
 		'darkMode' => array(
-			'_' => ' حالت تاریک خودکار (بتا)',
+			'_' => ' حالت تاریک خودکار',
 			'auto' => ' خودکار',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => ' شماره',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/fr/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Affichage',
 		'darkMode' => array(
-			'_' => 'Mode sombre automatique (bêta)',
+			'_' => 'Mode sombre automatique',
 			'auto' => 'Auto',	// IGNORE
+			'help' => 'Seulement pour les thèmes compatibles',
 			'no' => 'Non',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/he/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'תצוגה',
 		'darkMode' => array(
-			'_' => 'Automatic dark mode (beta)',	// TODO
+			'_' => 'Automatic dark mode',	// TODO
 			'auto' => 'Auto',	// TODO
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'No',	// TODO
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/hu/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Megjelenítés',
 		'darkMode' => array(
-			'_' => 'Automatikus sötét mód (béta)',
+			'_' => 'Automatikus sötét mód',
 			'auto' => 'Automatikus',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Nem',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/id/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Tampilan',
 		'darkMode' => array(
-			'_' => 'Mode gelap otomatis (beta)',
+			'_' => 'Mode gelap otomatis',
 			'auto' => 'Otomatis',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Tidak',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/it/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Visualizzazione',
 		'darkMode' => array(
-			'_' => 'Modalità scura automatica (beta)',
+			'_' => 'Modalità scura automatica',
 			'auto' => 'Auto',	// IGNORE
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'No',	// IGNORE
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/ja/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => '表示',
 		'darkMode' => array(
-			'_' => '自動ダークモード (beta)',
+			'_' => '自動ダークモード',
 			'auto' => '自動',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => '無効',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/ko/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => '표시',
 		'darkMode' => array(
-			'_' => '자동 다크 모드 (베타)',
+			'_' => '자동 다크 모드',
 			'auto' => '자동',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => '끄기',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/lv/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Ekrāns',
 		'darkMode' => array(
-			'_' => 'Automātiskais tumšais režīms (beta versija)',
+			'_' => 'Automātiskais tumšais režīms',
 			'auto' => 'Auto',	// IGNORE
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Nē',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/nl/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Opmaak',
 		'darkMode' => array(
-			'_' => 'Automatische dark mode (beta)',
+			'_' => 'Automatische dark mode',
 			'auto' => 'Auto',	// IGNORE
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Nee',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/oc/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Afichatge',
 		'darkMode' => array(
-			'_' => 'Automatic dark mode (beta)',	// TODO
+			'_' => 'Automatic dark mode',	// TODO
 			'auto' => 'Auto',	// TODO
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'No',	// TODO
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/pl/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Wyświetlanie',
 		'darkMode' => array(
-			'_' => 'Tryb ciemny (beta)',
+			'_' => 'Tryb ciemny',
 			'auto' => 'Automatyczny',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Wyłączony',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/pt-br/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Exibição',
 		'darkMode' => array(
-			'_' => 'Modo noturno automático (beta)',
+			'_' => 'Modo noturno automático',
 			'auto' => 'Automático',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Não',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/ru/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Отображение',
 		'darkMode' => array(
-			'_' => 'Автоматический темный режим (beta)',
+			'_' => 'Автоматический темный режим',
 			'auto' => 'Авто',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Нет',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/sk/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Zobrazenie',
 		'darkMode' => array(
-			'_' => 'Automatický tmavý režim (beta)',
+			'_' => 'Automatický tmavý režim',
 			'auto' => 'Automaticky',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Nie',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/tr/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => 'Görünüm',
 		'darkMode' => array(
-			'_' => 'Otomatik karanlık mod (beta)',
+			'_' => 'Otomatik karanlık mod',
 			'auto' => 'Otomatik',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => 'Kapalı',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/zh-cn/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => '显示',
 		'darkMode' => array(
-			'_' => '自动黑暗模式(测试版)',
+			'_' => '自动黑暗模式',
 			'auto' => '启动',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => '关闭',
 		),
 		'icon' => array(

+ 2 - 1
app/i18n/zh-tw/conf.php

@@ -33,8 +33,9 @@ return array(
 	'display' => array(
 		'_' => '顯示',
 		'darkMode' => array(
-			'_' => '自動黑暗模式(beta)',
+			'_' => '自動黑暗模式',
 			'auto' => '自動',
+			'help' => 'For compatible themes only',	// TODO
 			'no' => '否',
 		),
 		'icon' => array(

+ 4 - 0
app/views/configure/display.phtml

@@ -84,6 +84,9 @@
 									<?php } ?>
 									<?= $theme['description'] ?>
 								</div>
+								<?php if (!empty($theme['theme-color']['dark'])) { ?>
+									<div class="darkMode">✔ <?= _t('conf.display.darkMode') ?></div>
+								<?php } ?>
 								<div class="page-number"><?= sprintf('%d/%d', $i, $slides) ?></div>
 							</div>
 						</li>
@@ -113,6 +116,7 @@
 					<option value="no"<?= FreshRSS_Context::userConf()->darkMode === 'no' ? ' selected' : '' ?>><?= _t('conf.display.darkMode.no') ?></option>
 					<option value="auto"<?= FreshRSS_Context::userConf()->darkMode === 'auto' ? ' selected' : '' ?>><?= _t('conf.display.darkMode.auto') ?></option>
 				</select>
+				<span class="help"><?= _i('help') ?> <?= _t('conf.display.darkMode.help') ?></span>
 			</div>
 		</div>
 

+ 1 - 1
config-user.default.php

@@ -66,7 +66,7 @@ return array (
 	),
 	'filters' => [],
 	'theme' => 'Origine',
-	'darkMode' => 'no',
+	'darkMode' => 'auto',
 	'content_width' => 'thin',
 	'shortcuts' => array (
 		'actualize' => 'q',