Skip to content

Commit abd07eb

Browse files
committed
Format numbers according to configured locale.
1 parent cf53c66 commit abd07eb

6 files changed

Lines changed: 17 additions & 9 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "berlin-lea-performance-monitor",
3-
"version": "1.12.2",
3+
"version": "1.13.0",
44
"author": "David Leclerc",
55
"main": "./src/index.ts",
66
"scripts": {

src/models/graphs/EventPrevalenceOnWorkdaysGraph.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { equals, getRange, sum } from '../../utils/math';
55
import SessionHistory from '../sessions/SessionHistory';
66
import { isKnownEvent } from '../../utils/event';
77
import { generateEmptyCounts } from '../../utils/array';
8-
import { formatDate } from '../../utils/locale';
8+
import { formatDate, formatNumber } from '../../utils/locale';
99
import { LONG_DATE_TIME_FORMAT_OPTIONS } from '../../config/locale';
1010
import assert from 'assert';
1111
import { getEventColor } from '../../utils/styles';
@@ -26,7 +26,7 @@ class EventPrevalenceOnWorkdaysGraph extends Graph<SessionHistory> {
2626
this.title = [
2727
`Zweistündliche Prävalenz aller während User-Sessions erlebten Ereignisse an Werktagen auf der LEA-Seite`,
2828
`Start: ${formatDate(start, LONG_DATE_TIME_FORMAT_OPTIONS)} | Ende: ${formatDate(end, LONG_DATE_TIME_FORMAT_OPTIONS)}`,
29-
`Bucket-Größe: ${history.getBucketSize().format()} | Anzahl der Ereignissen: ${totalErrorCount}`,
29+
`Bucket-Größe: ${history.getBucketSize().format()} | Anzahl der Ereignissen: ${formatNumber(totalErrorCount)}`,
3030
];
3131

3232
await super.draw(history);

src/models/graphs/SessionAverageLengthGraph.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SessionHistory from '../sessions/SessionHistory';
22
import { WEEKDAYS } from '../../constants/times';
33
import { GraphAxes, Locale, TimeUnit } from '../../types';
4-
import { formatDate, translateWeekday } from '../../utils/locale';
4+
import { formatDate, formatNumber, translateWeekday } from '../../utils/locale';
55
import { getAverage } from '../../utils/math';
66
import Graph from './Graph';
77
import { ChartType, Color as ChartColor } from 'chart.js';
@@ -34,7 +34,7 @@ class SessionAverageLengthGraph extends Graph<SessionHistory> {
3434
this.title = [
3535
`Durchschnittliche Länge einer User-Session auf der LEA-Seite`,
3636
`Start: ${formatDate(start, LONG_DATE_TIME_FORMAT_OPTIONS)} | Ende: ${formatDate(end, LONG_DATE_TIME_FORMAT_OPTIONS)}`,
37-
`Anzahl der User-Sessions: ${sessionCount}`,
37+
`Anzahl der User-Sessions: ${formatNumber(sessionCount)}`,
3838
`Bucket-Größe: ${history.getBucketSize().format()}`,
3939
];
4040

src/models/graphs/SessionLengthGraph.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { getTimeSpentSinceMidnight } from '../../utils/time';
44
import SessionHistory from '../sessions/SessionHistory';
55
import { WEEKDAYS } from '../../constants/times';
66
import { GraphAxes, Locale, TimeUnit } from '../../types';
7-
import { formatDate, translateWeekday } from '../../utils/locale';
7+
import { formatDate, formatNumber, translateWeekday } from '../../utils/locale';
88
import CompleteSession from '../sessions/CompleteSession';
99
import { LONG_DATE_TIME_FORMAT_OPTIONS } from '../../config/locale';
1010
import { getWeekdayColor } from '../../utils/styles';
@@ -31,7 +31,7 @@ class SessionLengthGraph extends Graph<SessionHistory> {
3131
this.title = [
3232
`Länge einer User-Session auf der LEA-Seite`,
3333
`Start: ${formatDate(start, LONG_DATE_TIME_FORMAT_OPTIONS)} | Ende: ${formatDate(end, LONG_DATE_TIME_FORMAT_OPTIONS)}`,
34-
`Anzahl der User-Sessions: ${sessionCount}`,
34+
`Anzahl der User-Sessions: ${formatNumber(sessionCount)}`,
3535
];
3636

3737
await super.draw(history);

src/utils/locale.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ export const translateWeekday = (weekday: Weekday, locale: Locale) => {
2121
}
2222
}
2323

24+
export const formatNumberByLocale = (x: number, locale: Locale, options?: Intl.DateTimeFormatOptions) => {
25+
return x.toLocaleString(locale, options);
26+
}
27+
28+
export const formatNumber = (x: number, options?: Intl.DateTimeFormatOptions) => {
29+
return formatNumberByLocale(x, LOCALE, options);
30+
}
31+
2432
export const formatDateByLocale = (date: Date, locale: Locale, options?: Intl.DateTimeFormatOptions) => {
2533
return date.toLocaleString(locale, options);
2634
}

0 commit comments

Comments
 (0)