Postal/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-06-28 23:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

use getLanguages

Browse Source
This commit is contained in:
Avinash Gusain
2023-12-13 16:07:44 +05:30
parent 3a46916ad9
commit d1e6ea379e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/nextcloud/index.php
View File

@@ -248,14 +248,11 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
public function FilterLanguage(&$sLanguage, $bAdmin) : void
{
if (!\RainLoop\Api::Config()->Get('webmail', 'allow_languages_on_settings', true)) {
$aResultLang = \json_decode(\file_get_contents(APP_VERSION_ROOT_PATH . 'app/localization/langs.json'), true);
if ($aResultLang === null) {
throw new \Exception('Error decoding JSON content.');
}
$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['LANGS_NAMES_EN']);
$sLanguage = $this->determineLocale($userLang,$aResultLang);
// Check if $sLanguage is null
if ($sLanguage === null) {
$sLanguage = 'en'; // Assign 'en' if $sLanguage is null
@@ -273,20 +270,20 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
*/
private function determineLocale (string $langCode, array $languagesArray) : string {
// Direct check for the language code
if (isset($languagesArray[$langCode])) {
if (in_array($langCode, $languagesArray)) {
return $langCode;
}
// Check with uppercase country code
$langCodeWithUpperCase = $langCode . '-' . strtoupper($langCode);
if (isset($languagesArray[$langCodeWithUpperCase])) {
if (in_array($langCodeWithUpperCase, $languagesArray)) {
return $langCodeWithUpperCase;
}
// Iterating to find a match starting with langCode
foreach ($languagesArray as $localeKey => $localeValue) {
if (strpos($localeKey, $langCode) === 0) {
return $localeKey;
foreach ($languagesArray as $localeValue) {
if (strpos($localeValue, $langCode) === 0) {
return $localeValue;
}
}

2
snappymail/v/0.0.0/app/libraries/snappymail/l10n.php
View File

@@ -8,7 +8,7 @@ abstract class L10n
/**
* @staticvar array $aCache
*/
public static function getLanguages(bool $bAdmin = false) : array
public static function (bool $bAdmin = false) : array
{
static $aCache = array();