From 9b97608a24a81e64eb98f4f82367de6ebb63df28 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 5 Aug 2022 15:49:37 +0200
Subject: [PATCH 1/3] remove required from form.memo

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index d0de061d3..d79a19a09 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -31,7 +31,6 @@
       </b-form-datepicker>
       <validation-provider
         :rules="{
-          required: true,
           min: minlength,
           max: maxlength,
         }"
@@ -44,7 +43,6 @@
           v-model="form.memo"
           rows="3"
           max-rows="6"
-          required
         ></b-form-textarea>
         <b-col v-if="errors">
           <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>

From fd2875b20147a9ac18aa500557de2267b49a20ae Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 5 Aug 2022 17:56:54 +0200
Subject: [PATCH 2/3] add asteriks to mandatory field

---
 .../src/components/Contributions/ContributionForm.vue    | 9 ++++++---
 frontend/src/locales/de.json                             | 5 ++++-
 frontend/src/locales/en.json                             | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index d79a19a09..53610ca6b 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <b-form ref="form" @submit.prevent="submit" class="border p-3">
-      <label>{{ $t('contribution.selectDate') }}</label>
+      <label>{{ $t('contribution.selectDate') }} {{ $t('math.asterisk') }}</label>
       <b-form-datepicker
         id="contribution-date"
         v-model="form.date"
@@ -37,18 +37,20 @@
         :name="$t('form.message')"
         v-slot="{ errors }"
       >
-        <label class="mt-3">{{ $t('contribution.activity') }}</label>
+        <label class="mt-3">{{ $t('contribution.activity') }} {{ $t('math.asterisk') }}</label>
         <b-form-textarea
           id="contribution-memo"
           v-model="form.memo"
           rows="3"
           max-rows="6"
+          :placeholder="$t('contribution.yourActivity')"
+          required
         ></b-form-textarea>
         <b-col v-if="errors">
           <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
         </b-col>
       </validation-provider>
-      <label class="mt-3">{{ $t('form.amount') }}</label>
+      <label class="mt-3">{{ $t('form.amount') }} {{ $t('math.asterisk') }}</label>
       <b-input-group size="lg" prepend="GDD" append=".00">
         <b-form-input
           id="contribution-amount"
@@ -83,6 +85,7 @@
         </b-col>
       </b-row>
     </b-form>
+    <p class="p-2">{{ $t('math.asterisk') }} {{ $t('form.mandatoryField') }}</p>
   </div>
 </template>
 <script>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 422a445bd..0d4080a86 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -33,6 +33,7 @@
   },
   "contribution": {
     "activity": "Tätigkeit",
+    "yourActivity":"Bitte trage eine Tätigkeit ein!",
     "alert": {
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
@@ -117,6 +118,7 @@
     "from": "Von",
     "generate_now": "Jetzt generieren",
     "lastname": "Nachname",
+    "mandatoryField":"Pflichtfeld",
     "memo": "Nachricht",
     "message": "Nachricht",
     "new_balance": "Neuer Kontostand nach Bestätigung",
@@ -206,7 +208,8 @@
     "aprox": "~",
     "equal": "=",
     "minus": "−",
-    "pipe": "|"
+    "pipe": "|",
+    "asterisk":"*"
   },
   "message": {
     "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite an.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 89c18a106..f902ba8c6 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -33,6 +33,7 @@
   },
   "contribution": {
     "activity": "Activity",
+    "yourActivity":"Please enter an activity!",
     "alert": {
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
@@ -117,6 +118,7 @@
     "from": "from",
     "generate_now": "Generate now",
     "lastname": "Lastname",
+    "mandatoryField":"mandatory field",
     "memo": "Message",
     "message": "Message",
     "new_balance": "Account balance after confirmation",
@@ -206,7 +208,8 @@
     "aprox": "~",
     "equal": "=",
     "minus": "−",
-    "pipe": "|"
+    "pipe": "|",
+    "asterisk":"*"
   },
   "message": {
     "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.",

From 265832c6879b34de472a30a8326a923ca56456cf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 5 Aug 2022 17:57:43 +0200
Subject: [PATCH 3/3] fix locales

---
 frontend/src/locales/de.json | 10 +++++-----
 frontend/src/locales/en.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0d4080a86..07d8c4dcf 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -33,7 +33,6 @@
   },
   "contribution": {
     "activity": "Tätigkeit",
-    "yourActivity":"Bitte trage eine Tätigkeit ein!",
     "alert": {
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
@@ -56,7 +55,8 @@
     "selectDate": "Wann war dein Beitrag?",
     "submit": "Einreichen",
     "submitted": "Der Beitrag wurde eingereicht.",
-    "updated": "Der Beitrag wurde geändert."
+    "updated": "Der Beitrag wurde geändert.",
+    "yourActivity": "Bitte trage eine Tätigkeit ein!"
   },
   "contribution-link": {
     "thanksYouWith": "dankt dir mit"
@@ -118,7 +118,7 @@
     "from": "Von",
     "generate_now": "Jetzt generieren",
     "lastname": "Nachname",
-    "mandatoryField":"Pflichtfeld",
+    "mandatoryField": "Pflichtfeld",
     "memo": "Nachricht",
     "message": "Nachricht",
     "new_balance": "Neuer Kontostand nach Bestätigung",
@@ -206,10 +206,10 @@
   "login": "Anmeldung",
   "math": {
     "aprox": "~",
+    "asterisk": "*",
     "equal": "=",
     "minus": "−",
-    "pipe": "|",
-    "asterisk":"*"
+    "pipe": "|"
   },
   "message": {
     "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite an.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f902ba8c6..e7dc8ee38 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -33,7 +33,6 @@
   },
   "contribution": {
     "activity": "Activity",
-    "yourActivity":"Please enter an activity!",
     "alert": {
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
@@ -56,7 +55,8 @@
     "selectDate": "When was your contribution?",
     "submit": "Submit",
     "submitted": "The contribution was submitted.",
-    "updated": "The contribution was changed."
+    "updated": "The contribution was changed.",
+    "yourActivity": "Please enter an activity!"
   },
   "contribution-link": {
     "thanksYouWith": "thanks you with"
@@ -118,7 +118,7 @@
     "from": "from",
     "generate_now": "Generate now",
     "lastname": "Lastname",
-    "mandatoryField":"mandatory field",
+    "mandatoryField": "mandatory field",
     "memo": "Message",
     "message": "Message",
     "new_balance": "Account balance after confirmation",
@@ -206,10 +206,10 @@
   "login": "Login",
   "math": {
     "aprox": "~",
+    "asterisk": "*",
     "equal": "=",
     "minus": "−",
-    "pipe": "|",
-    "asterisk":"*"
+    "pipe": "|"
   },
   "message": {
     "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.",