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

Commit 867bce3c authored by Akhil's avatar Akhil 🙂
Browse files

remove the unneeded patch for custom app translations

parent 0fa41107
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o
RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch
RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch
RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch
# UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039
RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch
+0 −17
Original line number Diff line number Diff line
--- ./lib/private/Template/JSResourceLocator.php	2024-03-15 19:15:38
+++ ./lib/private/Template/JSResourceLocator-new.php	2024-03-15 19:16:54
@@ -76,8 +76,12 @@
 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);
 			$found += $this->appendScriptIfExist($this->serverroot, $script);
 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
-			$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
+			foreach (\OC::$APPSROOTS as $appRoot) {
+				$dirName = basename($appRoot['path']);
+				$rootPath = dirname($appRoot['path']);
+				$found += $this->appendIfExist($rootPath, $dirName.'/'.$script.'.js');
+				$found += $this->appendIfExist($this->serverroot, $theme_dir.$dirName.'/'.$script.'.js');	
+			}	
 
 			if ($found) {
 				return;