IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Respect hour12 settings when formatting local date (#33679)

Browse Source 
* Respect hour12 settings when formatting local date
This commit is contained in:
Alex Shpak 2021-07-06 14:09:19 +02:00 committed by GitHub
parent cc4d301d50
commit b5cdf5fdd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/grafana-data/src/datetime/formats.test.ts
View File

@ -14,6 +14,25 @@ describe('Date Formats', () => {
''
);
expect(format).toBe('MM/DD/YYYY, HH:mm:ss A');
expect(format).toBe('MM/DD/YYYY, hh:mm:ss A');
});
});
describe('Date Formats without hour12', () => {
it('localTimeFormat', () => {
const format = localTimeFormat(
{
year: '2-digit',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
hour12: false,
},
''
);
expect(format).toBe('MM/DD/YYYY, HH:mm:ss');
});
});

7
packages/grafana-data/src/datetime/formats.ts
View File

@ -97,12 +97,15 @@ export function localTimeFormat(
}
// https://momentjs.com/docs/#/displaying/format/
const parts = new Intl.DateTimeFormat(locale, options).formatToParts(new Date());
const dateTimeFormat = new Intl.DateTimeFormat(locale, options);
const parts = dateTimeFormat.formatToParts(new Date());
const hour12 = dateTimeFormat.resolvedOptions().hour12;
const mapping: { [key: string]: string } = {
year: 'YYYY',
month: 'MM',
day: 'DD',
hour: 'HH',
hour: hour12 ? 'hh' : 'HH',
minute: 'mm',
second: 'ss',
weekday: 'ddd',