From a06733fbfd6140e0f8ce481b04866e7b01914207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 7 Jun 2019 13:00:42 +0200
Subject: [PATCH 1/4] Translate network tab on the left profile page

---
 webapp/locales/de.json             | 11 ++++++++++-
 webapp/locales/en.json             | 11 ++++++++++-
 webapp/pages/profile/_id/_slug.vue | 14 +++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a790e6461..6ad7d437e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -25,7 +25,16 @@
     "shouted": "Empfohlen",
     "commented": "Kommentiert",
     "userAnonym": "Anonymus",
-    "socialMedia": "Wo sonst finde ich"
+    "socialMedia": "Wo sonst finde ich",
+    "network": {
+      "title": "Netzwerk",
+      "following": "folgt:",
+      "followingNobody": "folgt niemandem.",
+      "followedBy": "wird gefolgt von:",
+      "followedByNobody": "wird von niemandem gefolgt.",
+      "and": "und",
+      "more": "weitere"
+    }
   },
   "notifications": {
     "menu": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 289928f92..72b2d0a39 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -25,7 +25,16 @@
     "shouted": "Shouted",
     "commented": "Commented",
     "userAnonym": "Anonymous",
-    "socialMedia": "Where else can I find"
+    "socialMedia": "Where else can I find",
+    "network": {
+      "title": "Network",
+      "following": "is following:",
+      "followingNobody": "follows nobody.",
+      "followedBy": "is followed by:",
+      "followedByNobody": "is followed by nobody.",
+      "and": "and",
+      "more": "more"
+    }
   },
   "notifications": {
     "menu": {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 9a7af82ac..27f4994d0 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -69,11 +69,11 @@
         </ds-card>
         <ds-space />
         <ds-heading tag="h3" soft style="text-align: center; margin-bottom: 10px;">
-          Netzwerk
+          {{ $t('profile.network.title') }}
         </ds-heading>
         <ds-card style="position: relative; height: auto;">
           <ds-space v-if="user.following && user.following.length" margin="x-small">
-            <ds-text tag="h5" color="soft">Wem folgt {{ userName | truncate(15) }}?</ds-text>
+            <ds-text tag="h5" color="soft"> {{ userName | truncate(15) }} {{ $t('profile.network.following')}} </ds-text>
           </ds-space>
           <template v-if="user.following && user.following.length">
             <ds-space v-for="follow in uniq(user.following)" :key="follow.id" margin="x-small">
@@ -84,18 +84,18 @@
             </ds-space>
             <ds-space v-if="user.followingCount - user.following.length" margin="small">
               <ds-text size="small" color="softer">
-                und {{ user.followingCount - user.following.length }} weitere
+                {{ $t('profile.network.and') }} {{ user.followingCount - user.following.length }} {{ $t('profile.network.more') }}
               </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">{{ userName }} folgt niemandem</p>
+            <p style="text-align: center; opacity: .5;">{{ userName }} {{$t('profile.network.followingNobody')}}</p>
           </template>
         </ds-card>
         <ds-space />
         <ds-card style="position: relative; height: auto;">
           <ds-space v-if="user.followedBy && user.followedBy.length" margin="x-small">
-            <ds-text tag="h5" color="soft">Wer folgt {{ userName | truncate(15) }}?</ds-text>
+            <ds-text tag="h5" color="soft">{{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}}</ds-text>
           </ds-space>
           <template v-if="user.followedBy && user.followedBy.length">
             <ds-space v-for="follow in uniq(user.followedBy)" :key="follow.id" margin="x-small">
@@ -106,12 +106,12 @@
             </ds-space>
             <ds-space v-if="user.followedByCount - user.followedBy.length" margin="small">
               <ds-text size="small" color="softer">
-                und {{ user.followedByCount - user.followedBy.length }} weitere
+                {{ $t('profile.network.and') }} {{ user.followedByCount - user.followedBy.length }} {{ $t('profile.network.more') }}
               </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">niemand folgt {{ userName }}</p>
+            <p style="text-align: center; opacity: .5;">{{ userName }} {{$t('profile.network.followedByNobody')}}</p>
           </template>
         </ds-card>
         <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">

From 7ab6ce4ed2c1dd854bdf905c3d27655a21b71df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 7 Jun 2019 13:10:04 +0200
Subject: [PATCH 2/4] Fix typo in translation keys

---
 webapp/locales/de.json             | 2 +-
 webapp/pages/profile/_id/_slug.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6ad7d437e..f2d1e7415 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -175,7 +175,7 @@
     "your": {
       "post": "Dein Beitrag ::: Deine Beiträge",
       "comment": "Dein Kommentar ::: Deine Kommentare",
-      "shouted": "Deine Empfehlung ::: Deine Empfehlungen"
+      "shout": "Deine Empfehlung ::: Deine Empfehlungen"
     },
     "post": "Beitrag ::: Beiträge",
     "comment": "Kommentar ::: Kommentare",
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 27f4994d0..882e1bad0 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -177,7 +177,7 @@
 
                 <ds-flex-item
                   v-tooltip="{
-                    content: $t('common.your.shouted', null, user.shoutedCount),
+                    content: $t('common.your.shout', null, user.shoutedCount),
                     placement: 'right',
                     delay: { show: 500 },
                   }"

From 94ea9c95300a3cb749c215bb4234eb18d427c98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 7 Jun 2019 13:48:59 +0200
Subject: [PATCH 3/4] Fix lint

---
 webapp/pages/profile/_id/_slug.vue | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 882e1bad0..eedcd199b 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -73,7 +73,9 @@
         </ds-heading>
         <ds-card style="position: relative; height: auto;">
           <ds-space v-if="user.following && user.following.length" margin="x-small">
-            <ds-text tag="h5" color="soft"> {{ userName | truncate(15) }} {{ $t('profile.network.following')}} </ds-text>
+            <ds-text tag="h5" color="soft">
+              {{ userName | truncate(15) }} {{ $t('profile.network.following') }}
+            </ds-text>
           </ds-space>
           <template v-if="user.following && user.following.length">
             <ds-space v-for="follow in uniq(user.following)" :key="follow.id" margin="x-small">
@@ -84,18 +86,23 @@
             </ds-space>
             <ds-space v-if="user.followingCount - user.following.length" margin="small">
               <ds-text size="small" color="softer">
-                {{ $t('profile.network.and') }} {{ user.followingCount - user.following.length }} {{ $t('profile.network.more') }}
+                {{ $t('profile.network.and') }} {{ user.followingCount - user.following.length }}
+                {{ $t('profile.network.more') }}
               </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">{{ userName }} {{$t('profile.network.followingNobody')}}</p>
+            <p style="text-align: center; opacity: .5;">
+              {{ userName }} {{ $t('profile.network.followingNobody') }}
+            </p>
           </template>
         </ds-card>
         <ds-space />
         <ds-card style="position: relative; height: auto;">
           <ds-space v-if="user.followedBy && user.followedBy.length" margin="x-small">
-            <ds-text tag="h5" color="soft">{{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}}</ds-text>
+            <ds-text tag="h5" color="soft">
+              {{ userName | truncate(15) }} {{ $t('profile.network.followedBy') }}
+            </ds-text>
           </ds-space>
           <template v-if="user.followedBy && user.followedBy.length">
             <ds-space v-for="follow in uniq(user.followedBy)" :key="follow.id" margin="x-small">
@@ -106,12 +113,15 @@
             </ds-space>
             <ds-space v-if="user.followedByCount - user.followedBy.length" margin="small">
               <ds-text size="small" color="softer">
-                {{ $t('profile.network.and') }} {{ user.followedByCount - user.followedBy.length }} {{ $t('profile.network.more') }}
+                {{ $t('profile.network.and') }} {{ user.followedByCount - user.followedBy.length }}
+                {{ $t('profile.network.more') }}
               </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">{{ userName }} {{$t('profile.network.followedByNobody')}}</p>
+            <p style="text-align: center; opacity: .5;">
+              {{ userName }} {{ $t('profile.network.followedByNobody') }}
+            </p>
           </template>
         </ds-card>
         <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">

From d32f577c8c0bbf06cdeca41998ecde2d5371bd29 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 7 Jun 2019 19:08:40 -0300
Subject: [PATCH 4/4] Update en.json

---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 72b2d0a39..093393045 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -31,7 +31,7 @@
       "following": "is following:",
       "followingNobody": "follows nobody.",
       "followedBy": "is followed by:",
-      "followedByNobody": "is followed by nobody.",
+      "followedByNobody": "is not followed by anyone.",
       "and": "and",
       "more": "more"
     }