From cf8124fb2d96c04c44c35f3542d1a6eaac10fe47 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 24 Oct 2019 09:11:49 +0200
Subject: [PATCH] Clean up/add german translations

---
 .../components/Notification/Notification.vue  | 68 +++++++++----------
 webapp/locales/de.json                        | 11 ++-
 webapp/locales/en.json                        | 11 +--
 webapp/pages/notifications/index.vue          | 10 +--
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 9649b0d7e..321d1df39 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -1,39 +1,37 @@
 <template>
-  <ds-container>
-    <ds-space :class="{ read: notification.read, notification: true }" margin-bottom="x-small">
-      <client-only>
-        <ds-space margin-bottom="x-small">
-          <hc-user :user="from.author" :date-time="from.createdAt" :trunc="35" />
-        </ds-space>
-        <ds-text class="reason-text-for-test" color="soft">
-          {{ $t(`notifications.reason.${notification.reason}`) }}
-        </ds-text>
-      </client-only>
-      <ds-space margin-bottom="x-small" />
-      <nuxt-link
-        class="notification-mention-post"
-        :to="{ name: 'post-id-slug', params, ...hashParam }"
-        @click.native="$emit('read')"
-      >
-        <ds-space margin-bottom="x-small">
-          <ds-card
-            :header="from.title || from.post.title"
-            hover
-            space="x-small"
-            class="notifications-card"
-          >
-            <ds-space margin-bottom="x-small" />
-            <div>
-              <span v-if="isComment" class="comment-notification-header">
-                {{ $t(`notifications.comment`) }}:
-              </span>
-              {{ from.contentExcerpt | removeHtml }}
-            </div>
-          </ds-card>
-        </ds-space>
-      </nuxt-link>
-    </ds-space>
-  </ds-container>
+  <ds-space :class="{ read: notification.read, notification: true }" margin-bottom="x-small">
+    <client-only>
+      <ds-space margin-bottom="x-small">
+        <hc-user :user="from.author" :date-time="from.createdAt" :trunc="35" />
+      </ds-space>
+      <ds-text class="reason-text-for-test" color="soft">
+        {{ $t(`notifications.reason.${notification.reason}`) }}
+      </ds-text>
+    </client-only>
+    <ds-space margin-bottom="x-small" />
+    <nuxt-link
+      class="notification-mention-post"
+      :to="{ name: 'post-id-slug', params, ...hashParam }"
+      @click.native="$emit('read')"
+    >
+      <ds-space margin-bottom="x-small">
+        <ds-card
+          :header="from.title || from.post.title"
+          hover
+          space="x-small"
+          class="notifications-card"
+        >
+          <ds-space margin-bottom="x-small" />
+          <div>
+            <span v-if="isComment" class="comment-notification-header">
+              {{ $t(`notifications.comment`) }}:
+            </span>
+            {{ from.contentExcerpt | removeHtml }}
+          </div>
+        </ds-card>
+      </ds-space>
+    </nuxt-link>
+  </ds-space>
 </template>
 
 <script>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 34cd948ed..cc2df3e3a 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -175,7 +175,16 @@
       "mentioned_in_comment": "Hat dich in einem Kommentar erwähnt …",
       "commented_on_post": "Hat deinen Beitrag kommentiert …"
     },
-    "comment": "Kommentar"
+    "comment": "Kommentar",
+    "title": "Benachrichtigungen",
+    "post": "Beitrag",
+    "user": "Benutzer",
+    "content": "Inhalt",
+    "sortingLabel": {
+      "all": "Alle",
+      "read": "Lesen  ",
+      "unread": "Ungelesen"
+    }
   },
   "search": {
     "placeholder": "Suchen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c978a35a7..a32b32318 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -178,11 +178,14 @@
     },
     "comment": "Comment",
     "title": "Notifications",
-    "page": "All notifications",
-    "createdAt": "Notification created at",
-    "type": "Type",
+    "post": "Post",
     "user": "User",
-    "content": "Content"
+    "content": "Content",
+    "sortingLabel": {
+      "all": "All",
+      "read": "Read",
+      "unread": "Unread"
+    }
   },
   "search": {
     "placeholder": "Search",
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 118ca0d45..0ed768dfc 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -99,11 +99,11 @@ export default {
   data() {
     return {
       selectedNotifications: [],
-      selected: 'All',
+      selected: this.$t('notifications.sortingLabel.all'),
       sortingOptions: [
-        { label: 'All', value: null },
-        { label: 'Read', value: true },
-        { label: 'Unread', value: false },
+        { label: this.$t('notifications.sortingLabel.all'), value: null },
+        { label: this.$t('notifications.sortingLabel.read'), value: true },
+        { label: this.$t('notifications.sortingLabel.unread'), value: false },
       ],
       nofiticationRead: null,
     }
@@ -112,7 +112,7 @@ export default {
     fields() {
       return {
         user: this.$t('notifications.user'),
-        post: this.$t('notifications.type'),
+        post: this.$t('notifications.post'),
         content: this.$t('notifications.content'),
       }
     },