Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0039b4a4 authored by Akhil's avatar Akhil
Browse files

getlanguage from request improved in patch

parent 6c0069fc

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="3.0.0" 
ARG USER_MIGRATION_JOB_ID="608716"

ARG MEMORIES_VERSION="5.4.1"



RUN sed -i 's/26,0,8,2/26,0,8,12/' ${BASE_DIR}/version.php

RUN sed -i 's/26,0,8,2/26,0,8,13/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images

patches/032-select-lang-from-session.patch

+2 −5
Original line number Diff line number Diff line
@@ -6,13 +6,10 @@ $_SERVER in IRequest is immutable but we want to switch the header to deliver tr 


--- lib/private/L10N/Factory.php	2023-11-29 17:46:48.253716340 +0530

+++ lib/private/L10N/Factory-new.php	2023-11-29 17:47:26.194920628 +0530

@@ -478,7 +478,11 @@

 	 * @throws LanguageNotFoundException

@@ -479,6 +479,9 @@

 	 */

 	private function getLanguageFromRequest(?string $app = null): string {

-		$header = $this->request->getHeader('ACCEPT_LANGUAGE');

+		// $header = $this->request->getHeader('ACCEPT_LANGUAGE');

+		$header = '';

 		$header = $this->request->getHeader('ACCEPT_LANGUAGE');

+		if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

+			$header = $_SERVER['HTTP_ACCEPT_LANGUAGE'];

+		}