IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1755-insert-additional-set-when-redeeming

Browse Source
This commit is contained in:
Alexander Friedland 2022-04-12 16:24:19 +02:00 committed by GitHub
commit f9440a15cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/DecayInformations/CollapseLinksList.spec.js
View File

@ -9,6 +9,7 @@ const mocks = {
}, },
$tc: jest.fn((tc) => tc), $tc: jest.fn((tc) => tc),
$t: jest.fn((t) => t), $t: jest.fn((t) => t),
$d: jest.fn((d) => d),
} }
const propsData = { const propsData = {

1
frontend/src/components/TransactionLinks/TransactionLink.spec.js
View File

@ -13,6 +13,7 @@ const mocks = {
locale: 'en', locale: 'en',
}, },
$t: jest.fn((t) => t), $t: jest.fn((t) => t),
$d: jest.fn((d) => d),
$tc: jest.fn((tc) => tc), $tc: jest.fn((tc) => tc),
$apollo: { $apollo: {
mutate: mockAPIcall, mutate: mockAPIcall,

9
frontend/src/components/TransactionRows/DateRow.vue
View File

@ -8,7 +8,7 @@
</b-col> </b-col>
<b-col cols="7"> <b-col cols="7">
<div class="gdd-transaction-list-item-date"> <div class="gdd-transaction-list-item-date">
{{ dateString }} {{ $d(new Date(this.date), 'long') }}
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
@ -28,12 +28,5 @@ export default {
default: false, default: false,
}, },
}, },
computed: {
dateString() {
return this.diffNow
? this.$moment(this.date).locale(this.$i18n.locale).fromNow()
: this.$d(new Date(this.date), 'long')
},
},
} }
</script> </script>

1
frontend/src/components/Transactions/TransactionLinkSummary.spec.js
View File

@ -12,6 +12,7 @@ const mocks = {
locale: 'en', locale: 'en',
}, },
$t: jest.fn((t) => t), $t: jest.fn((t) => t),
$d: jest.fn((d) => d),
$tc: jest.fn((tc) => tc), $tc: jest.fn((tc) => tc),
$apollo: { $apollo: {
query: apolloQueryMock, query: apolloQueryMock,

2
frontend/src/locales/de.json
View File

@ -110,7 +110,7 @@
"link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.", "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
"link-overview": "Linkübersicht", "link-overview": "Linkübersicht",
"links_count": "Aktive Links", "links_count": "Aktive Links",
"links_sum": "Summe deiner versendeten Gradidos", "links_sum": "Offene Links und QR-Codes",
"no-account": "Du besitzt noch kein Gradido Konto?", "no-account": "Du besitzt noch kein Gradido Konto?",
"no-redeem": "Du darfst deinen eigenen Link nicht einlösen!", "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
"not-copied": "Konnte den Link nicht kopieren: {err}", "not-copied": "Konnte den Link nicht kopieren: {err}",

2
frontend/src/locales/en.json
View File

@ -110,7 +110,7 @@
"link-expired": "The link is no longer valid. The validity expired on {date}.", "link-expired": "The link is no longer valid. The validity expired on {date}.",
"link-overview": "Link overview", "link-overview": "Link overview",
"links_count": "Active links", "links_count": "Active links",
"links_sum": "Total of your sent Gradidos", "links_sum": "Open links and QR codes",
"no-account": "You don't have a Gradido account yet", "no-account": "You don't have a Gradido account yet",
"no-redeem": "You not allowed to redeem your own link!", "no-redeem": "You not allowed to redeem your own link!",
"not-copied": "Could not copy link: {err}", "not-copied": "Could not copy link: {err}",