diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 3adf3204c..de0b1f38f 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -11,30 +11,30 @@ > - + @@ -54,9 +54,9 @@ @@ -67,7 +67,7 @@ /> - Reset form + {{ $t('group.reset-form') }} - zurück + {{$t('group.back')}} diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index 590243277..5f3ab8d4d 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -1,8 +1,8 @@ - show only my groups - show all groups + {{$t('group.show-my-created-groups')}} + {{$t('group.show-all-my-groups')}} diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue index 00c3a4094..16f22eb2d 100644 --- a/webapp/components/Group/GroupMember.vue +++ b/webapp/components/Group/GroupMember.vue @@ -1,6 +1,6 @@ - Members + {{$t('group.members')}} @@ -32,12 +32,12 @@ @@ -72,7 +72,7 @@ export default { mutation: changeGroupMemberRoleMutation, variables: { groupId: this.groupId, userId: id, roleInGroup: newRole }, }) - this.$toast.success('Die Rolle wurde auf (' + newRole + ') geändert!') + this.$toast.success(this.$t('group.change-member-role', {role: newRole})) } catch (error) { this.$toast.error(error.message) } diff --git a/webapp/components/Group/GroupMenu.vue b/webapp/components/Group/GroupMenu.vue index deed94e75..58a2d60ae 100644 --- a/webapp/components/Group/GroupMenu.vue +++ b/webapp/components/Group/GroupMenu.vue @@ -59,14 +59,14 @@ export default { if (this.resourceType === 'group') { if (this.isOwner === 'owner') { routes.push({ - label: 'Settings', + label: $t('admin.settings.name'), path: `/group/edit/${this.resource.id}`, icon: 'edit', }) } if (this.isOwner === 'usual') { routes.push({ - label: 'Unfollowing', + label: $t('group.unfollowing'), callback: () => { // this.$emit('join-group', this.resource) }, @@ -75,7 +75,7 @@ export default { } if (this.isOwner === 'pending') { routes.push({ - label: 'Unfollowing', + label: $t('group.unfollowing'), callback: () => { // this.removePending(this.resource) }, @@ -84,7 +84,7 @@ export default { } if (this.isOwner === null) { routes.push({ - label: 'Following', + label: $t('group.follow'), callback: () => { this.$emit('joinGroup', this.resource) }, diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 4e046044b..172c6233a 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -371,11 +371,28 @@ "following": "Folge Ich" }, "group": { + "group-name":"Gruppenname", + "myGroups": "Meine Gruppen", "group-created": "Die Gruppe wurde angelegt!", "group-updated": "Die Gruppendaten wurden geändert!", "newGroup": "Erstelle eine neue Gruppe", "save": "Neue Gruppe anlegen", - "update": "Änderung speichern" + "update": "Änderung speichern", + "show-my-created-groups":"Meine angelegten Gruppen anzeigen", + "show-all-my-groups":"Alle meine Gruppen anzeigen", + "visibility":"Sichtbarkeit", + "short-description":"Kurzbeschreibung", + "long-description":"Beschreibung", + "radius":"Radius", + "reset-form":"Formular zurücksetzen", + "back":"zurück", + "unfollowing":"Nicht mehr folgen", + "follow":"Folge", + "settings":"Gruppeneinstellungen", + "general":"Allgemein", + "members":"Mitglieder", + "removemember":"Mitglied entfernen", + "change-member-role":"Die Rolle wurde auf ({role}) geändert!" }, "hashtags-filter": { "clearSearch": "Suche löschen", @@ -754,7 +771,6 @@ "unmute": "Stummschaltung aufheben", "unmuted": "{name} ist nicht mehr stummgeschaltet" }, - "myGroups": "Meine Gruppen", "name": "Einstellungen", "notifications": { "name": "Benachrichtigungen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 2f5bef5fe..26db326a4 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -371,11 +371,27 @@ "following": "Following" }, "group": { + "group-name":"Group name", + "myGroups": "My Groups", "group-created": "The group was created!", "group-updated": "The group data has been changed.", "newGroup": "Create a new Group", "save": "Create new group", - "update": "Save change" + "update": "Save change", + "show-my-created-groups":"show only my groups", + "show-all-my-groups":"show all groups", + "visibility":"Visibility", + "short-description":"Short description", + "long-description":"Description", + "radius":"Radius", + "reset-form":"Reset form", + "back":"back", + "unfollowing":"unfollowing", + "follow":"Follow", + "settings":"Group Settings", + "general":"General", + "members":"Members", + "remove-member":"Remove member" }, "hashtags-filter": { "clearSearch": "Clear search", @@ -754,7 +770,6 @@ "unmute": "Unmute user", "unmuted": "{name} is unmuted again" }, - "myGroups": "My Groups", "name": "Settings", "notifications": { "name": "Notifications", diff --git a/webapp/pages/group/create.vue b/webapp/pages/group/create.vue index 0a050c7cc..bbc10e131 100644 --- a/webapp/pages/group/create.vue +++ b/webapp/pages/group/create.vue @@ -1,7 +1,7 @@ - Create New Groupe + {{$t('group.newGroup')}}Create New Groupe diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue index aa6fc6539..938d6f26a 100644 --- a/webapp/pages/group/edit/_id.vue +++ b/webapp/pages/group/edit/_id.vue @@ -2,7 +2,7 @@ {{ group.name }} - Group Setting + {{$t('group.settings')}} @@ -17,7 +17,7 @@ - zurück + {{$t('group.back')}} @@ -34,11 +34,11 @@ export default { routes() { return [ { - name: 'General', + name: $t('group.general'), path: `/group/edit/${this.group.id}`, }, { - name: 'Members', + name: $t('group.members'), path: `/group/edit/${this.group.id}/members`, }, ] diff --git a/webapp/pages/my-groups.vue b/webapp/pages/my-groups.vue index 888f6280c..b91fcec48 100644 --- a/webapp/pages/my-groups.vue +++ b/webapp/pages/my-groups.vue @@ -1,7 +1,7 @@ - My Groups + {{$t('group.myGroups')}}