fix-locale-list

frontend/src/locales/de.json

@@ -1,13 +1,14 @@
 {
   "message": "hallo gradido !!",
   "welcome":"Willkommen!",
+  "community": "Gemeinschaft",
   "logout":"Abmelden",
   "login":"Login",
   "signup": "Registrieren",
   "imprint":"Impressum",
   "privacy_policy":"Datenschutzerklärung",
   "back":"Zurück",
-  "sent":"Senden",
+  "send":"Senden",
   "transactions":"Transaktionen",
   "language":"Language",
   "languages":{
@@ -15,7 +16,11 @@
     "en": "English"
   },
   "form": {
+    "attention": "<strong>Achtung!</strong> Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.",
     "cancel":"Abbrechen",
+    "close":"schließen",
+    "receiver":"Empfänger",
+    "sender":"Absender",
     "firstname":"Vorname",
     "lastname":"Nachname",
     "email":"eMail",
@@ -23,13 +28,19 @@
     "password":"Passwort",
     "password_repeat":"Passwort wiederholen",
     "amount":"Betrag",
-    "memo":"Info",
+    "memo":"Nachricht für den Empfänger",
     "message":"Nachricht",
     "date":"Datum",
     "from":"von",
     "to":"bis",
     "at":"am",
-    "send_now":"Jetzt versenden"
+    "time":"Zeit",
+    "send_now":"Jetzt versenden",
+    "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!",
+    "thx":"Danke!",
+    "send_success":"Deine Zahlung wurde erfolgreich versendet."
   },
   "transaction":{
     "show_part": "Die letzten <strong>{count}</strong> Transaktionen",
@@ -60,46 +71,39 @@
       "title": "Danke!",
       "subtitle": "Wir haben dir eine eMail gesendet."
     },
-      "overview":{
+    "overview":{
-        "account_overview":"Kontoübersicht",
+      "account_overview":"Kontoübersicht",
-        "since_last_month": "seid letzten Monat",
+      "since_last_month": "seid letzten Monat",
-        "send_gradido":"Gradido versenden",
+      "send_gradido":"Gradido versenden",
-        "add_work":"neuer Gemeinschaftsbeitrag"
+      "add_work":"neuer Gemeinschaftsbeitrag"
-      },
+    },
-      "navbar" : {
+    "profil": {
-        "my-profil":"Mein Profil",
+      "transactions":"transactions",
-        "settings":"Einstellungen",
+      "activity": {
-        "activity":"Aktivität",
+        "chart":"Gemeinschaftsstunden Chart",
-        "support":"Support"
+        "new":"Neue Gemeinschaftsstunden eintragen",
-      },
+        "list":"Meine Gemeinschaftsstunden Liste"
-      "sidebar" : {
+      }      
-         "community":"Gemeinschaft",
+    },
-         "members_area":"Mitgliederbereich",
+    "navbar" : {
-         "membership":"Mitgliedschaft",
+      "my-profil":"Mein Profil",
-         "language":"Sprachen"
+      "settings":"Einstellungen",
-      },
+      "activity":"Aktivität",
-      "landing1" : {
+      "support":"Support"
-        "explore": "Erkunden Sie Gradido",
+    },
-        "text": "Gesundes Geld für eine gesunde Welt — Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
+    "404" : {
-        "link": "Seiten erkunden"
+      "ooops" : "Ooops!",
-      },
+      "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
-      "404" : {
+      "back" : "Zurück zur Übersicht!"
-         "ooops" : "Ooops!",
-         "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
-         "back" : "Zurück zur Übersicht!"
-      }
-  },
-  "admin": {
-    "site": {
-      "overview": {
-        "created": "Schöpfen",
-        "transience" : "Transience",
-        "exchanged": "Exchanged",
-        "members" : "Members"
-      }
     }
   },
-  "nav": {
+  "communitys":{
-    "features": "Neuigkeiten"
+    "form":{
+      "hours":"Stunden",
+      "date_period":"Datum / Zeitraum",
+      "more_hours":"weitere Stunden",
+      "submit":"Einreichen",
+      "hours_report":"Stundenbericht"
+    }
   }
 }

frontend/src/locales/en.json

@@ -1,13 +1,14 @@
 {
   "message": "hello gradido !!",
   "welcome":"Welcome!",
+  "community": "Gemeinschaft",
   "logout":"Logout",
   "login":"Login",
   "signup": "Sign up",
   "imprint":"Legal notice",
   "privacy_policy":"Privacy policy",
   "back":"Back",
-  "sent":"Send",
+  "send":"Send",
   "transactions":"Transactions",
   "language":"Sprache",
   "languages":{
@@ -15,7 +16,11 @@
     "en": "English"
   },
   "form": {
+    "attention": "Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.",
     "cancel":"Cancel",
+    "close":"Close",
+    "receiver":"Receiver",
+    "sender":"Sender",
     "firstname":"Firstname",
     "lastname":"Lastname",
     "email":"Email",
@@ -23,14 +28,19 @@
     "password":"Password",
     "password_repeat":"Repeat password",
     "amount":"Amount",
-    "memo":"Memo",
+    "memo":"Message for the recipient",
     "message":"Message",
     "date":"Date",
     "from":"from",
     "to":"to",
     "at":"at",
     "time":"Time",
-    "send_now":"Send now"
+    "send_now":"Send now",
+    "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!",
+    "thx":"THX",
+    "send_success":"Deine Zahlung wurde erfolgreich versendet."
   },
   "transaction":{
     "show_part": "The last <strong>{count}</strong> transactions",
@@ -67,40 +77,33 @@
       "send_gradido":"Send Gradido",
       "add_work":"New Community Contribution"
     },
+    "profil": {
+      "transactions":"transactions",
+      "activity": {
+        "chart":"Community Hours Chart",
+        "new":"Register new community hours",
+        "list":"My Community Hours List"
+      }      
+    },
     "navbar" : {
       "my-profil":"My profile",
       "settings":"Settings",
       "activity":"Activity",
       "support":"Support"
     },
-    "sidebar" : {
-      "community":"Community",
-      "members_area":"Members area",
-      "membership":"Membership",
-      "language":"Languages"
-    },
-    "landing1" : {
-      "explore":"Explore Gradido",
-      "text":"Healthy money for a healthy world — the Gradido model can create global prosperity and peace",
-      "link":"Explore pages"
-    },
     "404" : {
       "ooops" : "Ooops!",
       "text" : "Page not found. Do not worry though, we have plenty of other pages to explore",
       "back" : "Back to dashboard!"
     }    
   },
-  "admin": {
+  "communitys":{
-    "site": {
+    "form":{
-      "overview": {
+      "hours":"hours",
-        "creation": "Creation",
+      "date_period":"Date / Period",
-        "transience" : "Transience",
+      "more_hours":"more hours",
-        "exchanged": "Exchanged",
+      "submit":"submit",
-        "members" : "Members"
+      "hours_report":"Hourly report"
-      }
     }
-  },
-  "nav": {
-    "features": "Features"
   }
 }

frontend/src/routes/routes.js

@@ -6,7 +6,7 @@ import AuthLayout from '@/views/Layout/AuthLayout.vue'
 
 const routes = [
   {
-    path: '/',
+    path: '/login',
     redirect: 'login',
     component: AuthLayoutGDD,
     children: [
@@ -34,7 +34,7 @@ const routes = [
     ],
   },
   {
-    path: '/',
+    path: '/overview',
     redirect: 'overview',
     component: DashboardLayout,
     children: [

frontend/src/store/store.js

@@ -153,15 +153,14 @@ export const store = new Vuex.Store({
         state.ajaxCreateData.amount,
         state.ajaxCreateData.memo,
       )
-      console.log(result)
+      //console.log(result)
 
       if (result.success) {
-         console.log('send success')
+        //console.log('send success')
       } else {
-         console.log('send error')
+        //console.log('send error')
       }
       return result
-     
     },
     ajaxListTransactions: async ({ commit, dispatch, state }) => {
       // console.log('action: ajaxListTransactions', state.session_id)

frontend/src/views/KontoOverview/GddAddWork2.vue

@@ -4,7 +4,7 @@
       <b-tab :title="names.thisMonth" active>
         <b-row>
           <b-col lg="3">
-            <base-input label="Stunden">
+            <base-input :label="$t('communitys.form.hours')">
               <b-form-input
                 type="number"
                 size="lg"
@@ -12,7 +12,7 @@
                 style="font-size: xx-large; padding-left: 5px"
               />
             </base-input>
-            <base-input label="Datum / Zeitraum">
+            <base-input :label="$t('communitys.form.date_period')">
               <flat-pickr
                 class="form-control"
                 v-model="date"
@@ -22,7 +22,7 @@
             </base-input>
           </b-col>
           <b-col lg="9">
-            <base-input label="Arbeitsreport">
+            <base-input :label="$t('communitys.form.hours_report')">
               <textarea
                 class="form-control"
                 rows="5"
@@ -37,10 +37,14 @@
         </b-row>
         <b-row>
           <b-col md="6">
-            <b-button @click.prevent="newWorkForm" variant="warning">+ weitere Stunden</b-button>
+            <b-button @click.prevent="newWorkForm" variant="warning">
+              + {{ $t('communitys.form.more_hours') }}
+            </b-button>
           </b-col>
           <b-col md="6" class="text-right">
-            <b-button variant="success" @click.prevent="submitForm2">Einreichen, absenden</b-button>
+            <b-button variant="success" @click.prevent="submitForm2">
+              {{ $t('communitys.form.submit') }}
+            </b-button>
           </b-col>
         </b-row>
       </b-tab>

frontend/src/views/KontoOverview/GddSend.vue

@@ -2,22 +2,17 @@
   <div>
     <b-row v-show="$store.state.row_form">
       <b-col xl="12" md="12">
-        <b-alert variant="warning" show dismissible>
+        <b-alert variant="warning" show dismissible v-html="$t('form.attention')"></b-alert>
-          <strong>Achtung!</strong>
-          Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine
-          Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.
-        </b-alert>
         <b-card class="p-0 p-md-3" style="background-color: #ebebeba3 !important">
           <b-alert show variant="secondary">
-            <span class="alert-text">
+            <span class="alert-text" v-html="$t('form.scann_code')"></span>
-              <strong>QR Code Scanner</strong>
-              - Scanne den QR Code deines Partners
-            </span>
             <b-col v-show="!scan" lg="12" class="text-right">
               <img src="/img/icons/gradido/qr-scan-pure.png" height="50" @click="scan = true" />
             </b-col>
             <b-alert v-show="scan" show variant="warning">
-              <span class="alert-text" @click="scan = false"><strong>schließen!</strong></span>
+              <span class="alert-text" @click="scan = false">
+                <strong>{{ $t('form.cancel') }}</strong>
+              </span>
             </b-alert>
             <div v-if="scan">
               <!-- <b-row>                                          
@@ -30,10 +25,7 @@
                 <b-row>
                   <b-col lg="8">
                     <b-alert show variant="secondary">
-                      <span class="alert-text">
+                      <span class="alert-text" v-html="$t('form.scann_code')"></span>
-                        <strong>QR Code Scanner</strong>
-                        - Scanne den QR Code deines Partners
-                      </span>
                     </b-alert>
                   </b-col>
                 </b-row>
@@ -54,7 +46,7 @@
               </div>
               <br />
               <div>
-                <b-col class="text-left p-3 p-sm-1">Empfänger</b-col>
+                <b-col class="text-left p-3 p-sm-1">{{ $t('form.receiver') }}</b-col>
 
                 <b-input-group
                   id="input-group-1"
@@ -80,9 +72,9 @@
               </div>
               <br />
               <div>
-                <b-col class="text-left p-3 p-sm-1">Betrag</b-col>
+                <b-col class="text-left p-3 p-sm-1">{{ $t('form.amount') }}</b-col>
                 <b-col v-if="$store.state.user.balance == form.amount" class="text-right">
-                  <b-badge variant="primary">maximale anzahl GDD zum versenden erreicht!</b-badge>
+                  <b-badge variant="primary">{{ $t('form.max_gdd_info') }}</b-badge>
                 </b-col>
                 <b-input-group
                   id="input-group-2"
@@ -105,7 +97,7 @@
                     style="font-size: xx-large; padding-left: 20px"
                   ></b-form-input>
                 </b-input-group>
-                <b-col class="text-left p-3 p-sm-1">Nachricht für den Empfänger</b-col>
+                <b-col class="text-left p-3 p-sm-1">{{ $t('form.memo') }}</b-col>
 
                 <b-input-group>
                   <b-input-group-prepend class="p-3 d-none d-md-block">
@@ -142,34 +134,37 @@
     </b-row>
     <b-row v-show="$store.state.row_check">
       <b-col>
-        <div class="display-4 p-4">Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!</div>
+        <div class="display-4 p-4">{{ $t('form.send_check') }}</div>
 
         <b-list-group>
-          <b-list-group-item active>Meine Zahlung</b-list-group-item>
           <b-list-group-item class="d-flex justify-content-between align-items-center">
             {{ $store.state.ajaxCreateData.email }}
-            <b-badge variant="primary" pill>Empfänger</b-badge>
+            <b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
           </b-list-group-item>
 
           <b-list-group-item class="d-flex justify-content-between align-items-center">
             {{ $store.state.ajaxCreateData.amount }} GDD
-            <b-badge variant="primary" pill>Betrag</b-badge>
+            <b-badge variant="primary" pill>{{ $t('form.amount') }}</b-badge>
           </b-list-group-item>
 
           <b-list-group-item class="d-flex justify-content-between align-items-center">
             {{ $store.state.ajaxCreateData.memo }}
-            <b-badge variant="primary" pill>Nachricht</b-badge>
+            <b-badge variant="primary" pill>{{ $t('form.message') }}</b-badge>
           </b-list-group-item>
           <b-list-group-item class="d-flex justify-content-between align-items-center">
             {{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
-            <b-badge variant="primary" pill>Datum</b-badge>
+            <b-badge variant="primary" pill>{{ $t('form.date') }}</b-badge>
           </b-list-group-item>
         </b-list-group>
         <hr />
         <b-row>
-          <b-col><b-button @click="onReset">abbrechen</b-button></b-col>
+          <b-col>
+            <b-button @click="onReset">{{ $t('form.cancel') }}</b-button>
+          </b-col>
           <b-col class="text-right">
-            <b-button variant="success" @click="sendTransaction">jetzt versenden</b-button>
+            <b-button variant="success" @click="sendTransaction">
+              {{ $t('form.send_now') }}
+            </b-button>
           </b-col>
         </b-row>
       </b-col>
@@ -177,12 +172,12 @@
     <b-row v-show="$store.state.row_thx">
       <b-col>
         <div class="display-1 p-4">
-          Danke
+          {{ $t('form.thx') }}
           <hr />
-          Deine Zahlung wurde erfolgreich versendet.
+          {{ $t('form.send_success') }}
         </div>
 
-        <b-button variant="success" @click="onReset">schließen</b-button>
+        <b-button variant="success" @click="onReset">{{ $t('form.close') }}</b-button>
         <hr />
       </b-col>
     </b-row>
@@ -226,7 +221,7 @@ export default {
   },
   methods: {
     async onDecode(decodedString) {
-      console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
+      //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
       const arr = JSON.parse(decodedString)
       //console.log('qr-email', arr[0].email)
       //console.log('qr-amount', arr[0].amount)

frontend/src/views/KontoOverview/GddTable.vue

@@ -6,7 +6,7 @@
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
-        <div class="d-flex w-100 justify-content-between" @click="toogle(item)">
+        <div class="d-flex w-100 justify-content-between">
           <b-icon
             v-if="item.type === 'send'"
             icon="box-arrow-left"
@@ -33,10 +33,15 @@
         <b-collapse :id="'a' + item.transaction_id" class="mt-2">
           <b-card>
             <b-list-group>
-              <b-list-group-item>
+              <b-list-group-item v-if="item.type === 'send'">
-                <b-badge class="mr-4" variant="primary" pill>name</b-badge>
+                <b-badge class="mr-4" variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
                 {{ item.name }}
               </b-list-group-item>
+              <b-list-group-item v-else>
+                <b-badge class="mr-4" variant="primary" pill>{{ $t('form.sender') }}</b-badge>
+                {{ item.name }}
+              </b-list-group-item>
+
               <b-list-group-item>
                 <b-badge class="mr-4" variant="primary" pill>type</b-badge>
                 {{ item.type }}
@@ -46,7 +51,7 @@
                 {{ item.transaction_id }}
               </b-list-group-item>
               <b-list-group-item>
-                <b-badge class="mr-4" variant="primary" pill>date</b-badge>
+                <b-badge class="mr-4" variant="primary" pill>{{ $t('form.date') }}</b-badge>
                 {{ item.date }}
               </b-list-group-item>
               <b-list-group-item>
@@ -54,7 +59,7 @@
                 {{ item.balance }}
               </b-list-group-item>
               <b-list-group-item>
-                <b-badge class="mr-4" variant="primary" pill>memo</b-badge>
+                <b-badge class="mr-4" variant="primary" pill>{{ $t('form.memo') }}</b-badge>
                 {{ item.memo }}
               </b-list-group-item>
             </b-list-group>
@@ -131,10 +136,6 @@ export default {
       if (item.type === 'send') return 'table-warning'
       if (item.type === 'creation') return 'table-primary'
     },
-    toogle(item) {
-      const temp =
-        '<b-collapse visible v-bind:id="item.id">xxx <small class="text-muted">porta</small></b-collapse>'
-    },
   },
 }
 </script>

frontend/src/views/Layout/DashboardLayout.vue

@@ -4,7 +4,7 @@
     <side-bar>
       <template slot="links">
         <b-nav-item href="#!" to="/overview">
-          <b-nav-text class="p-0 text-lg text-muted">{{ $t('sent') }}</b-nav-text>
+          <b-nav-text class="p-0 text-lg text-muted">{{ $t('send') }}</b-nav-text>
         </b-nav-item>
         <b-nav-item href="#!" to="/transactions">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('transactions') }}</b-nav-text>

frontend/src/views/Pages/UserProfileActivity.vue

@@ -3,7 +3,7 @@
     <div class="header pb-7 pt-5"></div>
 
     <b-container fluid class="mt--6">
-      <div class="display-4 mb-3">Gemeinschaftsstunden Chart</div>
+      <div class="display-4 mb-3">{{ $t('site.profil.activity.chart') }}</div>
       <b-row>
         <b-col>
           <div class="chart">
@@ -12,7 +12,7 @@
         </b-col>
       </b-row>
       <hr />
-      <div class="display-4 mt-6">Neue Gemeinschaftsstunden eintragen</div>
+      <div class="display-4 mt-6">{{ $t('site.profil.activity.new') }}</div>
       <b-row>
         <b-col>
           <gdd-add-work-2 />
@@ -20,10 +20,10 @@
       </b-row>
 
       <hr />
-      <div class="display-4 mb-3">Meine Gemeinschaftsstunden Liste</div>
+      <div class="display-4 mb-3">{{ $t('site.profil.activity.list') }}</div>
       <b-row>
         <b-col class="mb-5">
-          community
+          {{ $t('community') }}
           <gdd-work-table></gdd-work-table>
         </b-col>
       </b-row>