From f9b5df87207cc9f8673a35a95ace7ae95d1fb717 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 20 Jan 2022 14:44:40 +0100 Subject: [PATCH] remove moment. localize datetime --- admin/src/locales/de.json | 1 + admin/src/locales/en.json | 1 + admin/src/pages/CreationConfirm.spec.js | 6 +----- admin/src/pages/CreationConfirm.vue | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index d3b87383a..202c5b635 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -2,6 +2,7 @@ "all_emails": "Alle Nutzer", "bookmark": "bookmark", "confirmed": "bestätigt", + "date": "Datum", "creation_form": { "creation_for": "Schöpfung für", "enter_text": "Text eintragen", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 517b69379..e171e7392 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -2,6 +2,7 @@ "all_emails": "All users", "bookmark": "Remember", "confirmed": "confirmed", + "date": "Date", "creation_form": { "creation_for": "Creation for", "enter_text": "Enter text", diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 14a71bb78..90e101184 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -38,6 +38,7 @@ const apolloMutateMock = jest.fn().mockResolvedValue({}) const mocks = { $t: jest.fn((t) => t), + $d: jest.fn((d) => d), $store: { commit: storeCommitMock, }, @@ -49,11 +50,6 @@ const mocks = { error: toastedErrorMock, success: toastedSuccessMock, }, - $moment: jest.fn((value) => { - return { - format: jest.fn((format) => value), - } - }), } describe('CreationConfirm', () => { diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 578c9b23f..829dc8fe4 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -37,9 +37,9 @@ export default { { key: 'memo', label: 'Text' }, { key: 'date', - label: 'Datum', + label: this.$t('date'), formatter: (value) => { - return this.$moment(value).format('ll') + return this.$d(new Date(value), 'short') }, }, { key: 'moderator', label: 'Moderator' },