the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 07:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Nextcloud language detection

Browse source
This commit is contained in:
the-djmaze 2024-08-06 13:26:36 +02:00
parent 505e6e2a0d
commit 15f4ba54df
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/nextcloud/index.php
View file

@ -298,9 +298,10 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
$aResultLang = \SnappyMail\L10n::getLanguages($bAdmin);
$userId = \OC::$server->getUserSession()->getUser()->getUID();
$userLang = \OC::$server->getConfig()->getUserValue($userId, 'core', 'lang', 'en');
$userLang = \strtr($userLang, '_', '-');
$sLanguage = $this->determineLocale($userLang, $aResultLang);
// Check if $sLanguage is null
if ($sLanguage === null) {
if (!$sLanguage) {
$sLanguage = 'en'; // Assign 'en' if $sLanguage is null
}
}
@ -321,19 +322,20 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
return $langCode;
}
// Check without country code
if (\str_contains($langCode, '-')) {
$langCode = \explode('-', $langCode)[0];
if (\in_array($langCode, $languagesArray)) {
return $langCode;
}
}
// Check with uppercase country code
$langCodeWithUpperCase = $langCode . '-' . \strtoupper($langCode);
if (\in_array($langCodeWithUpperCase, $languagesArray)) {
return $langCodeWithUpperCase;
}
// Iterating to find a match starting with langCode
foreach ($languagesArray as $localeValue) {
if (\str_starts_with($localeValue, $langCode)) {
return $localeValue;
}
}
// If no match is found
return null;
}