From ace3edb9e02ce9c23e61899c7a8821cadb0f02de Mon Sep 17 00:00:00 2001 From: Dimitris Efstathiou Date: Wed, 8 Feb 2023 09:54:33 +0200 Subject: [PATCH] pkp/pkp-lib#8598 Code Base locale changes (cherry picked from commit 2b6427ce259e9e7688eff55f0de5214394a4c618) --- classes/cliTool/InstallTool.php | 2 +- classes/i18n/interfaces/LocaleInterface.php | 2 +- classes/install/Installer.php | 2 +- classes/migration/install/CommonMigration.php | 4 ++-- tests/config/config.TEMPLATE.mysql.inc.php | 2 +- tools/buildSwagger.php | 2 +- xml/schema/common.xml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/cliTool/InstallTool.php b/classes/cliTool/InstallTool.php index 216b50033ff..5f6d7ac908f 100644 --- a/classes/cliTool/InstallTool.php +++ b/classes/cliTool/InstallTool.php @@ -84,7 +84,7 @@ public function readParams() // Locale Settings $this->printTitle('installer.localeSettings'); - $this->readParamOptions('locale', 'locale.primary', $installForm->supportedLocales, 'en_US'); + $this->readParamOptions('locale', 'locale.primary', $installForm->supportedLocales, 'en'); $this->readParamOptions('additionalLocales', 'installer.additionalLocales', $installForm->supportedLocales, '', true); // File Settings diff --git a/classes/i18n/interfaces/LocaleInterface.php b/classes/i18n/interfaces/LocaleInterface.php index 1459ac18772..257f466608a 100644 --- a/classes/i18n/interfaces/LocaleInterface.php +++ b/classes/i18n/interfaces/LocaleInterface.php @@ -32,7 +32,7 @@ interface LocaleInterface extends \Illuminate\Contracts\Translation\Translator { /** Keeps the default locale of the application */ - public const DEFAULT_LOCALE = 'en_US'; + public const DEFAULT_LOCALE = 'en'; /** Regular expression to validate and extract pieces of a locale, variants can be composed of five to eight letters, or of four characters starting with a digit */ public const LOCALE_EXPRESSION = '/^(?P[a-z]{2})(?:_(?P[A-Z]{2}))?(?:@(?P