Merge pull request #727 from gradido/release-fix

fix: Translations and Formula Display

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)

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",

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() {

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"
   }
 }

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",

frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue

@@ -32,7 +32,7 @@
           <b-row v-if="gdt_entry_type_id === 7">
             <div class="col-6 text-right">
               <div>{{ $t('gdt.gdt-receive') }}</div>
-              <div>Gutschrift</div>
+              <div>{{ $t('gdt.credit') }}</div>
             </div>
             <div class="col-6">
               <div>{{ comment }}</div>
@@ -43,7 +43,7 @@
           <b-row v-else-if="gdt_entry_type_id === 4">
             <div class="col-6 text-right">
               <div>{{ $t('gdt.your-share') }}</div>
-              <div>Gutschrift</div>
+              <div>{{ $t('gdt.credit') }}</div>
             </div>
             <div class="col-6">
               <div>5%</div>
@@ -54,7 +54,7 @@
           <b-row v-else>
             <div class="col-6 text-right">
               <div>{{ $t('gdt.contribution') }}</div>
-              <div>Gutschrift</div>
+              <div>{{ $t('gdt.credit') }}</div>
             </div>
             <div class="col-6">
               <div>{{ $n(amount, 'decimal') }} €</div>
@@ -103,13 +103,14 @@
             <!-- 7 nur GDT erhalten -->
             <b-row class="gdt-list-clooaps-box-7" v-if="gdt_entry_type_id == 7">
               <div class="col-6 text-right clooaps-col-left">
-                <div>{{ $t('gdt.factor') }}</div>
+                <div>{{ $t('gdt.raise') }}</div>
                 <div>{{ $t('gdt.conversion') }}</div>
               </div>
               <div class="col-6 clooaps-col-right">
-                <div>{{ factor }}</div>
+                <div>{{ factor * 100 }} %</div>
                 <div>
-                  {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
+                  {{ $n(amount, 'decimal') }} GDT * {{ factor * 100 }} % =
+                  {{ $n(gdt, 'decimal') }} GDT
                 </div>
               </div>
             </b-row>
@@ -123,12 +124,13 @@
             <b-row class="gdt-list-clooaps-box--all" v-else>
               <div class="col-6 text-right clooaps-col-left">
                 <div>{{ $t('gdt.factor') }}</div>
-                <div>{{ $t('gdt.formula') }}:</div>
+                <div>{{ $t('gdt.formula') }}</div>
               </div>
               <div class="col-6 clooaps-col-right">
-                <div>{{ factor }}</div>
+                <div>{{ factor }} GDT pro €</div>
                 <div>
-                  {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
+                  {{ $n(amount, 'decimal') }} € * {{ factor }} GDT / € =
+                  {{ $n(gdt, 'decimal') }} GDT
                 </div>
               </div>
             </b-row>

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",