From a06733fbfd6140e0f8ce481b04866e7b01914207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:00:42 +0200 Subject: [PATCH 1/5] 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 @@ - Netzwerk + {{ $t('profile.network.title') }} - Wem folgt {{ userName | truncate(15) }}? + {{ userName | truncate(15) }} {{ $t('profile.network.following')}} - Wer folgt {{ userName | truncate(15) }}? + {{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}} From 7ab6ce4ed2c1dd854bdf905c3d27655a21b71df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:10:04 +0200 Subject: [PATCH 2/5] 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 @@ Date: Fri, 7 Jun 2019 13:48:59 +0200 Subject: [PATCH 3/5] 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 @@ - {{ userName | truncate(15) }} {{ $t('profile.network.following')}} + + {{ userName | truncate(15) }} {{ $t('profile.network.following') }} + - {{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}} + + {{ userName | truncate(15) }} {{ $t('profile.network.followedBy') }} + From f0a4149b9e9ca84621c0da2b86c5ff5ca4acb9b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 22:07:23 +0000 Subject: [PATCH 4/5] Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.1...apollo-cache-inmemory@1.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index d746d1ed6..92b15cc3a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "activitystrea.ms": "~2.1.3", - "apollo-cache-inmemory": "~1.6.1", + "apollo-cache-inmemory": "~1.6.2", "apollo-client": "~2.6.2", "apollo-link-context": "~1.0.14", "apollo-link-http": "~1.5.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 28c2b8b55..47cd1be39 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1303,18 +1303,18 @@ apollo-cache-control@^0.1.0: dependencies: graphql-extensions "^0.0.x" -apollo-cache-inmemory@~1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.1.tgz#536b6f366461f6264250041f9146363e2faa1d4c" - integrity sha512-c/WJjh9MTWcdussCTjLKufpPjTx3qOFkBPHIDOOpQ+U0B7K1PczPl9N0LaC4ir3wAWL7s4A0t2EKtoR+6UP92g== +apollo-cache-inmemory@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e" + integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ== dependencies: - apollo-cache "^1.3.1" - apollo-utilities "^1.3.1" + apollo-cache "^1.3.2" + apollo-utilities "^1.3.2" optimism "^0.9.0" ts-invariant "^0.4.0" tslib "^1.9.3" -apollo-cache@1.3.2, apollo-cache@^1.3.1: +apollo-cache@1.3.2, apollo-cache@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a" integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg== @@ -1566,7 +1566,7 @@ apollo-upload-server@^7.0.0: http-errors "^1.7.0" object-path "^0.11.4" -apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1, apollo-utilities@^1.3.2: +apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9" integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg== From d32f577c8c0bbf06cdeca41998ecde2d5371bd29 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Fri, 7 Jun 2019 19:08:40 -0300 Subject: [PATCH 5/5] 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" }