Browse Source

Add a default language constant (#7933)

This replace the use of `en` through out the code.
Alexis Degrugillier 7 months ago
parent
commit
6ad625812a

+ 1 - 1
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;
 			}

+ 1 - 1
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

+ 1 - 1
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'));

+ 1 - 1
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;
 

+ 1 - 1
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];
 	}
 }

+ 4 - 2
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;
 	}
 
 	/**