From a4fdc582c3908f8457d705a6a45d89739e6461db Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Thu, 29 Oct 2026 21:54:51 -0400
Subject: [PATCH 1/4] fix(settings): use localized relative time for background
 jobs

Moments uses the locale instead of the language for localization. Replace Moment formatting in BackgroundJob with Nextcloud Vue's useFormatRelativeTime composable.

Fixes #45069
Fixes https://github.com/nextcloud-libraries/nextcloud-moment/issues/1061

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 .../src/components/BasicSettings/BackgroundJob.vue     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
index 1f14bf579d07c..bd4a520ca28fe 100644
--- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue
+++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
@@ -76,6 +76,7 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
 import logger from '../../logger.ts'
+import { useFormatRelativeTime } from '@nextcloud/vue/composables/useFormatDateTime'
 
 const lastCron = loadState('settings', 'lastCron')
 const cronMaxAge = loadState('settings', 'cronMaxAge', '')
@@ -93,6 +94,13 @@ export default {
 		NcNoteCard,
 	},
 
+	setup() {
+		return {
+			relativeTime: useFormatRelativeTime(lastCron * 1000),
+			maxAgeRelativeTime: useFormatRelativeTime(cronMaxAge * 1000),
+		}
+	},
+
 	data() {
 		return {
 			lastCron,
@@ -101,8 +109,6 @@ export default {
 			cliBasedCronPossible,
 			cliBasedCronUser,
 			backgroundJobsDocUrl,
-			relativeTime: moment(lastCron * 1000).fromNow(),
-			maxAgeRelativeTime: moment(cronMaxAge * 1000).fromNow(),
 		}
 	},
 

From 9ef4009b59f6aee31dfb26961d866d8a843778dc Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Fri, 30 Oct 2026 08:20:17 -0400
Subject: [PATCH 2/4] fix(settings): use locale-aware formatting for locale
 example

Replace Moment with useFormatTime to format the example using the current user's locale. Use useNow to preserve one-second updates and automatically clean up the timer on unmount.

Closes #45069

Assisted-by: Copilot:gpt-6.1-sol

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 .../LocaleSection/LocaleSectionEntry.vue      | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue b/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
index 00a6cdec23e2f..c1d7145d078aa 100644
--- a/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
+++ b/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
@@ -6,7 +6,8 @@
 <template>
 	<div class="locale">
 		<p class="locale__example">
-			{{ t('settings', 'Example: {example}', { example: `${example.date} ${example.time}` }) }}
+			{{ t('settings', 'Example: {example}', { example }) }}
+
 		</p>
 
 		<NcSelect
@@ -23,8 +24,9 @@
 </template>
 
 <script>
-import moment from '@nextcloud/moment'
+import { useNow } from '@vueuse/core'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
+import { useFormatTime } from '@nextcloud/vue/composables/useFormatDateTime'
 import { ACCOUNT_SETTING_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstants.js'
 import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService.js'
 import { handleError } from '../../../utils/handlers.ts'
@@ -58,14 +60,22 @@ export default {
 		},
 	},
 
+	setup() {
+		const now = useNow({ interval: 1000 })
+
+		return {
+			example: useFormatTime(now, {
+				format: {
+					dateStyle: 'short',
+					timeStyle: 'medium',
+				},
+			}),
+		}
+	},
+
 	data() {
 		return {
 			initialLocale: this.locale,
-			intervalId: 0,
-			example: {
-				date: moment().format('L'),
-				time: moment().format('LTS'),
-			},
 		}
 	},
 
@@ -80,14 +90,6 @@ export default {
 		},
 	},
 
-	mounted() {
-		this.intervalId = window.setInterval(this.refreshExample, 1000)
-	},
-
-	beforeDestroy() {
-		window.clearInterval(this.intervalId)
-	},
-
 	methods: {
 		async updateLocale(locale) {
 			try {
@@ -113,13 +115,6 @@ export default {
 				handleError(error, errorMessage)
 			}
 		},
-
-		refreshExample() {
-			this.example = {
-				date: moment().format('L'),
-				time: moment().format('LTS'),
-			}
-		},
 	},
 }
 </script>

From 62787b93cd192ff8d7d0c699e853fae9fec04828 Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Fri, 30 Oct 2026 09:55:44 -0400
Subject: [PATCH 3/4] chore(settings): lint happiness fixup for backgroundjob

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 apps/settings/src/components/BasicSettings/BackgroundJob.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
index bd4a520ca28fe..f865869c77841 100644
--- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue
+++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
@@ -69,14 +69,13 @@
 import axios from '@nextcloud/axios'
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
-import moment from '@nextcloud/moment'
 import { confirmPassword } from '@nextcloud/password-confirmation'
 import { generateOcsUrl } from '@nextcloud/router'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
-import logger from '../../logger.ts'
 import { useFormatRelativeTime } from '@nextcloud/vue/composables/useFormatDateTime'
+import logger from '../../logger.ts'
 
 const lastCron = loadState('settings', 'lastCron')
 const cronMaxAge = loadState('settings', 'cronMaxAge', '')

From 03c7017be2e569a661b9799f99e1657120030c73 Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Fri, 30 Oct 2026 09:57:04 -0400
Subject: [PATCH 4/4] chore(settings): lint happiness fixup for localesection

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 .../PersonalInfo/LocaleSection/LocaleSectionEntry.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue b/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
index c1d7145d078aa..11fe48a0fbaea 100644
--- a/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
+++ b/apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
@@ -25,8 +25,8 @@
 
 <script>
 import { useNow } from '@vueuse/core'
-import NcSelect from '@nextcloud/vue/components/NcSelect'
 import { useFormatTime } from '@nextcloud/vue/composables/useFormatDateTime'
+import NcSelect from '@nextcloud/vue/components/NcSelect'
 import { ACCOUNT_SETTING_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstants.js'
 import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService.js'
 import { handleError } from '../../../utils/handlers.ts'