From fde69a3b21c52711ba70c1942b6b3d2f9beb3f52 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 27 Aug 2020 09:49:54 +0200
Subject: [PATCH] fix:  review from wolle, fix lint

---
 webapp/components/ContentMenu/ContentMenu.vue |  9 -------
 webapp/components/DeleteData/DeleteData.vue   |  2 +-
 webapp/components/Modal/DeleteUserModal.vue   | 26 +++++++++----------
 webapp/locales/de.json                        |  2 +-
 webapp/locales/en.json                        |  2 +-
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 6ffd2b7ab..88d83d059 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -156,15 +156,6 @@ export default {
             path: '/settings',
             icon: 'edit',
           })
-          if (this.isAdmin === true && !this.isOwner) {
-            routes.push({
-              label: this.$t(`settings.deleteUserAccount.name`),
-              callback: () => {
-                this.$emit('delete', this.resource)
-              },
-              icon: 'trash',
-            })
-          }
         } else {
           if (this.resource.isMuted) {
             routes.push({
diff --git a/webapp/components/DeleteData/DeleteData.vue b/webapp/components/DeleteData/DeleteData.vue
index 1bafd8885..21b842fe6 100644
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@@ -11,7 +11,7 @@
     <p v-show="enableDeletionValue" class="notice">
       {{ $t('settings.deleteUserAccount.accountDescription') }}
     </p>
-    <label v-if="currentUserCounts.contributionsCount" class="checkbox">
+    <label class="checkbox">
       <input
         type="checkbox"
         v-model="deleteContributions"
diff --git a/webapp/components/Modal/DeleteUserModal.vue b/webapp/components/Modal/DeleteUserModal.vue
index 1d534ea64..87aa557d8 100644
--- a/webapp/components/Modal/DeleteUserModal.vue
+++ b/webapp/components/Modal/DeleteUserModal.vue
@@ -13,24 +13,24 @@
           </ds-flex-item>
           <ds-flex-item width="20%">
             <ds-text size="small">
-              <relative-date-time :date-time="userdata.createdAt" class="relative-date-time" />
+              <span class="bold">{{ $t('modals.deleteUser.created') }}</span>
               <br />
-              {{ $t('modals.deleteUser.created') }}
+              <relative-date-time :date-time="userdata.createdAt" />
             </ds-text>
           </ds-flex-item>
           <ds-flex-item width="15%">
-            <ds-number
-              size="small"
-              :count="userdata.contributionsCount"
-              :label="$t('common.post', null, userdata.contributionsCount)"
-            />
+            <ds-text size="small">
+              <span class="bold">{{ $t('common.post', null, userdata.contributionsCount) }}</span>
+              <br />
+              {{ userdata.contributionsCount }}
+            </ds-text>
           </ds-flex-item>
           <ds-flex-item width="15%">
-            <ds-number
-              size="small"
-              :count="userdata.commentedCount"
-              :label="$t('common.comment', null, userdata.commentedCount)"
-            />
+            <ds-text size="small">
+              <span class="bold">{{ $t('common.comment', null, userdata.commentedCount) }}</span>
+              <br />
+              {{ userdata.commentedCount }}
+            </ds-text>
           </ds-flex-item>
         </ds-flex>
       </ds-section>
@@ -176,7 +176,7 @@ export default {
   z-index: $z-index-modal;
   border-radius: $border-radius-x-large;
 }
-.relative-date-time {
+.bold {
   font-weight: 700;
 }
 </style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 51012880d..adee8921c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -637,7 +637,7 @@
     "deleteUserAccount": {
       "accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.",
       "accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen WEDER VERWALTEN NOCH WIEDERHERSTELLEN!",
-      "accountWarningAdmin": "Das Konto, die Beiträge oder Kommentare können nach dem Löschen WEDER VERWALTEN NOCH WIEDERHERGESTELLT WERDEN!",
+      "accountWarningAdmin": "Das Konto, die Beiträge oder Kommentare können nach dem Löschen WEDER VERWALTET NOCH WIEDERHERGESTELLT WERDEN!",
       "accountWarningIsAdmin": "Achtung! Du löschst jetzt ein Benutzerkonto!",
       "commentedCount": "Meinen {count} Kommentar löschen ::: Meine {count} Kommentare löschen",
       "confirmDeleting": "Benutzerkonto jetzt löschen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 6abddc013..8959e3830 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -642,7 +642,7 @@
       "commentedCount": "Delete my {count} comment ::: Delete my {count} comments",
       "confirmDeleting": "Delete user account now",
       "contributionsCount": "Delete my {count} post ::: Delete my {count} posts",
-      "infoAdmin": "All contributions and comments of the user are additionally deleted!",
+      "infoAdmin": "All contributions and comments of the user will be deleted additionally!",
       "name": "Delete user account",
       "pleaseConfirm": "Destructive action! Type “{confirm}” to confirm.",
       "success": "Account successfully deleted!"