Merge branch 'master' into refactor_event_protocol

frontend/src/components/GddSend/TransactionForm.vue

@@ -2,10 +2,10 @@
   <div class="transaction-form">
     <b-row>
       <b-col cols="12">
-        <b-card class="appBoxShadow gradido-border-radius" body-class="p-3">
+        <b-card class="appBoxShadow gradido-border-radius" body-class="p-4">
           <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
             <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
-              <b-form-radio-group v-model="radioSelected" class="container">
+              <b-form-radio-group v-model="radioSelected">
                 <b-row class="mb-4">
                   <b-col cols="12" lg="6">
                     <b-row class="bg-248 gradido-border-radius pt-lg-2 mr-lg-2">
@@ -39,14 +39,13 @@
                     </b-row>
                   </b-col>
                 </b-row>
-
-                <div class="mt-4 mb-4" v-if="radioSelected === sendTypes.link">
-                  <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
-                  <div>
-                    {{ $t('gdd_per_link.choose-amount') }}
-                  </div>
-                </div>
               </b-form-radio-group>
+              <div class="mt-4 mb-4" v-if="radioSelected === sendTypes.link">
+                <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+                <div>
+                  {{ $t('gdd_per_link.choose-amount') }}
+                </div>
+              </div>
               <b-row>
                 <b-col>
                   <b-row>
@@ -106,7 +105,10 @@
                 </b-col>
                 <b-col cols="12" md="6" lg="6" class="text-lg-right">
                   <b-button block type="submit" variant="gradido">
-                    {{ $t('form.check_now') }}
+                    <span v-if="radioSelected === sendTypes.send">{{ $t('form.check_now') }}</span>
+                    <span v-if="radioSelected === sendTypes.link">
+                      {{ $t('form.generate_now') }}
+                    </span>
                   </b-button>
                 </b-col>
               </b-row>

frontend/src/locales/de.json

@@ -51,7 +51,7 @@
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
     "formText": {
       "bringYourTalentsTo": "Bring dich mit deinen Talenten in die Gemeinschaft ein! Dein freiwilliges Engagement honorieren wir mit 20 GDD pro Stunde bis maximal 1.000 GDD im Monat.",
-      "describeYourCommunity": "Beschreibe deine Gemeinwohl-Tätigkeit mit Angabe der Stunden und trage einen Betrag von 20 GDD pro Stunde ein! Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben.",
+      "describeYourCommunity": "Beschreibe deine Gemeinwohl-Tätigkeit und gib die Anzahl der Stunden an! Der Betrag von 20 GDD pro Stunde wird automatisch berechnet. Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben.",
       "maxGDDforMonth": "Du kannst für den ausgewählten Monat nur noch maximal {amount} GDD einreichen.",
       "openAmountForMonth": "Für <b>{monthAndYear}</b> kannst du noch <b>{creation}</b> GDD einreichen.",
       "yourContribution": "Dein Beitrag zum Gemeinwohl"
@@ -251,7 +251,7 @@
   },
   "openHours": "Offene Stunden",
   "pageTitle": {
-    "community": "Meine Gemeinschaft",
+    "community": "Gradido schöpfen",
     "gdt": "Deine GDT Transaktionen",
     "information": "{community}",
     "overview": "Willkommen {name}",

frontend/src/locales/en.json

@@ -50,11 +50,11 @@
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
     "formText": {
-      "bringYourTalentsTo": "Bring your talents to the community! Your voluntary commitment will be rewarded with 20 GDD per hour up to a maximum of 1,000 GDD per month.",
-      "describeYourCommunity": "Describe your community service activity with hours and enter an amount of 20 GDD per hour! After confirmation by a moderator, the amount will be credited to your account.",
+      "bringYourTalentsTo": "Bring your talents to the community! We reward your voluntary commitment with 20 GDD per hour up to a maximum of 1,000 GDD per month.",
+      "describeYourCommunity": "Describe your community service activity and specify the number of hours! The amount of 20 GDD per hour will be calculated automatically. After confirmation by a moderator, the amount will be credited to your account.",
       "maxGDDforMonth": "You can only submit a maximum of {amount} GDD for the selected month.",
       "openAmountForMonth": "For  <b>{monthAndYear}</b>, you can still submit <b>{creation}</b> GDD.",
-      "yourContribution": "Your contribution to the common good"
+      "yourContribution": "Your Contributions to the Common Good"
     },
     "lastContribution": "Last Contributions",
     "noDateSelected": "Choose any date in the month",
@@ -251,7 +251,7 @@
   },
   "openHours": "Open Hours",
   "pageTitle": {
-    "community": "My community",
+    "community": "Create Gradido",
     "gdt": "Your GDT transactions",
     "information": "{community}",
     "overview": "Welcome {name}",

frontend/src/pages/Community.vue

@@ -296,8 +296,8 @@ export default {
   },
   created() {
     this.updateTransactions(0)
-    this.tabIndex = 1
-    this.$router.push({ path: '/community#my' })
+    this.tabIndex = 0
+    this.$router.push({ path: '/community#edit' })
   },
 }
 </script>