diff --git a/ui/src/utils/formatters.js b/ui/src/utils/formatters.js index d257ac73..25daa33d 100644 --- a/ui/src/utils/formatters.js +++ b/ui/src/utils/formatters.js @@ -25,7 +25,7 @@ export const formatDuration = (d) => { return `${days > 0 ? days + ':' : ''}${f}` } -export const formatFullDate = (date) => { +export const formatFullDate = (date, locale) => { const dashes = date.split('-').length - 1 let options = { year: 'numeric', @@ -36,5 +36,5 @@ export const formatFullDate = (date) => { if (dashes > 2 || (dashes === 0 && date.length > 4)) { return '' } - return new Date(date).toLocaleDateString(undefined, options) + return new Date(date).toLocaleDateString(locale, options) } diff --git a/ui/src/utils/formatters.test.js b/ui/src/utils/formatters.test.js index 610143ff..b3e898ed 100644 --- a/ui/src/utils/formatters.test.js +++ b/ui/src/utils/formatters.test.js @@ -33,17 +33,10 @@ describe('formatDuration', () => { }) describe('formatFullDate', () => { - beforeAll(() => { - const toLocaleString = Date.prototype.toLocaleString - // eslint-disable-next-line no-extend-native - Date.prototype.toLocaleString = function (locale = 'en-US', ...args) { - return toLocaleString.call(this, locale, ...args) - } - }) - it('format bytes', () => { - expect(formatFullDate('2011')).toEqual('2011') - expect(formatFullDate('2011-06')).toEqual('Jun 2011') - expect(formatFullDate('1985-01-01')).toEqual('Jan 1, 1985') + it('format dates', () => { + expect(formatFullDate('2011', 'en-US')).toEqual('2011') + expect(formatFullDate('2011-06', 'en-US')).toEqual('Jun 2011') + expect(formatFullDate('1985-01-01', 'en-US')).toEqual('Jan 1, 1985') expect(formatFullDate('199704')).toEqual('') }) })