From 1d180480c4d10573f231d1e32c333d63b393e2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 12 Aug 2019 15:35:09 +0200
Subject: [PATCH] Translated several texts and corrected and added some
 functionalities

---
 webapp/locales/de.json                    | 10 ++++++-
 webapp/locales/en.json                    | 10 ++++++-
 webapp/pages/admin/categories.vue         |  4 +--
 webapp/pages/admin/index.vue              |  4 +--
 webapp/pages/admin/tags.vue               | 13 ++++++---
 webapp/pages/admin/users.vue              | 34 +++++++++++++----------
 webapp/pages/post/_id/_slug/more-info.vue | 18 ++++++------
 7 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 4a1400e4d..8bc336bf6 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -215,6 +215,7 @@
       },
       "table": {
         "columns": {
+          "number": "Nr.",
           "name": "Name",
           "slug": "Slug",
           "role": "Rolle",
@@ -236,6 +237,8 @@
     },
     "tags": {
       "name": "Hashtags",
+      "number": "Nr.",
+      "nameOfHashtag": "Name",
       "tagCountUnique": "Benutzer",
       "tagCount": "Beiträge"
     },
@@ -251,7 +254,12 @@
   "post": {
     "name": "Beitrag",
     "moreInfo": {
-      "name": "Mehr Info"
+      "name": "Mehr Info",
+      "title": "Mehr Informationen",
+      "description": "Hier findest du weitere infos zum Thema.",
+      "titleOfCategoriesSection": "Kategorien",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Verwandte Beiträge"
     },
     "takeAction": {
       "name": "Aktiv werden"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 31c1af8f6..faf440899 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -215,6 +215,7 @@
       },
       "table": {
         "columns": {
+          "number": "#",
           "name": "Name",
           "slug": "Slug",
           "role": "Role",
@@ -236,6 +237,8 @@
     },
     "tags": {
       "name": "Hashtags",
+      "number": "#",
+      "nameOfHashtag": "Name",
       "tagCountUnique": "Users",
       "tagCount": "Posts"
     },
@@ -251,7 +254,12 @@
   "post": {
     "name": "Post",
     "moreInfo": {
-      "name": "More info"
+      "name": "More info",
+      "title": "More Informations",
+      "description": "Here you can find more information about this topic.",
+      "titleOfCategoriesSection": "Categories",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Related Posts"
     },
     "takeAction": {
       "name": "Take action"
diff --git a/webapp/pages/admin/categories.vue b/webapp/pages/admin/categories.vue
index ce795feaf..23aa4d606 100644
--- a/webapp/pages/admin/categories.vue
+++ b/webapp/pages/admin/categories.vue
@@ -31,7 +31,7 @@ export default {
   },
   apollo: {
     Category: {
-      query: gql(`
+      query: gql`
         query {
           Category(orderBy: postCount_desc) {
             id
@@ -41,7 +41,7 @@ export default {
             postCount
           }
         }
-      `),
+      `,
     },
   },
 }
diff --git a/webapp/pages/admin/index.vue b/webapp/pages/admin/index.vue
index 6732b2137..7790ed849 100644
--- a/webapp/pages/admin/index.vue
+++ b/webapp/pages/admin/index.vue
@@ -133,7 +133,7 @@ export default {
   },
   apollo: {
     statistics: {
-      query: gql(`
+      query: gql`
         query {
           statistics {
             countUsers
@@ -147,7 +147,7 @@ export default {
             countShouts
           }
         }
-      `),
+      `,
     },
   },
 }
diff --git a/webapp/pages/admin/tags.vue b/webapp/pages/admin/tags.vue
index 06b32a508..c5a28dc11 100644
--- a/webapp/pages/admin/tags.vue
+++ b/webapp/pages/admin/tags.vue
@@ -4,6 +4,11 @@
       <template slot="id" slot-scope="scope">
         {{ scope.index + 1 }}.
       </template>
+      <template slot="name" slot-scope="scope">
+        <nuxt-link :to="{ path: '/', query: { hashtag: scope.row.id } }">
+          <b>#{{ scope.row.name | truncate(20) }}</b>
+        </nuxt-link>
+      </template>
     </ds-table>
   </ds-card>
 </template>
@@ -20,8 +25,8 @@ export default {
   computed: {
     fields() {
       return {
-        id: '#',
-        name: 'Name',
+        id: this.$t('admin.tags.number'),
+        name: this.$t('admin.tags.name'),
         taggedCountUnique: {
           label: this.$t('admin.tags.tagCountUnique'),
           align: 'right',
@@ -35,7 +40,7 @@ export default {
   },
   apollo: {
     Tag: {
-      query: gql(`
+      query: gql`
         query {
           Tag(first: 20, orderBy: taggedCountUnique_desc) {
             id
@@ -44,7 +49,7 @@ export default {
             taggedCountUnique
           }
         }
-      `),
+      `,
     },
   },
 }
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 3da484fe6..e58b413aa 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -90,7 +90,7 @@ export default {
     },
     fields() {
       return {
-        index: '#',
+        index: this.$t('admin.users.table.columns.number'),
         name: this.$t('admin.users.table.columns.name'),
         slug: this.$t('admin.users.table.columns.slug'),
         createdAt: this.$t('admin.users.table.columns.createdAt'),
@@ -116,20 +116,26 @@ export default {
   apollo: {
     User: {
       query() {
-        return gql(`
-        query($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
-          User(email: $email, filter: $filter, first: $first, offset: $offset, orderBy: createdAt_desc) {
-            id
-            name
-            slug
-            role
-            createdAt
-            contributionsCount
-            commentedCount
-            shoutedCount
+        return gql`
+          query($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
+            User(
+              email: $email
+              filter: $filter
+              first: $first
+              offset: $offset
+              orderBy: createdAt_desc
+            ) {
+              id
+              name
+              slug
+              role
+              createdAt
+              contributionsCount
+              commentedCount
+              shoutedCount
+            }
           }
-        }
-      `)
+        `
       },
       variables() {
         const { offset, first, email, filter } = this
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index c7d1a5f0e..ef442b7d6 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -1,11 +1,11 @@
 <template>
   <ds-card>
-    <h2 style="margin-bottom: .2em;">Mehr Informationen</h2>
-    <p>Hier findest du weitere infos zum Thema.</p>
+    <h2 style="margin-bottom: .2em;">{{ $t('post.moreInfo.title') }}</h2>
+    <p>{{ $t('post.moreInfo.description') }}</p>
     <ds-space />
     <h3>
-      <ds-icon name="compass" />
-      Themenkategorien
+      <!-- <ds-icon name="compass" /> -->
+      {{ $t('post.moreInfo.titleOfCategoriesSection') }}
     </h3>
     <div class="tags">
       <ds-icon
@@ -22,8 +22,8 @@
     </div>
     <template v-if="post.tags && post.tags.length">
       <h3>
-        <ds-icon name="tags" />
-        Schlagwörter
+        <!-- <ds-icon name="tags" /> -->
+        {{ $t('post.moreInfo.titleOfHashtagsSection') }}
       </h3>
       <div class="tags">
         <ds-tag v-for="tag in post.tags" :key="tag.id">
@@ -32,7 +32,7 @@
         </ds-tag>
       </div>
     </template>
-    <h3>Verwandte Beiträge</h3>
+    <h3>{{ $t('post.moreInfo.titleOfRelatedContributionsSection') }}</h3>
     <ds-section style="margin: 0 -1.5rem; padding: 1.5rem;">
       <ds-flex v-if="post.relatedContributions && post.relatedContributions.length" gutter="small">
         <hc-post-card
@@ -71,7 +71,7 @@ export default {
   apollo: {
     Post: {
       query() {
-        return gql(`
+        return gql`
           query Post($slug: String!) {
             Post(slug: $slug) {
               id
@@ -118,7 +118,7 @@ export default {
               shoutedCount
             }
           }
-        `)
+        `
       },
       variables() {
         return {