From d3b14273e9fb9b9147489ba63d0483e441b94285 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 11 Aug 2021 17:13:40 +0200
Subject: [PATCH] step2

---
 frontend/src/components/DecayInformation.vue  | 12 +++++--
 frontend/src/locales/de.json                  |  3 +-
 frontend/src/locales/en.json                  |  3 +-
 .../AccountOverview/GddTransactionList.vue    |  4 +--
 .../AccountOverview/GdtTransactionList.vue    | 34 +++++++++----------
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 550fce3c3..8dd232994 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -43,11 +43,17 @@
               <div v-if="decay.decay_start_block > 0">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
                 <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
-                <span v-if="duration.months > 0">{{ duration.months }} {{ $t('decay.months') }},</span>
+                <span v-if="duration.months > 0">
+                  {{ duration.months }} {{ $t('decay.months') }},
+                </span>
                 <span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
                 <span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
-                <span v-if="duration.minutes > 0">{{ duration.minutes }} {{ $t('decay.minutes') }},</span>
-                <span v-if="duration.seconds > 0">{{ duration.seconds }} {{ $t('decay.seconds') }}</span>
+                <span v-if="duration.minutes > 0">
+                  {{ duration.minutes }} {{ $t('decay.minutes') }},
+                </span>
+                <span v-if="duration.seconds > 0">
+                  {{ duration.seconds }} {{ $t('decay.seconds') }}
+                </span>
               </span>
             </div>
           </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8f65a5d56..184a8cddf 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -176,6 +176,7 @@
      "calculation":"Berechnung der Gradido Transform",
      "conversion":"Umrechnung",
      "formula":"Berechungsformel",
-     "no-transactions":"Du hast zur Zeit keine Transaktionen"
+     "no-transactions":"Du hast zur Zeit keine Transaktionen",
+     "publisher":"Dein geworbenes Mitglied hat gespendet."
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 7cfffb8f4..96a9ec8f3 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -177,6 +177,7 @@
     "calculation": "Calculation of Gradido Transform",
     "conversion": "Conversion",
     "formula": "Calculation formula",
-    "no-transactions":"You currently have no transactions"
+    "no-transactions":"You currently have no transactions",
+    "publisher":"Your recruited member has donated."
  }
 }
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 76f372693..82646c943 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -24,8 +24,8 @@
                 {{ $t('form.memo') }}
               </small>
             </div>
-            <div  class="text-sm">
-           {{ $t('form.date') }}
+            <div class="text-sm">
+              {{ $t('form.date') }}
             </div>
             <div v-if="decay" class="text-sm pt-2">
               <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-3" />
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 36f52adde..5fdbe2ce2 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="gdt-transaction-list">
     <b-list-group>
-      <b-list-group-item v-if="transactionGdtCount === 0 ">{{ $t('gdt.no-transactions') }}</b-list-group-item>
+      <b-list-group-item v-if="transactionGdtCount === 0">
+        {{ $t('gdt.no-transactions') }}
+      </b-list-group-item>
       <b-list-group-item
         v-for="{
           id,
@@ -26,13 +28,13 @@
           <div class="font1_2em pr-2 text-right" style="width: 36%">
             <div>
               <div>
-                <div v-if="gdt_entry_type_id === 7">{{ $n(gdt, 'decimal') }} </div>
-                <div v-else>{{ $n(amount, 'decimal') }} </div>
+                <div v-if="gdt_entry_type_id === 7">{{ $n(gdt, 'decimal') }}</div>
+                <div v-else>{{ $n(amount, 'decimal') }}</div>
+              </div>
+
+              <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4">
+                {{ $n(gdt, 'decimal') }}
               </div>
-               
-              <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4">{{ $n(gdt, 'decimal') }}</div>
-               
-              
             </div>
 
             <div v-if="comment">
@@ -43,7 +45,6 @@
             <div v-if="date" class="text-sm">
               {{ $t('form.date') }}
             </div>
-           
           </div>
           <!-- Text Rechts -->
           <div class="font1_2em text-left pl-2" style="width: 55%">
@@ -61,8 +62,6 @@
             <div v-if="date" class="text-sm">
               {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
             </div>
-
-           
           </div>
           <!-- Collaps Toggle Button -->
           <div v-if="gdt_entry_type_id" class="text-right" style="width: 5%">
@@ -75,12 +74,11 @@
         <!-- Collaps Start -->
         <b-collapse v-if="gdt_entry_type_id" :id="'a' + date + ''" class="pb-4">
           <b-list-group style="border: 0px; background-color: #f1f1f1">
-            
             <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4" class="text-center pt-3">
               {{ $t('gdt.conversion-gdt-euro') }}
             </div>
             <div v-else-if="gdt_entry_type_id === 4" class="text-center pt-3">
-              Dein geworbenes Mitglied hat gespendet.  
+              {{ $t('gdt.publisher') }}
             </div>
             <div v-else class="text-center pt-3">
               {{ $t('gdt.calculation') }}
@@ -98,23 +96,23 @@
                 </div>
                 <div style="width: 60%">
                   <div>{{ factor }}</div>
-                  <div>{{ amount }} € * {{factor}} = {{ $n(gdt, 'decimal') }} GDT</div>
+                  <div>{{ amount }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT</div>
                 </div>
               </div>
             </b-list-group-item>
-            
+
             <b-list-group-item
               v-else-if="gdt_entry_type_id === 4"
               style="border: 0px; background-color: #f1f1f1"
-            >
-              
-            </b-list-group-item>
+            ></b-list-group-item>
 
             <!-- Only GDT -->
             <b-list-group-item v-else style="border: 0px; background-color: #f1f1f1">
               <div class="d-flex">
                 <div style="width: 40%" class="text-right pr-3 mr-2">{{ $t('gdt.formula') }}:</div>
-                <div style="width: 60%">{{ amount }} GDT * {{ factor }} = {{ $n(gdt, 'decimal') }}</div>
+                <div style="width: 60%">
+                  {{ amount }} GDT * {{ factor }} = {{ $n(gdt, 'decimal') }}
+                </div>
               </div>
             </b-list-group-item>
           </b-list-group>