Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list

frontend/src/components/DecayInformations/CollapseLinksList.spec.js

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

frontend/src/components/TransactionLinks/TransactionLink.spec.js

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

frontend/src/components/TransactionRows/DateRow.vue

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

frontend/src/components/Transactions/TransactionLinkSummary.spec.js

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

frontend/src/locales/de.json

@@ -109,7 +109,7 @@
     "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
     "link-overview": "Linkübersicht",
     "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-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
     "not-copied": "Konnte den Link nicht kopieren: {err}",

frontend/src/locales/en.json

@@ -109,7 +109,7 @@
     "link-expired": "The link is no longer valid. The validity expired on {date}.",
     "link-overview": "Link overview",
     "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-redeem": "You not allowed to redeem your own link!",
     "not-copied": "Could not copy link: {err}",