From 8247357184cad5ff33aab122e16a84e6062c974c Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 20 Nov 2023 22:40:33 +0100
Subject: [PATCH] Some changes for #1293

---
 .../snappymail/lib/AppInfo/Application.php        |  3 ++-
 .../snappymail/lib/Controller/FetchController.php |  5 +++--
 .../snappymail/lib/Controller/PageController.php  | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index 9a8e0748c..9efe3a173 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -34,7 +34,8 @@ class Application extends App implements IBootstrap
 			'PageController', function($c) {
 				return new PageController(
 					$c->query('AppName'),
-					$c->query('Request')
+					$c->query('Request'),
+					$c->query(IL10N::class)
 				);
 			}
 		);
diff --git a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
index f15a76fe8..134c2462b 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
@@ -12,8 +12,9 @@ use OCP\IL10N;
 use OCP\IRequest;
 
 class FetchController extends Controller {
-	private $config;
-	private $appManager;
+	private IConfig $config;
+	private IAppManager $appManager;
+	private IL10N $l;
 
 	public function __construct(string $appName, IRequest $request, IAppManager $appManager, IConfig $config, IL10N $l) {
 		parent::__construct($appName, $request);
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 3630ac891..470c2d78b 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -7,9 +7,24 @@ use OCA\SnappyMail\ContentSecurityPolicy;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IL10N;
+use OCP\IRequest;
 
 class PageController extends Controller
 {
+//	private IL10N $l;
+
+	public function __construct(string $appName, IRequest $request, IL10N $l) {
+		parent::__construct($appName, $request);
+//		$this->l = $l;
+		$lang = \strtolower(\str_replace('_', '-', $l->getLocaleCode()));
+		if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;
+		} else {
+			$_SERVER['HTTP_ACCEPT_LANGUAGE'] .= ",{$lang};q=2";
+		}
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired