Merge branch 'dev/fix-translation-patch' into 'main'

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

--- ./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);

@@ -67,6 +67,7 @@

 		} catch (AppPathNotFoundException $e) {

 			// ignore

 		}

+		$appDirName = basename($appRoot);

 			// Get the app webroot

 			$appWebRoot = dirname($this->appManager->getAppWebPath($app));

 		} catch (AppPathNotFoundException $e) {

 		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);