snappymail lang fix

ARG LAUNCHER_JOB_ID="738816"

ARG GOOGLE_INTEGRATION_VERSION="2.1.0"

ARG DASHBOARD_JOB_ID="748055"

ARG SNAPPY_VERSION="2.29.1"

ARG SNAPPY_VERSION="2.29.4"

ARG SNAPPY_THEME_VERSION="3.0.0"

ARG USER_MIGRATION_JOB_ID="608716"

ARG MEMORIES_VERSION="5.4.1"

Subject: [PATCH] Snappy Language fix

This set snappy language same is cloud language

--- ./custom_apps/snappymail/lib/Controller/PageController.php	2023-11-27 12:15:41

+++ ./custom_apps/snappymail/lib/Controller/PageController-new.php	2023-11-27 12:36:00

@@ -54,7 +54,8 @@

--- PageController.php	2023-11-29 00:29:13

+++ PageController-new.php	2023-11-29 00:40:50

@@ -12,11 +12,11 @@

 class PageController extends Controller

 {

-//	private IL10N $l;

+	private IL10N $l;

 	public function __construct(string $appName, IRequest $request, IL10N $l) {

 		parent::__construct($appName, $request);

-//		$this->l = $l;

+		$this->l = $l;

 		$lang = \strtolower(\str_replace('_', '-', $l->getLocaleCode()));

 		if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

 			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;

@@ -69,8 +69,20 @@

 		$oServiceActions = new \RainLoop\ServiceActions($oHttp, $oActions);

 		$sAppJsMin = $oConfig->Get('debug', 'javascript', false) ? '' : '.min';

 		$sAppCssMin = $oConfig->Get('debug', 'css', false) ? '' : '.min';

-		$sLanguage = $oActions->GetLanguage(false);

+		$userId =  \OC::$server->getUserSession()->getUser()->getUID();

+		$sLanguage = $this->config->getUserValue($userId, 'core', 'lang', null);

-

+		$languageSetting = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);

+		if (!$languageSetting) {

+			$aResultLang = \json_decode(\file_get_contents(APP_VERSION_ROOT_PATH . 'app/localization/langs.json'), true);

+			$localeCode = \strtolower(\str_replace('_', '-', $this->l->getLocaleCode()));

+			if (!strpos($localeCode, '_') && !strpos($localeCode, '-')) {

+				$localeCode = $localeCode . '-' . strtoupper($localeCode);

+			}

+			$sLanguage = 'en';

+			if(isset($aResultLang['LANGS_NAMES_EN'][$localeCode])) {

+				$sLanguage = $localeCode;

+			}

+		}else {

+			$sLanguage = $oActions->GetLanguage(false);

+		}

 		$csp = new ContentSecurityPolicy();

 		$sNonce = $csp->getSnappyMailNonce();