#7352 added locale code to install form

pkp · Mar 9, 2023 · bfd5e01 · bfd5e01
1 parent 429db4a
commit bfd5e01
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/classes/install/form/InstallForm.php b/classes/install/form/InstallForm.php
@@ -24,7 +24,6 @@
 use DateTimeZone;
 use PKP\core\Core;
 use PKP\core\PKPApplication;
-
 use PKP\core\PKPString;
 use PKP\facades\Locale;
 use PKP\i18n\LocaleMetadata;
@@ -56,8 +55,9 @@ public function __construct($request)
     {
         parent::__construct($request, 'install/install.tpl');
 
-        $this->supportedLocales = array_map(fn (LocaleMetadata $locale) => $locale->getDisplayName(null, true), Locale::getLocales());
-        $this->localesComplete = array_map(fn (LocaleMetadata $locale) => $locale->isComplete(), Locale::getLocales());
+        $allLocales = Locale::getLocales();
+        $this->supportedLocales = Locale::getFormattedDisplayNames(null, $allLocales, LocaleMetadata::LANGUAGE_LOCALE_WITHOUT, false);
+        $this->localesComplete = array_map(fn (LocaleMetadata $locale) => $locale->isComplete(), $allLocales);
 
         foreach ($this->supportedDatabaseDrivers as $driver => [$module]) {
             if (!extension_loaded($module)) {
@@ -113,7 +113,7 @@ public function display($request = null, $template = null)
             'supportsMBString' => PKPString::hasMBString() ? __('common.yes') : __('common.no'),
             'phpIsSupportedVersion' => version_compare(PKPApplication::PHP_REQUIRED_VERSION, PHP_VERSION) != 1,
             'xslEnabled' => XSLTransformer::checkSupport(),
-            'xslRequired' => REQUIRES_XSL,
+            'xslRequired' => Application::REQUIRES_XSL,
             'phpRequiredVersion' => PKPApplication::PHP_REQUIRED_VERSION,
             'phpVersion' => PHP_VERSION,
         ]);