From db7908139cf807486b04e204fc05dddaa0823879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 8 Apr 2020 15:56:27 +0200
Subject: [PATCH] Cleanup

---
 backend/src/middleware/validation/validationMiddleware.js | 6 +++---
 webapp/components/Notification/Notification.spec.js       | 8 ++++----
 webapp/components/Notification/Notification.vue           | 4 ++--
 .../NotificationsTable/NotificationsTable.spec.js         | 8 ++++----
 .../components/NotificationsTable/NotificationsTable.vue  | 4 ++--
 webapp/components/utils/Notifications.js                  | 2 +-
 webapp/locales/de.json                                    | 4 ++--
 webapp/locales/en.json                                    | 4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index d36e64846..e98a787a2 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -60,10 +60,10 @@ const validateUpdatePost = async (resolve, root, args, context, info) => {
   return validatePost(resolve, root, args, context, info)
 }
 
-const validateReport = async (resolve, root, args, context, info) => {
+const validateFiledReport = async (resolve, root, args, context, info) => {
   const { resourceId } = args
   const { user } = context
-  if (resourceId === user.id) throw new Error('You cannot report yourself!')
+  if (resourceId === user.id) throw new Error("You can't file a report about yourself!")
   return resolve(root, args, context, info)
 }
 
@@ -141,7 +141,7 @@ export default {
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
     UpdateUser: validateUpdateUser,
-    fileReport: validateReport,
+    fileReport: validateFiledReport,
     review: validateReview,
   },
 }
diff --git a/webapp/components/Notification/Notification.spec.js b/webapp/components/Notification/Notification.spec.js
index 6986db47d..ff3da9d35 100644
--- a/webapp/components/Notification/Notification.spec.js
+++ b/webapp/components/Notification/Notification.spec.js
@@ -236,14 +236,14 @@ describe('Notification', () => {
       expect(wrapper.text()).toContain('@mrs.-badwomen')
     })
 
-    it('renders the identifier "notifications.report.category"', () => {
+    it('renders the identifier "notifications.filedReport.category"', () => {
       wrapper = Wrapper()
-      expect(wrapper.text()).toContain('notifications.report.category')
+      expect(wrapper.text()).toContain('notifications.filedReport.category')
     })
 
-    it('renders the identifier "notifications.report.description"', () => {
+    it('renders the identifier "notifications.filedReport.description"', () => {
       wrapper = Wrapper()
-      expect(wrapper.text()).toContain('notifications.report.description')
+      expect(wrapper.text()).toContain('notifications.filedReport.description')
     })
 
     it('has no class "read"', () => {
diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index bae604a09..a747e7b0a 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -29,10 +29,10 @@
         </p>
         <div v-if="notificationData.isReport">
           <ds-space margin-bottom="x-small" />
-          <strong>{{ $t(`notifications.report.category`) }}:</strong>
+          <strong>{{ $t(`notifications.filedReport.category`) }}:</strong>
           {{ $t('report.reason.category.options.' + notificationData.filedReport.reasonCategory) }}
           <br />
-          <strong>{{ $t(`notifications.report.description`) }}:</strong>
+          <strong>{{ $t(`notifications.filedReport.description`) }}:</strong>
           <span
             v-if="
               notificationData.filedReport.reasonDescription &&
diff --git a/webapp/components/NotificationsTable/NotificationsTable.spec.js b/webapp/components/NotificationsTable/NotificationsTable.spec.js
index 52add76eb..d839b12bd 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.spec.js
+++ b/webapp/components/NotificationsTable/NotificationsTable.spec.js
@@ -178,9 +178,9 @@ describe('NotificationsTable.vue', () => {
           expect(wrapper.text()).toContain('@mrs.-badwomen')
         })
 
-        it('renders the identifier "notifications.report.category"', () => {
+        it('renders the identifier "notifications.filedReport.category"', () => {
           wrapper = Wrapper()
-          expect(wrapper.text()).toContain('notifications.report.category')
+          expect(wrapper.text()).toContain('notifications.filedReport.category')
         })
 
         it('renders the reported category', () => {
@@ -190,9 +190,9 @@ describe('NotificationsTable.vue', () => {
           )
         })
 
-        it('renders the identifier "notifications.report.description"', () => {
+        it('renders the identifier "notifications.filedReport.description"', () => {
           wrapper = Wrapper()
-          expect(wrapper.text()).toContain('notifications.report.description')
+          expect(wrapper.text()).toContain('notifications.filedReport.description')
         })
 
         it('renders the reported description', () => {
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 0f1591702..946d343e8 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -46,12 +46,12 @@
       <div v-if="scope.row.isReport" :class="{ 'notification-status': scope.row.read }">
         <ds-space margin-bottom="x-small" />
         <span class="notification-content-header-text">
-          {{ $t(`notifications.report.category`) }}:
+          {{ $t(`notifications.filedReport.category`) }}:
         </span>
         {{ $t('report.reason.category.options.' + scope.row.filedReport.reasonCategory) }}
         <br />
         <span class="notification-content-header-text">
-          {{ $t(`notifications.report.description`) }}:
+          {{ $t(`notifications.filedReport.description`) }}:
         </span>
         <span
           v-if="
diff --git a/webapp/components/utils/Notifications.js b/webapp/components/utils/Notifications.js
index 4ba3f43ac..fbd4bc51a 100644
--- a/webapp/components/utils/Notifications.js
+++ b/webapp/components/utils/Notifications.js
@@ -171,7 +171,7 @@ export const extractNotificationDataOfCurrentUser = (notification, currentUser)
       }
       isReport = true
       iconName = 'balance-scale'
-      iconTooltip = 'notifications.report.name'
+      iconTooltip = 'notifications.filedReport.name'
       triggerer = currentUser
       switch (from.resource.__typename) {
         case 'User':
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index eaed8b2ae..6540aaab1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -462,10 +462,10 @@
       "mentioned_in_comment": "Hat dich in einem Kommentar erwähnt …",
       "mentioned_in_post": "Hat dich in einem Beitrag erwähnt …"
     },
-    "report": {
+    "filedReport": {
       "category": "Kategorie der Meldung",
       "description": "Beschreibung",
-      "name": "Meldung"
+      "name": "Gesendete Meldung"
     },
     "title": "Benachrichtigungen",
     "user": "Benutzer"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e7eb14386..75d5416a6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -462,10 +462,10 @@
       "mentioned_in_comment": "Mentioned you in a comment …",
       "mentioned_in_post": "Mentioned you in a post …"
     },
-    "report": {
+    "filedReport": {
       "category": "Report category",
       "description": "Description",
-      "name": "Report"
+      "name": "Filed report"
     },
     "title": "Notifications",
     "user": "User"