pull && resolve conflicts

webapp/components/Group/GroupForm.vue

@@ -11,34 +11,34 @@
       >
         <ds-input
           v-model="formData.name"
-          :label="$t('group.group-name')"
-          :placeholder="`${$t('group.group-name')}…`"
+          :label="$t('group.groupName')"
+          :placeholder="`${$t('group.groupName')}…`"
         ></ds-input>
 
         <ds-input
           v-if="update"
           v-model="formData.slug"
           :label="$t('users.table.columns.slug')"
-          :placeholder="`${$t('group.group-name')}…`"
+          :placeholder="`${$t('group.groupName')}…`"
         ></ds-input>
 
         <ds-select
           icon="user"
           v-model="formData.groupType"
-          :label="$t('group.visibility')"
+          :label="$t('group.type')"
           :options="['public', 'closed', 'hidden']"
           placeholder="Status ..."
         ></ds-select>
 
         <ds-input
           v-model="formData.about"
-          :label="$t('group.short-description')"
+          :label="$t('group.goal')"
           rows="3"
         ></ds-input>
 
         <ds-input
           v-model="formData.description"
-          :label="$t('group.long-description')"
+          :label="$t('group.description')"
           type="textarea"
           rows="3"
         ></ds-input>
@@ -58,9 +58,9 @@
           <ds-select
             icon="card"
             v-model="formData.actionRadius"
-            :label="$t('group.radius')"
+            :label="$t('group.actionRadius')"
             :options="['regional', 'national', 'continental', 'global']"
-            :placeholder="`${$t('group.radius')} …`"
+            :placeholder="`${$t('group.actionRadius')} …`"
           ></ds-select>
         </ds-space>
         <ds-space margin-top="large">

webapp/components/Group/GroupList.vue

@@ -84,7 +84,6 @@ export default {
         this.$toast.error(error.message)
       }
     },
-
     onlyOwnerGroups(bool) {
       this.$refs.myGruops.hidden = bool
       this.$refs.allGruops.hidden = !bool

webapp/locales/de.json

@@ -384,7 +384,7 @@
     },
     "actionRadius": "Aktionsradius",
     "back": "zurück",
-    "changeMemberRole": "Die Rolle wurde auf ({role}) geändert!",
+    "change-member-role": "Die Rolle wurde auf „{role}“ geändert!",
     "follow": "Folge",
     "foundation": "Gründung",
     "general": "Allgemein",

webapp/locales/en.json

@@ -384,7 +384,7 @@
     },
     "actionRadius": "Action radius",
     "back": "back",
-    "changeMemberRole": "The role has been changed to ({role})!",
+    "change-member-role": "The role has been changed to “{role}”!",
     "follow": "Follow",
     "foundation": "Foundation",
     "general": "General",

webapp/pages/group/edit/_id/members.vue

@@ -16,7 +16,7 @@ export default {
     group: {
       type: Object,
       required: false,
-      default: () => ({}),
+      default: {},
     },
   },
   data() {

webapp/pages/my-groups.vue

@@ -23,7 +23,7 @@
   </div>
 </template>
 <script>
-import GroupList from '~/components/Group/GroupList.vue'
+import GroupList from '~/components/Group/GroupList'
 import { groupQuery } from '~/graphql/groups.js'
 
 export default {