From f8b942e94dc224058a8c8b36094c9b37daa5311e Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 21:01:31 +0100
Subject: [PATCH 01/14] Create a service for offset calculation

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 src/services/timezoneOffsetService.js

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
new file mode 100644
index 0000000000..5ec0965292
--- /dev/null
+++ b/src/services/timezoneOffsetService.js
@@ -0,0 +1,44 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+export function getTimezoneOffset(proposalDate: string, timezoneId: string): number {
+  let timezoneOffset = 0
+
+  try {
+    const date = new Date(proposalDate)
+
+    const dtf = new Intl.DateTimeFormat('en-US', {
+      timeZone: timezoneId,
+      hour12: false,
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+    })
+
+    const parts = dtf.formatToParts(date)
+
+    const values: Record<string, string> = {}
+    parts.forEach(({ type, value }) => {
+      if (type !== 'literal') values[type] = value
+    })
+
+    const asUTC = Date.UTC(
+      Number(values.year),
+      Number(values.month) - 1,
+      Number(values.day),
+      Number(values.hour),
+      Number(values.minute),
+      Number(values.second)
+    )
+
+    timezoneOffset = Math.round((asUTC - date.getTime()) / 60000)
+  } catch (e) {
+    timezoneOffset = 0
+  }
+
+  return timezoneOffset
+}
\ No newline at end of file

From 43b2e238c8090188bb0d01b7458b38f4cbcfaaf5 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 21:12:21 +0100
Subject: [PATCH 02/14] Refactor timezone offset calculation in
 ProposalDateItem

Replaced manual timezone offset calculation with a call to getTimezoneOffset function.

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalDateItem.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/Proposal/ProposalDateItem.vue b/src/components/Proposal/ProposalDateItem.vue
index 1a25165d82..550e03db1c 100644
--- a/src/components/Proposal/ProposalDateItem.vue
+++ b/src/components/Proposal/ProposalDateItem.vue
@@ -1,5 +1,5 @@
 <!--
-  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
@@ -21,6 +21,7 @@
 
 <script lang="ts">
 import type { ProposalDateInterface } from '@/types/proposals/proposalInterfaces'
+import { getTimezoneOffset } from '@/services/timezoneOffsetService'
 
 // types, object and stores
 import { t } from '@nextcloud/l10n'
@@ -57,15 +58,7 @@ export default {
 				return ''
 			}
 			// Get the timezone offset in minutes
-			let timezoneOffset = 0
-			try {
-				const now = new Date()
-				const utcDate = new Date(now.toLocaleString('en-US', { timeZone: 'UTC' }))
-				const targetDate = new Date(now.toLocaleString('en-US', { timeZone: this.timezoneId }))
-				timezoneOffset = ((utcDate.getTime() - targetDate.getTime()) / (1000 * 60)) * -1
-			} catch (e) {
-				timezoneOffset = 0
-			}
+			const timezoneOffset = getTimezoneOffset(this.proposalDate.date,this.timezoneId)
 			const m = moment(this.proposalDate.date).utcOffset(timezoneOffset)
 			// Examples: "Mon, Jul 8, 2:30 PM" (en), "Mon, 8 Jul, 14:30" (en-GB), "Mo, 8. Jul, 14:30" (de)
 			return m.format('dddd, MMMM D, LT')

From f6b1001dddf4c88de651e21687eb4fe7f5014172 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 21:40:47 +0100
Subject: [PATCH 03/14] Refactor timezone handling in ProposalResponseMatrix

Refactor timezone handling by removing timezoneOffset state and using getTimezoneOffset function directly in date calculations.

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 .../Proposal/ProposalResponseMatrix.vue       | 53 ++++++-------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/components/Proposal/ProposalResponseMatrix.vue b/src/components/Proposal/ProposalResponseMatrix.vue
index 3e769a0425..cc8230dc84 100644
--- a/src/components/Proposal/ProposalResponseMatrix.vue
+++ b/src/components/Proposal/ProposalResponseMatrix.vue
@@ -138,6 +138,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import { Proposal, ProposalResponse } from '@/models/proposals/proposals'
 import { ProposalDateVote } from '@/types/proposals/proposalEnums'
+import { getTimezoneOffset } from '@/services/timezoneOffsetService'
 
 export default {
 	name: 'ProposalResponseMatrix',
@@ -182,7 +183,6 @@ export default {
 	data() {
 		return {
 			ProposalDateVote,
-			timezoneOffset: 0,
 		}
 	},
 
@@ -201,17 +201,21 @@ export default {
 			const groups = {}
 			dates.forEach((d) => {
 				// Apply timezone offset for grouping by day
-				const key = d.date ? moment(d.date).utcOffset(this.timezoneOffset).format('yyyy-MM-dd') : 'invalid'
+				const offset = getTimezoneOffset(d.date.toISOString(), this.timezoneId)
+				const key = moment(d.date).utcOffset(offset).format('YYYY-MM-DD')
 				if (!groups[key]) {
 					groups[key] = []
 				}
 				groups[key].push(d)
 			})
-			return Object.entries(groups).map(([key, grp]: [string, ProposalDate[]]) => ({
-				key,
-				label: moment(grp[0].date).utcOffset(this.timezoneOffset).format('dddd, MMMM Do'),
-				dates: grp,
-			}))
+			return Object.entries(groups).map(([key, grp]: [string, ProposalDate[]]) => {
+				const offset = getTimezoneOffset(grp[0].date.toISOString(), this.timezoneId)
+				return {
+					key,
+					label: moment(grp[0].date).utcOffset(offset).format('dddd, MMMM Do'),
+					dates: grp,
+				}
+			})
 		},
 
 		columnCount() {
@@ -222,39 +226,13 @@ export default {
 
 	},
 
-	watch: {
-		timezoneId(newZone) {
-			if (newZone) {
-				this.timezoneOffset = this.calculateTimezoneOffset(newZone)
-			}
-		},
-	},
-
-	created() {
-		if (this.timezoneId) {
-			this.timezoneOffset = this.calculateTimezoneOffset(this.timezoneId)
-		}
-	},
-
 	methods: {
 		t,
 
-		calculateTimezoneOffset(timezoneId) {
-			// Get the timezone offset in minutes
-			try {
-				const now = new Date()
-				const utcDate = new Date(now.toLocaleString('en-US', { timeZone: 'UTC' }))
-				const targetDate = new Date(now.toLocaleString('en-US', { timeZone: timezoneId }))
-				return ((utcDate.getTime() - targetDate.getTime()) / (1000 * 60)) * -1
-			} catch (e) {
-				// Fallback to UTC if timezone is invalid
-				return 0
-			}
-		},
-
 		dateTimeSpan(date) {
-			const startDate = moment(date).utcOffset(this.timezoneOffset)
-			const endDate = moment(date).utcOffset(this.timezoneOffset).add(this.proposal.duration, 'minutes')
+			const offset = getTimezoneOffset(date.toISOString(), this.timezoneId)
+			const startDate = moment(date).utcOffset(offset)
+			const endDate = moment(date).utcOffset(offset).add(this.proposal.duration, 'minutes')
 
 			const startTime = startDate.format('LT')
 			const endTime = endDate.format('LT')
@@ -277,7 +255,8 @@ export default {
 				return ''
 			}
 			// Apply timezone offset and format very compact: "7/8 2PM"
-			const adjustedDate = moment(date).utcOffset(this.timezoneOffset)
+			const offset = getTimezoneOffset(date.toISOString(), this.timezoneId)
+			const adjustedDate = moment(date).utcOffset(offset)
 			return adjustedDate.format('M/D LT').replace(':00', '').replace(' ', ' ')
 		},
 

From 0a283a900bffe0eb61866970e01730848a1863ce Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 21:59:19 +0100
Subject: [PATCH 04/14] Refactor getTimezoneOffset to remove type annotations

Remove TypeScript type annotations from getTimezoneOffset function.

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index 5ec0965292..8a50bd9361 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export function getTimezoneOffset(proposalDate: string, timezoneId: string): number {
+export function getTimezoneOffset(proposalDate, timezoneId){
   let timezoneOffset = 0
 
   try {
@@ -41,4 +41,4 @@ export function getTimezoneOffset(proposalDate: string, timezoneId: string): num
   }
 
   return timezoneOffset
-}
\ No newline at end of file
+}

From fe02cfea65d62a353bf8e4830834ff45078f570b Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 22:10:48 +0100
Subject: [PATCH 05/14] Refactor values declaration in timezoneOffsetService

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index 8a50bd9361..292472a10c 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -21,7 +21,7 @@ export function getTimezoneOffset(proposalDate, timezoneId){
 
     const parts = dtf.formatToParts(date)
 
-    const values: Record<string, string> = {}
+    const values = {}
     parts.forEach(({ type, value }) => {
       if (type !== 'literal') values[type] = value
     })

From 9861061d1e776d808403990535d13b9e63cc82b4 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sat, 21 Mar 2026 22:31:18 +0100
Subject: [PATCH 06/14] Update copyright year in ProposalResponseMatrix.vue

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalResponseMatrix.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Proposal/ProposalResponseMatrix.vue b/src/components/Proposal/ProposalResponseMatrix.vue
index cc8230dc84..49b3211cf7 100644
--- a/src/components/Proposal/ProposalResponseMatrix.vue
+++ b/src/components/Proposal/ProposalResponseMatrix.vue
@@ -1,5 +1,5 @@
 <!--
-  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 

From 92a300216dd362daa5af44fa8a4793a819eb7d3a Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Sun, 22 Mar 2026 21:10:21 +0100
Subject: [PATCH 07/14] Refactor getTimezoneOffset function for efficiency

Follow up cache the timezoneId formatter and floor instead of round

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 62 ++++++++++++++++-----------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index 292472a10c..c998206a93 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -2,43 +2,53 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+// SPDX-SnippetBegin
+// SPDX-SnippetCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+const dtfCache = new Map()
+
 export function getTimezoneOffset(proposalDate, timezoneId){
-  let timezoneOffset = 0
 
   try {
     const date = new Date(proposalDate)
-
-    const dtf = new Intl.DateTimeFormat('en-US', {
-      timeZone: timezoneId,
-      hour12: false,
-      year: 'numeric',
-      month: '2-digit',
-      day: '2-digit',
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit',
-    })
+		if (isNaN(date)) return null
+		
+		let dtf = dtfCache.get(timezoneId)
+		if (!dtf) {
+    	dtf = new Intl.DateTimeFormat('en-US', {
+      	timeZone: timezoneId,
+      	hour12: false,
+      	year: 'numeric',
+      	month: '2-digit',
+      	day: '2-digit',
+      	hour: '2-digit',
+      	minute: '2-digit',
+      	second: '2-digit',
+    	})
+			dtfCache.set(timezoneId, dtf)
+		}
 
     const parts = dtf.formatToParts(date)
-
     const values = {}
-    parts.forEach(({ type, value }) => {
+		
+    for (const { type, value } of parts) {
       if (type !== 'literal') values[type] = value
-    })
+    }
 
     const asUTC = Date.UTC(
-      Number(values.year),
-      Number(values.month) - 1,
-      Number(values.day),
-      Number(values.hour),
-      Number(values.minute),
-      Number(values.second)
+      +Number(values.year),
+      +Number(values.month) - 1,
+      +Number(values.day),
+      +Number(values.hour),
+      +Number(values.minute),
+      +Number(values.second)
     )
 
-    timezoneOffset = Math.round((asUTC - date.getTime()) / 60000)
-  } catch (e) {
-    timezoneOffset = 0
+    return Math.floor((asUTC - date.getTime()) / 60000)
+  } catch {
+    return null
   }
-
-  return timezoneOffset
 }
+// SPDX-SnippetEnd

From 82a4bb09e552067ca9a733b272d9f35f6000cd36 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Mon, 23 Mar 2026 18:24:38 +0100
Subject: [PATCH 08/14] fix eslint

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 83 ++++++++++++++-------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index c998206a93..503c50178d 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -9,46 +9,49 @@
 
 const dtfCache = new Map()
 
-export function getTimezoneOffset(proposalDate, timezoneId){
-
-  try {
-    const date = new Date(proposalDate)
-		if (isNaN(date)) return null
-		
-		let dtf = dtfCache.get(timezoneId)
-		if (!dtf) {
-    	dtf = new Intl.DateTimeFormat('en-US', {
-      	timeZone: timezoneId,
-      	hour12: false,
-      	year: 'numeric',
-      	month: '2-digit',
-      	day: '2-digit',
-      	hour: '2-digit',
-      	minute: '2-digit',
-      	second: '2-digit',
-    	})
-			dtfCache.set(timezoneId, dtf)
-		}
-
-    const parts = dtf.formatToParts(date)
-    const values = {}
-		
-    for (const { type, value } of parts) {
-      if (type !== 'literal') values[type] = value
-    }
+export function getTimezoneOffset(proposalDate, timezoneId) {
+    try {
+        const date = new Date(proposalDate)
+        if (isNaN(date)) {
+            return null
+        }
+
+        let dtf = dtfCache.get(timezoneId)
+        if (!dtf) {
+            dtf = new Intl.DateTimeFormat('en-US', {
+                timeZone: timezoneId,
+                hour12: false,
+                year: 'numeric',
+                month: '2-digit',
+                day: '2-digit',
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit',
+            })
+            dtfCache.set(timezoneId, dtf)
+        }
+
+        const parts = dtf.formatToParts(date)
+        const values = {}
 
-    const asUTC = Date.UTC(
-      +Number(values.year),
-      +Number(values.month) - 1,
-      +Number(values.day),
-      +Number(values.hour),
-      +Number(values.minute),
-      +Number(values.second)
-    )
-
-    return Math.floor((asUTC - date.getTime()) / 60000)
-  } catch {
-    return null
-  }
+        for (const { type, value } of parts) {
+            if (type !== 'literal') {
+                values[type] = value
+            }
+        }
+
+        const asUTC = Date.UTC(
+            Number(values.year),
+            Number(values.month) - 1,
+            Number(values.day),
+            Number(values.hour),
+            Number(values.minute),
+            Number(values.second),
+        )
+
+        return Math.floor((asUTC - date.getTime()) / 60000)
+    } catch {
+        return null
+    }
 }
 // SPDX-SnippetEnd

From 4d3c0f4240f8efdb29055575f472779a6124bb87 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Mon, 23 Mar 2026 20:53:41 +0100
Subject: [PATCH 09/14] Fix formatting of timezoneOffset calculation

Eslint

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalDateItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Proposal/ProposalDateItem.vue b/src/components/Proposal/ProposalDateItem.vue
index 550e03db1c..089b6d9b14 100644
--- a/src/components/Proposal/ProposalDateItem.vue
+++ b/src/components/Proposal/ProposalDateItem.vue
@@ -58,7 +58,7 @@ export default {
 				return ''
 			}
 			// Get the timezone offset in minutes
-			const timezoneOffset = getTimezoneOffset(this.proposalDate.date,this.timezoneId)
+			const timezoneOffset = getTimezoneOffset(this.proposalDate.date, this.timezoneId)
 			const m = moment(this.proposalDate.date).utcOffset(timezoneOffset)
 			// Examples: "Mon, Jul 8, 2:30 PM" (en), "Mon, 8 Jul, 14:30" (en-GB), "Mo, 8. Jul, 14:30" (de)
 			return m.format('dddd, MMMM D, LT')

From a8c4bc7897260c26119887e2b743d42a1dbebfef Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Mon, 23 Mar 2026 20:56:00 +0100
Subject: [PATCH 10/14] Fix eslint

Try to  fix those things ...

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalResponseMatrix.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Proposal/ProposalResponseMatrix.vue b/src/components/Proposal/ProposalResponseMatrix.vue
index 49b3211cf7..2dda1199b8 100644
--- a/src/components/Proposal/ProposalResponseMatrix.vue
+++ b/src/components/Proposal/ProposalResponseMatrix.vue
@@ -137,8 +137,9 @@ import NcAvatar from '@nextcloud/vue/components/NcAvatar'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import { Proposal, ProposalResponse } from '@/models/proposals/proposals'
-import { ProposalDateVote } from '@/types/proposals/proposalEnums'
 import { getTimezoneOffset } from '@/services/timezoneOffsetService'
+import { ProposalDateVote } from '@/types/proposals/proposalEnums'
+
 
 export default {
 	name: 'ProposalResponseMatrix',

From 93fbbb39ab966c0029477093f9071a75b68bb6b1 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Mon, 23 Mar 2026 20:57:11 +0100
Subject: [PATCH 11/14] Fix eslint error

Add error handling to timezone offset calculation

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index 503c50178d..a59e223a7e 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -50,7 +50,7 @@ export function getTimezoneOffset(proposalDate, timezoneId) {
         )
 
         return Math.floor((asUTC - date.getTime()) / 60000)
-    } catch {
+    } catch (error) {
         return null
     }
 }

From 1cbe6cf78476e9d70f43d0c29adb29dfb6dba15f Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Wed, 8 Apr 2026 22:23:26 +0200
Subject: [PATCH 12/14] Fix eslint the properway

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/services/timezoneOffsetService.js | 91 +++++++++++++--------------
 1 file changed, 43 insertions(+), 48 deletions(-)

diff --git a/src/services/timezoneOffsetService.js b/src/services/timezoneOffsetService.js
index a59e223a7e..44f8d1e64a 100644
--- a/src/services/timezoneOffsetService.js
+++ b/src/services/timezoneOffsetService.js
@@ -3,55 +3,50 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-// SPDX-SnippetBegin
-// SPDX-SnippetCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 const dtfCache = new Map()
 
 export function getTimezoneOffset(proposalDate, timezoneId) {
-    try {
-        const date = new Date(proposalDate)
-        if (isNaN(date)) {
-            return null
-        }
-
-        let dtf = dtfCache.get(timezoneId)
-        if (!dtf) {
-            dtf = new Intl.DateTimeFormat('en-US', {
-                timeZone: timezoneId,
-                hour12: false,
-                year: 'numeric',
-                month: '2-digit',
-                day: '2-digit',
-                hour: '2-digit',
-                minute: '2-digit',
-                second: '2-digit',
-            })
-            dtfCache.set(timezoneId, dtf)
-        }
-
-        const parts = dtf.formatToParts(date)
-        const values = {}
-
-        for (const { type, value } of parts) {
-            if (type !== 'literal') {
-                values[type] = value
-            }
-        }
-
-        const asUTC = Date.UTC(
-            Number(values.year),
-            Number(values.month) - 1,
-            Number(values.day),
-            Number(values.hour),
-            Number(values.minute),
-            Number(values.second),
-        )
-
-        return Math.floor((asUTC - date.getTime()) / 60000)
-    } catch (error) {
-        return null
-    }
+	try {
+		const date = new Date(proposalDate)
+		if (isNaN(date)) {
+			return null
+		}
+
+		let dtf = dtfCache.get(timezoneId)
+		if (!dtf) {
+			dtf = new Intl.DateTimeFormat('en-US', {
+				timeZone: timezoneId,
+				hour12: false,
+				year: 'numeric',
+				month: '2-digit',
+				day: '2-digit',
+				hour: '2-digit',
+				minute: '2-digit',
+				second: '2-digit',
+			})
+			dtfCache.set(timezoneId, dtf)
+		}
+
+		const parts = dtf.formatToParts(date)
+		const values = {}
+
+		for (const { type, value } of parts) {
+			if (type !== 'literal') {
+				values[type] = value
+			}
+		}
+
+		const asUTC = Date.UTC(
+			Number(values.year),
+			Number(values.month) - 1,
+			Number(values.day),
+			Number(values.hour),
+			Number(values.minute),
+			Number(values.second),
+		)
+
+		return Math.floor((asUTC - date.getTime()) / 60000)
+	} catch {
+		return null
+	}
 }
-// SPDX-SnippetEnd

From 4b9237eb71b600b2b513eaac1e6a246d41f2b372 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Wed, 8 Apr 2026 22:24:57 +0200
Subject: [PATCH 13/14] Fix eslint again

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalDateItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Proposal/ProposalDateItem.vue b/src/components/Proposal/ProposalDateItem.vue
index 089b6d9b14..7d28156a16 100644
--- a/src/components/Proposal/ProposalDateItem.vue
+++ b/src/components/Proposal/ProposalDateItem.vue
@@ -1,5 +1,5 @@
 <!--
-  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
@@ -21,7 +21,6 @@
 
 <script lang="ts">
 import type { ProposalDateInterface } from '@/types/proposals/proposalInterfaces'
-import { getTimezoneOffset } from '@/services/timezoneOffsetService'
 
 // types, object and stores
 import { t } from '@nextcloud/l10n'
@@ -29,6 +28,7 @@ import moment from '@nextcloud/moment'
 // icons
 import ItemIcon from 'vue-material-design-icons/Calendar'
 import DestroyIcon from 'vue-material-design-icons/Close'
+import { getTimezoneOffset } from '@/services/timezoneOffsetService'
 
 export default {
 	name: 'ProposalDateItem',

From f2b3915fb5c08bf53003f49ac2c32ade8b42dc68 Mon Sep 17 00:00:00 2001
From: taiebot <dedreuil@yahoo.fr>
Date: Wed, 8 Apr 2026 22:25:58 +0200
Subject: [PATCH 14/14] Fix eslint again

Signed-off-by: taiebot <dedreuil@yahoo.fr>
---
 src/components/Proposal/ProposalResponseMatrix.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Proposal/ProposalResponseMatrix.vue b/src/components/Proposal/ProposalResponseMatrix.vue
index 2dda1199b8..fff643fb4f 100644
--- a/src/components/Proposal/ProposalResponseMatrix.vue
+++ b/src/components/Proposal/ProposalResponseMatrix.vue
@@ -1,5 +1,5 @@
 <!--
-  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
@@ -140,7 +140,6 @@ import { Proposal, ProposalResponse } from '@/models/proposals/proposals'
 import { getTimezoneOffset } from '@/services/timezoneOffsetService'
 import { ProposalDateVote } from '@/types/proposals/proposalEnums'
 
-
 export default {
 	name: 'ProposalResponseMatrix',