Skip to content

fix(settings): replace Moment with localized date and time composables #66029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(settings): replace Moment with localized date and time composables #66029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4fdc58
fix(settings): use localized relative time for background jobs
joshtrichards Oct 30, 2026
9ef4009
fix(settings): use locale-aware formatting for locale example
joshtrichards Oct 30, 2026
62787b9
chore(settings): lint happiness fixup for backgroundjob
joshtrichards Oct 30, 2026
03c7017
chore(settings): lint happiness fixup for localesection
joshtrichards Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions apps/settings/src/components/BasicSettings/BackgroundJob.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
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 { useFormatRelativeTime } from '@nextcloud/vue/composables/useFormatDateTime'
import logger from '../../logger.ts'

const lastCron = loadState('settings', 'lastCron')
Expand All @@ -93,6 +93,13 @@ export default {
NcNoteCard,
},

setup() {
return {
relativeTime: useFormatRelativeTime(lastCron * 1000),
maxAgeRelativeTime: useFormatRelativeTime(cronMaxAge * 1000),
}
},

data() {
return {
lastCron,
Expand All @@ -101,8 +108,6 @@ export default {
cliBasedCronPossible,
cliBasedCronUser,
backgroundJobsDocUrl,
relativeTime: moment(lastCron * 1000).fromNow(),
maxAgeRelativeTime: moment(cronMaxAge * 1000).fromNow(),
}
},

Expand Down
39 changes: 17 additions & 22 deletions apps/settings/src/components/PersonalInfo/LocaleSection/LocaleSectionEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +24,8 @@
</template>

<script>
import moment from '@nextcloud/moment'
import { useNow } from '@vueuse/core'
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'
Expand Down Expand Up @@ -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'),
},
}
},

Expand All @@ -80,14 +90,6 @@ export default {
},
},

mounted() {
this.intervalId = window.setInterval(this.refreshExample, 1000)
},

beforeDestroy() {
window.clearInterval(this.intervalId)
},

methods: {
async updateLocale(locale) {
try {
Expand All @@ -113,13 +115,6 @@ export default {
handleError(error, errorMessage)
}
},

refreshExample() {
this.example = {
date: moment().format('L'),
time: moment().format('LTS'),
}
},
},
}
</script>
Expand Down
Loading