diff options
| -rw-r--r-- | app/Controllers/configureController.php | 2 | ||||
| -rw-r--r-- | app/Controllers/userController.php | 2 | ||||
| -rw-r--r-- | app/install.php | 2 | ||||
| -rw-r--r-- | cli/_cli.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Request.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Translate.php | 6 |
6 files changed, 9 insertions, 7 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index e69b46323..993982184 100644 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -45,7 +45,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { */ public function displayAction(): void { if (Minz_Request::isPost()) { - $language = Minz_Request::paramString('language') ?: 'en'; + $language = Minz_Request::paramString('language') ?: Minz_Translate::DEFAULT_LANGUAGE; if (Minz_Translate::exists($language)) { FreshRSS_Context::userConf()->language = $language; } diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 17879f3d0..a06ffab22 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -307,7 +307,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($ok) { $languages = Minz_Translate::availableLanguages(); if (empty($userConfig['language']) || !in_array($userConfig['language'], $languages, true)) { - $userConfig['language'] = 'en'; + $userConfig['language'] = Minz_Translate::DEFAULT_LANGUAGE; } $ok &= !in_array(strtoupper($new_user_name), array_map('strtoupper', listUsers()), true); //Not an existing user, case-insensitive diff --git a/app/install.php b/app/install.php index 6c7647492..3d7f88913 100644 --- a/app/install.php +++ b/app/install.php @@ -35,7 +35,7 @@ function initTranslate(): void { } if (!in_array(Minz_Session::paramString('language'), $available_languages, true)) { - Minz_Session::_param('language', 'en'); + Minz_Session::_param('language', Minz_Translate::DEFAULT_LANGUAGE); } Minz_Translate::reset(Minz_Session::paramString('language')); diff --git a/cli/_cli.php b/cli/_cli.php index fc7c206f5..e3b0c2304 100644 --- a/cli/_cli.php +++ b/cli/_cli.php @@ -16,7 +16,7 @@ require_once __DIR__ . '/CliOptionsParser.php'; Minz_Session::init('FreshRSS', true); FreshRSS_Context::initSystem(); Minz_ExtensionManager::init(); -Minz_Translate::init('en'); +Minz_Translate::init(Minz_Translate::DEFAULT_LANGUAGE); FreshRSS_Context::$isCli = true; diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index 2f76b9aa8..a41ddb0a6 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -515,6 +515,6 @@ class Minz_Request { if (preg_match_all('/(^|,)\s*(?P<lang>[^;,]+)/', $acceptLanguage, $matches) > 0) { return $matches['lang']; } - return ['en']; + return [Minz_Translate::DEFAULT_LANGUAGE]; } } diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php index 17290574c..c824186fa 100644 --- a/lib/Minz/Translate.php +++ b/lib/Minz/Translate.php @@ -11,6 +11,8 @@ declare(strict_types=1); * It uses files in `./app/i18n/` */ class Minz_Translate { + public const DEFAULT_LANGUAGE = 'en'; + /** * $path_list is the list of registered base path to search translations. * @var array<string> @@ -99,7 +101,7 @@ class Minz_Translate { */ public static function getLanguage(?string $user, array $preferred, ?string $default): string { if (null !== $user) { - if (!self::exists($user)) return 'en'; + if (!self::exists($user)) return self::DEFAULT_LANGUAGE; return $user; } @@ -111,7 +113,7 @@ class Minz_Translate { } } - return $default == null ? 'en' : $default; + return $default ?: self::DEFAULT_LANGUAGE; } /** |