From 00c391e667736242e85ea22f3d958ce320e22189 Mon Sep 17 00:00:00 2001
From: tulex <tulex@pop-os.localdomain>
Date: Thu, 15 Jul 2021 17:10:35 +0200
Subject: [PATCH] fix bugs #630

---
 frontend/src/components/DecayInformation.vue  |  4 +--
 frontend/src/locales/de.json                  |  9 ++---
 frontend/src/locales/en.json                  |  5 +--
 .../GddSend/TransactionForm.vue               | 33 ++++++++-----------
 .../AccountOverview/GddTransactionList.vue    | 17 +++++++---
 frontend/src/views/Pages/ForgotPassword.vue   |  2 +-
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index c3f07c87b..65ed3aed3 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <span v-if="decaytyp === 'short'">
-      <small>{{ decay ? ' ' + decay.balance + ' ' + decayStartBlockTextShort : '' }}</small>
+      <small>{{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}</small>
     </span>
 
     <div v-if="decaytyp === 'new'">
@@ -28,7 +28,7 @@
                 </div>
               </div>
               <div>
-                <span>{{ $d($moment.unix(decay.decay_start), 'long') }} Uhr</span>
+                <span>{{ $d($moment.unix(decay.decay_start), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</span>
               </div>
             </div>
           </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 7de64ff6a..ce5a1fd41 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -8,7 +8,7 @@
   "reset": "Passwort zurücksetzen",
   "imprint":"Impressum",
   "privacy_policy":"Datenschutzerklärung",
-  "members_area": "Mitgliedsbereich",
+  "members_area": "Mitgliederbereich",
   "whitepaper": "Whitepaper",
   "back":"Zurück",
   "send":"Senden",
@@ -59,14 +59,15 @@
     "change": "ändern",
     "change-password": "Passwort ändern",
     "amount":"Betrag",
-    "memo":"Nachricht für den Empfänger",
+    "memo":"Nachricht",
     "message":"Nachricht",
     "date":"Datum",
     "from":"von",
     "to":"bis",
+    "to1":"an",
     "at":"am",
     "time":"Zeit",
-    "send_now":"Jetzt versenden",
+    "send_now":"Jetzt senden",
     "scann_code":"<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "max_gdd_info":"Maximale anzahl GDD zum versenden erreicht!",
     "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
@@ -113,7 +114,7 @@
     "password": {
       "title": "Passwort zurücksetzen",
       "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen.",
-      "reset_now": "Jetzt zurücksetzen"
+      "send_now": "Jetzt senden"
     },
     "thx": {
       "title": "Danke!",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ac75c90f0..afefe762d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -59,11 +59,12 @@
     "change": "change",
     "change-password": "Change password",
     "amount":"Amount",
-    "memo":"Message for the recipient",
+    "memo":"Message",
     "message":"Message",
     "date":"Date",
     "from":"from",
     "to":"to",
+    "to1":"to",
     "at":"at",
     "time":"Time",
     "send_now":"Send now",
@@ -113,7 +114,7 @@
     "password": {
       "title": "Reset password",
       "subtitle": "If you have forgotten your password, you can reset it here.",
-      "reset_now": "Reset now"
+      "send_now": "Send now"
     },
     "thx": {
       "title": "Thank you!",
diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
index 74a4a8de1..cc9587e75 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
@@ -21,11 +21,7 @@
                 }"
                 v-slot="{ errors }"
               >
-                <b-row>
-                  <b-col v-if="errors" class="text-right p-3 p-sm-1">
-                    <span v-for="error in errors" :key="error" class="errors">{{ error }}</span>
-                  </b-col>
-                </b-row>
+             
                 <label class="input-1" for="input-1">{{ $t('form.receiver') }}</label>
                 <b-input-group
                   id="input-group-1"
@@ -48,6 +44,9 @@
                     class="pl-3"
                   ></b-form-input>
                 </b-input-group>
+                  <b-col v-if="errors" class="text-right p-3 p-sm-1">
+                    <span v-for="error in errors" :key="error" class="errors">{{ error }}</span>
+                  </b-col>
               </validation-provider>
             </div>
 
@@ -61,12 +60,7 @@
                   gddSendAmount: [0.01, balance],
                 }"
                 v-slot="{ errors, valid }"
-              >
-                <b-row>
-                  <b-col v-if="errors" class="col-12 text-right p-3 p-sm-1">
-                    <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
-                  </b-col>
-                </b-row>
+              >              
                 <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
                 <b-input-group id="input-group-2" class="border border-default" size="lg">
                   <b-input-group-prepend class="p-2 d-none d-md-block">
@@ -85,6 +79,9 @@
                     class="pl-3"
                   ></b-form-input>
                 </b-input-group>
+                 <b-col v-if="errors" class="col-12 text-right p-3 p-sm-1">
+                    <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
+                  </b-col>
               </validation-provider>
             </div>
 
@@ -95,15 +92,10 @@
                   min: 5,
                   max: 150,
                 }"
-                :name="$t('form.memo')"
+                :name="$t('form.message')"
                 v-slot="{ errors }"
-              >
-                <b-row>
-                  <b-col v-if="errors" class="text-right p-3 p-sm-1">
-                    <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
-                  </b-col>
-                </b-row>
-                <label class="input-3" for="input-3">{{ $t('form.memo') }}</label>
+              >              
+                <label class="input-3" for="input-3">{{ $t('form.message') }}</label>
                 <b-input-group id="input-group-3" class="border border-default">
                   <b-input-group-prepend class="d-none d-md-block">
                     <b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
@@ -115,6 +107,9 @@
                     class="pl-3"
                   ></b-form-textarea>
                 </b-input-group>
+                 <b-col v-if="errors" class="text-right p-3 p-sm-1">
+                    <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
+                  </b-col>
               </validation-provider>
             </div>
 
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 35ff5c5bd..c9cd7653a 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -15,10 +15,14 @@
           <!-- Text Links -->
           <div class="font1_2em pr-2 text-right" style="width: 32%">
             <span>{{ getProperties(type).operator }}</span>
+          
             <small v-if="type === 'decay'">{{ $n(balance, 'decimal') }}</small>
 
             <span v-else>{{ $n(balance, 'decimal') }}</span>
-
+  <div><small >
+                  {{ $t('form.message') }}
+                </small>
+             </div>
             <div v-if="decay">
               <br />
               <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-3" />
@@ -27,10 +31,14 @@
           <!-- Text Rechts -->
           <div class="font1_2em text-left pl-2" style="width: 55%">
             {{ name ? name : '' }}
+             <div><small >
+                  {{ memo }}
+                </small>
+             </div>
             <span v-if="type === 'decay'">
               <small>{{ $t('decay.decay_since_last_transaction') }}</small>
             </span>
-            <div v-if="date" class="text-sm">{{ $d($moment(date), 'long') }}</div>
+            <div v-if="date" class="text-sm">{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</div>
             <decay-information v-if="decay" decaytyp="short" :decay="decay" />
           </div>
           <!-- Collaps Toggle Button -->
@@ -47,7 +55,8 @@
             <b-list-group-item style="border: 0px; background-color: #f1f1f1">
               <div class="d-flex">
                 <div style="width: 40%" class="text-right pr-3 mr-2">
-                  {{ type === 'receive' ? 'von:' : 'an:' }}
+                  {{ type === 'receive' ? $t('form.from') : $t('form.to1') }}:
+                    
                 </div>
                 <div style="width: 60%">
                   {{ name }}
@@ -56,7 +65,7 @@
               </div>
               <div class="d-flex">
                 <div style="width: 40%" class="text-right pr-3 mr-2">
-                  {{ type === 'receive' ? 'Nachricht:' : 'Nachricht:' }}
+                   {{$t('form.message')}}  
                 </div>
                 <div style="width: 60%">
                   {{ memo }}
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index a16ea2446..db4bf2e5e 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -22,7 +22,7 @@
                   <input-email v-model="form.email"></input-email>
                   <div class="text-center">
                     <b-button type="submit" variant="primary">
-                      {{ $t('site.password.reset_now') }}
+                      {{ $t('site.password.send_now') }}
                     </b-button>
                   </div>
                 </b-form>