Skip to content

Commit 895f828

Browse files
susnuxAndyScherzinger
authored andcommitted
fix(unified-search): make sure date range option is translated
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 486ef01 commit 895f828

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

core/src/components/UnifiedSearch/UnifiedSearchModal.vue

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150

151151
<script lang="ts">
152152
import { subscribe } from '@nextcloud/event-bus'
153-
import { translate as t } from '@nextcloud/l10n'
153+
import { getCanonicalLocale, t } from '@nextcloud/l10n'
154154
import { useBrowserLocation } from '@vueuse/core'
155155
import { defineComponent } from 'vue'
156156
import { getProviders, search as unifiedSearch, getContacts } from '../../services/UnifiedSearchService.js'
@@ -251,7 +251,13 @@ export default defineComponent({
251251
providerActionMenuIsOpen: false,
252252
dateActionMenuIsOpen: false,
253253
providerResultLimit: 5,
254-
dateFilter: { id: 'date', type: 'date', text: '', startFrom: null, endAt: null },
254+
dateFilter: {
255+
id: 'date',
256+
type: 'date',
257+
text: '',
258+
startFrom: null as Date | null,
259+
endAt: null as Date | null,
260+
},
255261
personFilter: { id: 'person', type: 'person', name: '' },
256262
filteredProviders: [],
257263
searching: false,
@@ -653,13 +659,22 @@ export default defineComponent({
653659
this.updateDateFilter()
654660
655661
},
662+
656663
setCustomDateRange(event) {
657664
unifiedSearchLogger.debug('Custom date range', { range: event })
658665
this.dateFilter.startFrom = event.startFrom
659666
this.dateFilter.endAt = event.endAt
660-
this.dateFilter.text = t('core', `Between ${this.dateFilter.startFrom.toLocaleDateString()} and ${this.dateFilter.endAt.toLocaleDateString()}`)
667+
this.dateFilter.text = t(
668+
'core',
669+
'Between {startDate} and {endDate}',
670+
{
671+
startDate: this.dateFilter.startFrom!.toLocaleDateString([getCanonicalLocale()]),
672+
endDate: this.dateFilter.endAt!.toLocaleDateString([getCanonicalLocale()]),
673+
},
674+
)
661675
this.updateDateFilter()
662676
},
677+
663678
handlePluginFilter(addFilterEvent) {
664679
unifiedSearchLogger.debug('Handling plugin filter', { addFilterEvent })
665680
for (let i = 0; i < this.filteredProviders.length; i++) {

0 commit comments

Comments
 (0)