From a40df34c09e95f6f2d30c3e45282b745dfe4ebde Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Wed, 4 Sep 2024 21:02:52 +0530
Subject: [PATCH] Fix translation patch error

---
 Dockerfile                                      |  2 +-
 patches/031-theme-custom-app-translations.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 945a018..1ae7463 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="991454"
 ARG MEMORIES_VERSION="7.3.1"
 ARG DROP_ACCOUNT_VERSION="2.5.0"
 
-RUN sed -i 's/28,0,9,1/28,0,9,5/' ${BASE_DIR}/version.php
+RUN sed -i 's/28,0,9,1/28,0,9,6/' ${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
diff --git a/patches/031-theme-custom-app-translations.patch b/patches/031-theme-custom-app-translations.patch
index 56f1433..8c16118 100644
--- a/patches/031-theme-custom-app-translations.patch
+++ b/patches/031-theme-custom-app-translations.patch
@@ -1,13 +1,13 @@
 --- ./lib/private/Template/JSResourceLocator.php	2024-08-29 22:10:30.588659044 +0530
 +++ ./lib/private/Template/JSResourceLocator-new.php	2024-08-29 23:55:00.239753244 +0530
-@@ -62,6 +62,7 @@
- 				// Handle symlinks
- 				$appRoot = realpath($appRoot);
- 			}
-+			$appDirName = basename($appRoot);
- 			// Get the app webroot
- 			$appWebRoot = dirname($this->appManager->getAppWebPath($app));
+@@ -67,6 +67,7 @@
  		} catch (AppPathNotFoundException $e) {
+ 			// ignore
+ 		}
++		$appDirName = basename($appRoot);
+ 
+ 		if (str_contains($script, '/l10n/')) {
+ 			// For language files we try to load them all, so themes can overwrite
 @@ -77,7 +78,7 @@
  			$found += $this->appendScriptIfExist($this->serverroot, $script);
  			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
-- 
GitLab