pkp/pkp-lib#7352 Port installation form tweak to OPS

pkp · Mar 9, 2023 · b74ffea · b74ffea
1 parent b1251b4
commit b74ffea
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/classes/template/TemplateManager.php b/classes/template/TemplateManager.php
@@ -22,6 +22,8 @@
 use PKP\context\Context;
 use PKP\core\PKPApplication;
 use PKP\db\DAORegistry;
+use PKP\facades\Locale;
+use PKP\i18n\LocaleMetadata;
 use PKP\session\SessionManager;
 use PKP\site\Site;
 use PKP\template\PKPTemplateManager;
@@ -79,7 +81,7 @@ public function initialize($request)
                     'siteTitle' => $context->getLocalizedName(),
                     'publicFilesDir' => $request->getBaseUrl() . '/' . $publicFileManager->getContextFilesPath($context->getId()),
                     'primaryLocale' => $context->getPrimaryLocale(),
-                    'supportedLocales' => $context->getSupportedLocaleNames(),
+                    'supportedLocales' => $context->getSupportedLocaleNames(LocaleMetadata::LANGUAGE_LOCALE_ONLY),
                     'numPageLinks' => $context->getData('numPageLinks'),
                     'itemsPerPage' => $context->getData('itemsPerPage'),
                     'enableAnnouncements' => $context->getData('enableAnnouncements'),
@@ -111,7 +113,11 @@ public function initialize($request)
                     'disableUserReg' => empty($contextsForRegistration),
                     'siteTitle' => $site->getLocalizedTitle(),
                     'primaryLocale' => $site->getPrimaryLocale(),
-                    'supportedLocales' => $site->getSupportedLocalenames(),
+                    'supportedLocales' => Locale::getFormattedDisplayNames(
+                        $site->getSupportedLocales(),
+                        Locale::getLocales(),
+                        LocaleMetadata::LANGUAGE_LOCALE_ONLY
+                    ),
                     'pageFooter' => $site->getLocalizedData('pageFooter'),
                 ]);
             }