From d229a050efc49ee266518ec2183e5ed11b8c2616 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 1 Feb 2023 14:02:43 +0100
Subject: [PATCH 1/7] Display of an edited contribution improved

---
 .../ContributionMessagesListItem.vue             | 16 +++++++++++++++-
 frontend/src/locales/de.json                     |  2 ++
 frontend/src/locales/en.json                     |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index a1472f7ad..b92ed53b5 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,6 +1,20 @@
 <template>
   <div class="contribution-messages-list-item">
-    <div v-if="isNotModerator" class="text-right pr-4 pr-lg-0 is-not-moderator">
+    <div v-if="message.type === 'HISTORY'">
+      <b-row class="mb-3 border border-197 p-1">
+        <b-col cols="10">
+          <div class="font-weight-bold" data-test="username">
+            {{ storeName.username }} {{ $t('contribution.isEdited') }}
+          </div>
+          <div class="small">{{ $t('contribution.oldContribution') }}</div>
+          <parse-message v-bind="message" data-test="message" class="p-2"></parse-message>
+        </b-col>
+        <b-col cols="2">
+          <avatar :username="storeName.username" :initials="storeName.initials"></avatar>
+        </b-col>
+      </b-row>
+    </div>
+    <div v-else-if="isNotModerator" class="text-right pr-4 pr-lg-0 is-not-moderator">
       <b-row class="mb-3">
         <b-col cols="10">
           <div class="font-weight-bold" data-test="username">{{ storeName.username }}</div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a51b48e37..5108c2acf 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -49,6 +49,8 @@
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
+    "isEdited":"hat den Beitrag bearbeitet",
+    "oldContribution":"Der letzte Beitrag war:",
     "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.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ce65ac9af..9b7fcf70f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -49,6 +49,8 @@
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
+    "isEdited":"edited the contribution",
+    "oldContribution":"The last post was:",
     "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.",

From f48b7d89940b6f84140fd162c88b30c0802fcab9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 1 Feb 2023 14:03:41 +0100
Subject: [PATCH 2/7] fix locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5108c2acf..b3694b1b7 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -49,8 +49,6 @@
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
-    "isEdited":"hat den Beitrag bearbeitet",
-    "oldContribution":"Der letzte Beitrag war:",
     "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.",
@@ -58,8 +56,10 @@
       "openAmountForMonth": "Für <b>{monthAndYear}</b> kannst du noch <b>{creation}</b> GDD einreichen.",
       "yourContribution": "Dein Beitrag zum Gemeinwohl"
     },
+    "isEdited": "hat den Beitrag bearbeitet",
     "lastContribution": "Letzte Beiträge",
     "noDateSelected": "Wähle irgendein Datum im Monat",
+    "oldContribution": "Der letzte Beitrag war:",
     "selectDate": "Wann war dein Beitrag?",
     "submit": "Einreichen",
     "submitted": "Der Beitrag wurde eingereicht.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9b7fcf70f..abc2108eb 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -49,8 +49,6 @@
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
-    "isEdited":"edited the contribution",
-    "oldContribution":"The last post was:",
     "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.",
@@ -58,8 +56,10 @@
       "openAmountForMonth": "For  <b>{monthAndYear}</b>, you can still submit <b>{creation}</b> GDD.",
       "yourContribution": "Your contribution to the common good"
     },
+    "isEdited": "edited the contribution",
     "lastContribution": "Last Contributions",
     "noDateSelected": "Choose any date in the month",
+    "oldContribution": "The last post was:",
     "selectDate": "When was your contribution?",
     "submit": "Submit",
     "submitted": "The contribution was submitted.",

From a2922bf5a2a7587b8793f64e3c866172dbfdcb7b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Feb 2023 08:17:19 +0100
Subject: [PATCH 3/7] add locales oldContribution

---
 .../ContributionMessages/ContributionMessagesListItem.vue    | 5 ++++-
 frontend/src/locales/de.json                                 | 3 ++-
 frontend/src/locales/en.json                                 | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index b92ed53b5..d4ae734db 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -3,10 +3,13 @@
     <div v-if="message.type === 'HISTORY'">
       <b-row class="mb-3 border border-197 p-1">
         <b-col cols="10">
+          <small>{{ $d(new Date(message.createdAt), 'short') }}</small>
           <div class="font-weight-bold" data-test="username">
             {{ storeName.username }} {{ $t('contribution.isEdited') }}
           </div>
-          <div class="small">{{ $t('contribution.oldContribution') }}</div>
+          <div class="small">
+            {{ $t('contribution.oldContribution') }}
+          </div>
           <parse-message v-bind="message" data-test="message" class="p-2"></parse-message>
         </b-col>
         <b-col cols="2">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 7b0b88bad..0bda41457 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -56,7 +56,7 @@
       "openAmountForMonth": "Für <b>{monthAndYear}</b> kannst du noch <b>{creation}</b> GDD einreichen.",
       "yourContribution": "Dein Beitrag zum Gemeinwohl"
     },
-    "isEdited": "hat den Beitrag bearbeitet",
+    "isEdited": "hat seinen Beitrag bearbeitet",
     "lastContribution": "Letzte Beiträge",
     "noContributions": {
       "allContributions": "Es wurden noch keine Beiträge eingereicht.",
@@ -68,6 +68,7 @@
       "lastMonth": "Für den ausgewählten Monat ist das Schöpfungslimit erreicht.",
       "thisMonth": "Für den aktuellen Monat ist das Schöpfungslimit erreicht."
     },
+    "oldContribution": "Alter Beitrag",
     "selectDate": "Wann war dein Beitrag?",
     "submit": "Einreichen",
     "submitted": "Der Beitrag wurde eingereicht.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index fec97a4bf..0cbb7cc81 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -56,7 +56,7 @@
       "openAmountForMonth": "For  <b>{monthAndYear}</b>, you can still submit <b>{creation}</b> GDD.",
       "yourContribution": "Your Contributions to the Common Good"
     },
-    "isEdited": "edited the contribution",
+    "isEdited": "edited his contribution",
     "lastContribution": "Last Contributions",
     "noContributions": {
       "allContributions": "No contributions have been submitted yet.",
@@ -68,6 +68,7 @@
       "lastMonth": "The creation limit is reached for the selected month.",
       "thisMonth": "The creation limit has been reached for the current month."
     },
+    "oldContribution": "Old post",
     "selectDate": "When was your contribution?",
     "submit": "Submit",
     "submitted": "The contribution was submitted.",

From 1655c9ae562bcaa9c7fcdcddfc7cbda33b4e4d9f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 14:59:14 +0100
Subject: [PATCH 4/7] Update frontend/src/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 78eae7232..90e456a93 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -68,7 +68,7 @@
       "lastMonth": "Für den ausgewählten Monat ist das Schöpfungslimit erreicht.",
       "thisMonth": "Für den aktuellen Monat ist das Schöpfungslimit erreicht."
     },
-    "oldContribution": "Alter Beitrag",
+    "oldContribution": "Vorherige Version",
     "selectDate": "Wann war dein Beitrag?",
     "submit": "Einreichen",
     "submitted": "Der Beitrag wurde eingereicht.",

From f868664f469bf45671e6bded5d26bd12914a56e6 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 14:59:26 +0100
Subject: [PATCH 5/7] Update frontend/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 14e4cb50c..4d4c56900 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -68,7 +68,7 @@
       "lastMonth": "The creation limit is reached for the selected month.",
       "thisMonth": "The creation limit has been reached for the current month."
     },
-    "oldContribution": "Old post",
+    "oldContribution": "Previous version",
     "selectDate": "When was your contribution?",
     "submit": "Submit",
     "submitted": "The contribution was submitted.",

From c579acd31e947515ddd7ec505ce48bc447327ed7 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 2 Mar 2023 12:58:20 +0100
Subject: [PATCH 6/7] Update frontend/src/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 90e456a93..bafda1ad2 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -56,7 +56,7 @@
       "openAmountForMonth": "Für <b>{monthAndYear}</b> kannst du noch <b>{creation}</b> GDD einreichen.",
       "yourContribution": "Dein Beitrag zum Gemeinwohl"
     },
-    "isEdited": "hat seinen Beitrag bearbeitet",
+    "isEdited": "hat den Beitrag bearbeitet",
     "lastContribution": "Letzte Beiträge",
     "noContributions": {
       "allContributions": "Es wurden noch keine Beiträge eingereicht.",

From 29b2bbe30c21db0d81a7ff768c3fb89c1e335d16 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 2 Mar 2023 12:58:29 +0100
Subject: [PATCH 7/7] Update frontend/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4d4c56900..cf638e87a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -56,7 +56,7 @@
       "openAmountForMonth": "For  <b>{monthAndYear}</b>, you can still submit <b>{creation}</b> GDD.",
       "yourContribution": "Your Contributions to the Common Good"
     },
-    "isEdited": "edited his contribution",
+    "isEdited": "edited the contribution",
     "lastContribution": "Last Contributions",
     "noContributions": {
       "allContributions": "No contributions have been submitted yet.",