mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Merge pull request #1362 from Murena-SAS/dev/lang-fix-nexcloud
make nextcloud language work with snappy
This commit is contained in:
commit
4400af04c7
1 changed files with 40 additions and 1 deletions
|
|
@ -248,10 +248,49 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
|
||||||
public function FilterLanguage(&$sLanguage, $bAdmin) : void
|
public function FilterLanguage(&$sLanguage, $bAdmin) : void
|
||||||
{
|
{
|
||||||
if (!\RainLoop\Api::Config()->Get('webmail', 'allow_languages_on_settings', true)) {
|
if (!\RainLoop\Api::Config()->Get('webmail', 'allow_languages_on_settings', true)) {
|
||||||
$sLanguage = \strtr(\OC::$server->getL10N('core')->getLocaleCode(), '_', '-');
|
$aResultLang = \SnappyMail\L10n::getLanguages(false);
|
||||||
|
$user = \OC::$server->getUserSession()->getUser();
|
||||||
|
$userId = $user->getUID();
|
||||||
|
$userLang = \OC::$server->getConfig()->getUserValue($userId, 'core', 'lang','en');
|
||||||
|
$sLanguage = $this->determineLocale($userLang,$aResultLang);
|
||||||
|
// Check if $sLanguage is null
|
||||||
|
if ($sLanguage === null) {
|
||||||
|
$sLanguage = 'en'; // Assign 'en' if $sLanguage is null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine locale from user language.
|
||||||
|
*
|
||||||
|
* @param string $langCode The name of the input.
|
||||||
|
* @param array $languagesArray The value of the array.
|
||||||
|
*
|
||||||
|
* @return string return locale
|
||||||
|
*/
|
||||||
|
private function determineLocale (string $langCode, array $languagesArray) : string {
|
||||||
|
// Direct check for the language code
|
||||||
|
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 (strpos($localeValue, $langCode) === 0) {
|
||||||
|
return $localeValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no match is found
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $mResult
|
* @param mixed $mResult
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue