From 5932d184d7c5dc18e31189a555470d7a058bd9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 12 Aug 2019 13:27:14 +0200 Subject: [PATCH 1/6] Corrected namings and countings --- webapp/locales/de.json | 10 +++++----- webapp/locales/en.json | 6 +++--- webapp/pages/admin/tags.vue | 2 +- webapp/pages/admin/users.vue | 6 ++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 5a2b77131..4a1400e4d 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -235,7 +235,7 @@ "postCount": "Beiträge" }, "tags": { - "name": "Schlagworte", + "name": "Hashtags", "tagCountUnique": "Benutzer", "tagCount": "Beiträge" }, @@ -543,12 +543,12 @@ "description": "Sollte Dir die Alphaversion unseres Netzwerks wider Erwarten, egal aus welchen Gründen, nicht gefallen, überweisen wir Dir Deine gespendeten Monatsbeiträge innerhalb der ersten 2 Monate gerne zurück. Einfach Mail an: info@human-connection.org Achtung: Viele Funktionen werden erst nach und nach eingebaut." }, "questions": { - "title": "Fragen", - "description": "Die Termine und Links zu den Zoom-Räumen findest Du hier: https://human-connection.org/veranstaltungen/ " + "title": "Fragen", + "description": "Die Termine und Links zu den Zoom-Räumen findest Du hier: https://human-connection.org/veranstaltungen/ " }, "human-connection": { - "title": "Von Menschen für Menschen:", - "description": "Bitte hilf uns weitere monatlichen Spender für Human Connection zu bekommen, damit das Netzwerk so schnell wie möglich offiziell an den Start gehen kann. https://human-connection.org " + "title": "Von Menschen für Menschen:", + "description": "Bitte hilf uns weitere monatlichen Spender für Human Connection zu bekommen, damit das Netzwerk so schnell wie möglich offiziell an den Start gehen kann. https://human-connection.org " }, "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎", "closing": "Herzlichst

Euer Human Connection Team" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index fe0f1c99c..31c1af8f6 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -107,7 +107,7 @@ "follow": "Follow", "followers": "Followers", "following": "Following", - "shouted": "Recommended", + "shouted": "Shouted", "commented": "Commented", "userAnonym": "Anonymous", "socialMedia": "Where else can I find", @@ -203,7 +203,7 @@ "projects": "Projects", "invites": "Invites", "follows": "Follows", - "shouts": "Recommended" + "shouts": "Shouts" }, "organizations": { "name": "Organizations" @@ -235,7 +235,7 @@ "postCount": "Posts" }, "tags": { - "name": "Tags", + "name": "Hashtags", "tagCountUnique": "Users", "tagCount": "Posts" }, diff --git a/webapp/pages/admin/tags.vue b/webapp/pages/admin/tags.vue index 53808fc53..06b32a508 100644 --- a/webapp/pages/admin/tags.vue +++ b/webapp/pages/admin/tags.vue @@ -2,7 +2,7 @@ diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue index 0d737cfc0..3da484fe6 100644 --- a/webapp/pages/admin/users.vue +++ b/webapp/pages/admin/users.vue @@ -21,7 +21,7 @@ From 1d180480c4d10573f231d1e32c333d63b393e2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 12 Aug 2019 15:35:09 +0200 Subject: [PATCH 2/6] 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 @@ + @@ -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 @@