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

Commit 6f04bb67 authored Mar 15, 2024 by Ronak Patel

changes in 031-theme-custom-app-translations.patch

parent 3613307d

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broke
		RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch
		RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
		RUN patch -u ${BASE_DIR}/lib/private/Preview/Watcher.php -i ${TMP_PATCH_DIR}/030-preview-watcher-null-check.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/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

		RUN rm -rf ${TMP_PATCH_DIR}

patches/024-reminder-service-handle-exception.patch

+2 −2

Original line number	Diff line number	Diff line
		--- /apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18
		+++ /apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 17:54:05
		--- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18
		+++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 17:54:05
		@@ -44,6 +44,7 @@
		use Sabre\VObject\ParseException;
		use Sabre\VObject\Recur\EventIterator;

patches/030-preview-watcher-null-check.patch

+2 −2

Original line number	Diff line number	Diff line
		--- ./lib/private/Preview/Watcher.php 2024-03-15 16:35:05
		+++ ./lib/private/Preview/Watcher-new.php 2024-03-15 17:58:12
		--- lib/private/Preview/Watcher.php 2024-03-15 16:35:05
		+++ lib/private/Preview/Watcher-new.php 2024-03-15 17:58:12
		@@ -62,6 +62,9 @@
		}

patches/031-theme-custom-app-translations.patch

+4 −10

Original line number	Diff line number	Diff line
		From: Akhil <akhil.potukuchi.ext@murena.com>
		Date: Fri, 25 June 2023 16:40:00 +0530
		Subject: [PATCH] Add custom app translation scripts from theme

		Check all app root paths defined in config when delivering translation scripts

		--- lib/private/Template/JSResourceLocator.php 2023-10-25 22:20:27.524870550 +0530
		+++ lib/private/Template/JSResourceLocator-new.php 2023-10-25 22:23:02.419067631 +0530
		--- ./lib/private/Template/JSResourceLocator.php 2024-03-15 16:35:05
		+++ ./lib/private/Template/JSResourceLocator-new.php 2024-03-15 18:04:54
		@@ -57,8 +57,13 @@
		$found += $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js');
		$found += $this->appendIfExist($this->serverroot, $script.'.js');