From efbb8a3bcbd8919f2bd5cf5cae95b3296f757d1c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 1 Apr 2022 14:31:14 +0200 Subject: [PATCH 1/2] localize dates --- frontend/src/pages/TransactionLink.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue index def8e2e7c..8fb1238b0 100644 --- a/frontend/src/pages/TransactionLink.vue +++ b/frontend/src/pages/TransactionLink.vue @@ -100,7 +100,7 @@ export default { if (this.linkData.deletedAt) { // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', { - date: this.linkData.deletedAt, + date: this.$d(new Date(this.linkData.deletedAt), 'long'), }) return `TEXT` } @@ -108,7 +108,7 @@ export default { if (new Date(this.linkData.validUntil) < new Date()) { // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.redeemedBoxText = this.$t('gdd_per_link.link-expired', { - date: this.linkData.validUntil, + date: this.$d(new Date(this.linkData.validUntil), 'long'), }) return `TEXT` } @@ -117,7 +117,7 @@ export default { if (this.linkData.redeemedAt) { // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', { - date: this.linkData.redeemedAt, + date: this.$d(new Date(this.linkData.redeemedAt), 'long'), }) return `TEXT` } From 5e1ddb718b6b0de6d79ecc73c3ab9010842f8a62 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 1 Apr 2022 14:48:34 +0200 Subject: [PATCH 2/2] fix tests --- frontend/src/pages/TransactionLink.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js index c0bab731d..abc86f0ef 100644 --- a/frontend/src/pages/TransactionLink.spec.js +++ b/frontend/src/pages/TransactionLink.spec.js @@ -38,6 +38,7 @@ apolloQueryMock.mockResolvedValue({ const mocks = { $t: jest.fn((t, obj = null) => (obj ? [t, obj.date].join('; ') : t)), + $d: jest.fn((d) => d.toISOString()), $store: { state: { token: null,