dbxe
/
DBXE
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

RETROTEC-AG/OpenXE#17 Locale des GUI-Users ermitteln 

Sicherstellen, dass \erpAPI::Firmendaten() immer einen String zurückliefert.
This commit is contained in:
Roland Rusch 2023-08-16 16:40:42 +02:00
parent 7c4c9e64d6
commit 8c9ab14daf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/Components/I18n/Bootstrap.php
View File

@ -115,12 +115,12 @@ final class Bootstrap
$firmaLang=null; $firmaLang=null;
$firmaRegion=null; $firmaRegion=null;
// Get language from system settings and normalize to 3-letter-code and 2-letter-code // Get language from system settings and normalize to 3-letter-code and 2-letter-code
if ($firmaLang = self::findLanguage($app->erp->Firmendaten('preferredLanguage'))) { if ($firmaLang = self::findLanguage(strval($app->erp->Firmendaten('preferredLanguage')))) {
$config[Localization::LANGUAGE_DEFAULT] = $firmaLang[Iso639\Key::ALPHA_3]; $config[Localization::LANGUAGE_DEFAULT] = $firmaLang[Iso639\Key::ALPHA_3];
} }
// Get region from system settings and normalize to 2-letter-code // Get region from system settings and normalize to 2-letter-code
if ($firmaLang && ($firmaRegion = self::findRegion($app->erp->Firmendaten('land')))) { if ($firmaLang && ($firmaRegion = self::findRegion(strval($app->erp->Firmendaten('land'))))) {
$config[Localization::LOCALE_DEFAULT] = "{$firmaLang[Iso639\Key::ALPHA_2]}_{$firmaRegion[Iso3166\Key::ALPHA_2]}"; $config[Localization::LOCALE_DEFAULT] = "{$firmaLang[Iso639\Key::ALPHA_2]}_{$firmaRegion[Iso3166\Key::ALPHA_2]}";
} }
@ -135,12 +135,12 @@ final class Bootstrap
); );
// Get language from user account and normalize to 3-letter-code and 2-letter-code // Get language from user account and normalize to 3-letter-code and 2-letter-code
if ($userLang = self::findLanguage($user->GetSprache())) { if ($userLang = self::findLanguage(strval($user->GetSprache()))) {
$usersettings['language'] = $userLang[Iso639\Key::ALPHA_3]; $usersettings['language'] = $userLang[Iso639\Key::ALPHA_3];
} }
// Get region from user account and normalize to 2-letter-code // Get region from user account and normalize to 2-letter-code
if ($userLang && ($userRegion = self::findRegion($userAddress['land']))) { if ($userLang && ($userRegion = self::findRegion(strval($userAddress['land'] ?? '')))) {
$usersettings['locale'] = "{$userLang[Iso639\Key::ALPHA_2]}_{$userRegion[Iso3166\Key::ALPHA_2]}"; $usersettings['locale'] = "{$userLang[Iso639\Key::ALPHA_2]}_{$userRegion[Iso3166\Key::ALPHA_2]}";
} }
} }