luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GH-1080] Use current locale for date range (#1575)

Browse source 
This uses the currently configured locale to compute the value of date
range table aggregations. Previously, it would fall back to the browser
locale (or English) and ignore the locale configured in Focalboard
itself.

Relates to: #1080

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Johannes Marbach 2021-10-18 21:17:08 +02:00 committed by GitHub
parent 85ffb63b91
commit 14634fd4e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/components/calculations/calculations.ts
View file

@ -282,7 +282,7 @@ function getTimestampsFromPropertyValue(value: number | string | string[]): numb
return []
}
function dateRange(cards: readonly Card[], property: IPropertyTemplate): string {
function dateRange(cards: readonly Card[], property: IPropertyTemplate, intl: IntlShape): string {
const resultEarliest = earliestEpoch(cards, property)
if (resultEarliest === Number.POSITIVE_INFINITY) {
return ''
@ -291,7 +291,7 @@ function dateRange(cards: readonly Card[], property: IPropertyTemplate): string
if (resultLatest === Number.NEGATIVE_INFINITY) {
return ''
}
return moment.duration(resultLatest - resultEarliest, 'milliseconds').humanize()
return moment.duration(resultLatest - resultEarliest, 'milliseconds').locale(intl.locale.toLowerCase()).humanize()
}
const Calculations: Record<string, (cards: readonly Card[], property: IPropertyTemplate, intl: IntlShape) => string> = {