#7352 Locale::getFormattedDisplayNames update to deduce locale code w…

…ith @ char
pkp · Mar 9, 2023 · 429db4a · 429db4a
1 parent 0446b86
commit 429db4a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/i18n/Locale.php b/classes/i18n/Locale.php
@@ -384,13 +384,13 @@ public function getFormattedDisplayNames(array $filterByLocales = null, array $l
 
         $localeCodesCount = array_count_values(
             collect(array_keys($filterByLocales ?? $locales))
-                ->map(fn(string $value) => explode('_', $value)[0])
+                ->map(fn(string $value) => trim(explode('@', explode('_', $value)[0])[0]))
                 ->toArray()
         );
 
         return collect($locales)
             ->map(function(LocaleMetadata $locale, string $localeKey) use ($localeCodesCount, $langLocaleStatus, $omitLocaleCodeInDisplay) {
-                $localeCode = explode('_', $localeKey)[0];
+                $localeCode = trim(explode('@', explode('_', $localeKey)[0])[0]);
                 $localeDisplay = $locale->getDisplayName(null, ($localeCodesCount[$localeCode] ?? 0) > 1, $langLocaleStatus);
                 return $localeDisplay . ($omitLocaleCodeInDisplay  ? "" : " ({$localeKey})");
             })