From 1b0cf3e5c79fa2519ac1e6c3f86da701a018f5c8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 12 Aug 2021 16:09:27 +0200 Subject: [PATCH 1/2] Fix translations and formula display --- frontend/src/components/DecayInformation.vue | 2 +- frontend/src/locales/de.json | 25 +++++++++++-------- frontend/src/locales/en.json | 3 +++ .../AccountOverview/GdtTransactionList.vue | 20 ++++++++------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 513cb06a4..cb5ad402d 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -78,7 +78,7 @@ export default { computed: { decayStartBlockTextShort() { return this.decay.decay_start_block - ? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decay_start_block)) + ? this.$t('decay.decayStart') + this.$d(this.$moment.unix(this.decay.decay_start_block)) : '' }, duration() { diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4ad8d689f..d157b96cd 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -24,6 +24,7 @@ "calculation_decay":"Berechnung der Vergänglichkeit", "Starting_block_decay":"Startblock Vergänglichkeit", "decay_introduced":"Die Vergänglichkeit wurde Eingeführt am ", + "decayStart": " - Startblock für Vergänglichkeit am: ", "last_transaction":"Letzte Transaktion", "past_time":"Vergangene Zeit", "since_introduction":"seit Einführung der Vergänglichkeit", @@ -170,16 +171,18 @@ "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support." }, "gdt": { - "gdt-received":"Gradido Transform (GDT) erhalten", - "factor":"Faktor", - "conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)", - "calculation":"Berechnung der Gradido Transform", - "conversion":"Umrechnung", - "formula":"Berechungsformel", - "no-transactions":"Du hast zur Zeit keine Transaktionen", - "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt", - "gdt-receive":"Aktion", - "your-share":"Geworbenes Mitglied", - "contribution":"Beitrag" + "gdt-received":"Gradido Transform (GDT) erhalten", + "factor":"Faktor", + "raise": "Erhöhung", + "credit": "Gutschrift", + "conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)", + "calculation":"Berechnung der Gradido Transform", + "conversion":"Umrechnung", + "formula":"Berechungsformel", + "no-transactions":"Du hast zur Zeit keine Transaktionen", + "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt", + "gdt-receive":"Aktion", + "your-share":"Geworbenes Mitglied", + "contribution":"Beitrag" } } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d4339bcea..a9efa0639 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -24,6 +24,7 @@ "calculation_decay": "Calculation of Decay", "Starting_block_decay": "Starting Block Decay", "decay_introduced": "Decay was Introduced on", + "decayStart": " - Starting block for decay at: ", "last_transaction": "Last transaction:", "past_time": "Past time", "since_introduction": "Since the introduction of Decay", @@ -173,6 +174,8 @@ "gdt": { "gdt-received": "Gradido Transform (GDT) received", "factor": "Factor", + "raise": "Increase", + "credit": "Credit", "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)", "calculation": "Calculation of Gradido Transform", "conversion": "Conversion", diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index 83bd4c6ca..581208026 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -32,7 +32,7 @@
{{ $t('gdt.gdt-receive') }}
-
Gutschrift
+
{{ $t('gdt.credit') }}
{{ comment }}
@@ -43,7 +43,7 @@
{{ $t('gdt.your-share') }}
-
Gutschrift
+
{{ $t('gdt.credit') }}
5%
@@ -54,7 +54,7 @@
{{ $t('gdt.contribution') }}
-
Gutschrift
+
{{ $t('gdt.credit') }}
{{ $n(amount, 'decimal') }} €
@@ -103,13 +103,14 @@
-
{{ $t('gdt.factor') }}
+
{{ $t('gdt.raise') }}
{{ $t('gdt.conversion') }}
-
{{ factor }}
+
{{ factor * 100 }} %
- {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT + {{ $n(amount, 'decimal') }} GDT * {{ factor * 100 }} % = + {{ $n(gdt, 'decimal') }} GDT
@@ -123,12 +124,13 @@
{{ $t('gdt.factor') }}
-
{{ $t('gdt.formula') }}:
+
{{ $t('gdt.formula') }}
-
{{ factor }}
+
{{ factor }} GDT pro €
- {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT + {{ $n(amount, 'decimal') }} € * {{ factor }} GDT / € = + {{ $n(gdt, 'decimal') }} GDT
From 10f6925021b47fedf0cc5d9b5434c8043d07e0fe Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 12 Aug 2021 16:10:36 +0200 Subject: [PATCH 2/2] Release v1.3.1 --- CHANGELOG.md | 2 +- frontend/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d1be0173..74119cb33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -#### [1.3.0](https://github.com/gradido/gradido/compare/1.2.1...1.3.0) +#### [1.3.1](https://github.com/gradido/gradido/compare/1.2.1...1.3.1) - update code for correct transactions listening [`#725`](https://github.com/gradido/gradido/pull/725) - bugfix: change to new frontend passwort reset [`#724`](https://github.com/gradido/gradido/pull/724) diff --git a/frontend/package.json b/frontend/package.json index 76d2bef45..c80f164f8 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.3.0", + "version": "1.3.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 8726eb9ae..686968709 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.3.0", + "version": "1.3.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",