Merge pull request #5923 from Ocelot-Social-Community/fix-group-texts

fix(webapp): texts for groups

webapp/components/Group/GroupForm.vue

@@ -48,7 +48,7 @@
           @change="changeGroupType($event)"
         >
           <option v-for="groupType in groupTypeOptions" :key="groupType" :value="groupType">
-            {{ $t(`group.types.${groupType}`) }}
+            {{ $t(`group.typesOptions.${groupType}`) }}
           </option>
         </select>
         <ds-chip
@@ -146,21 +146,21 @@
         <ds-space margin-top="small" />
 
         <!-- category -->
-        <categories-select
+        <div v-if="categoriesActive">
-          v-if="categoriesActive"
+          <ds-text class="select-label">
-          model="categoryIds"
+            {{ $t('group.categoriesTitle') }}
-          name="categoryIds"
+          </ds-text>
-          :existingCategoryIds="formData.categoryIds"
-        />
-        <ds-chip
-          v-if="categoriesActive"
-          size="base"
-          :color="errors && errors.categoryIds ? 'danger' : 'medium'"
-        >
-          {{ formData.categoryIds.length }} / 3
-          <base-icon v-if="errors && errors.categoryIds" name="warning" />
-        </ds-chip>
 
+          <categories-select
+            model="categoryIds"
+            name="categoryIds"
+            :existingCategoryIds="formData.categoryIds"
+          />
+          <ds-chip size="base" :color="errors && errors.categoryIds ? 'danger' : 'medium'">
+            {{ formData.categoryIds.length }} / 3
+            <base-icon v-if="errors && errors.categoryIds" name="warning" />
+          </ds-chip>
+        </div>
         <!-- submit -->
         <ds-space margin-top="large">
           <nuxt-link to="/groups">

webapp/locales/de.json

@@ -397,13 +397,13 @@
   },
   "group": {
     "actionRadii": {
-      "continental": "Kontinentale Gruppe",
+      "continental": "Kontinental",
-      "global": "Globale Gruppe",
+      "global": "Global oder nur virtuell",
-      "interplanetary": "Interplanetare Gruppe",
+      "interplanetary": "Interplanetar",
-      "national": "Nationale Gruppe",
+      "national": "National",
-      "regional": "Regionale Gruppe"
+      "regional": "Regional"
     },
-    "actionRadius": "Aktionsradius",
+    "actionRadius": "Aktionsradius der Gruppe",
     "addMemberToGroup": "Zur Gruppe hinzufügen",
     "addMemberToGroupSuccess": "„{name}“ wurde der Gruppe mit der Rolle „{role}“ hinzugefügt!",
     "addUser": "Benutzer hinzufügen",
@@ -411,6 +411,7 @@
     "addUserPlaceholder": "Benutzername",
     "allGroups": "Alle Gruppen",
     "categories": "Thema ::: Themen",
+    "categoriesTitle": "Themen der Gruppe",
     "changeMemberRole": "Die Rolle wurde auf „{role}“ geändert!",
     "contentMenu": {
       "visitGroupPage": "Gruppe anzeigen"
@@ -472,11 +473,16 @@
       "usual": "Einfaches Mitglied"
     },
     "save": "Neue Gruppe anlegen",
-    "type": "Gruppentyp",
+    "type": "Öffentlichkeit der Gruppe",
     "types": {
-      "closed": "Geschlossene Gruppe",
+      "closed": "Geschlossen",
-      "hidden": "Versteckte Gruppe",
+      "hidden": "Geheim",
-      "public": "Öffentliche Gruppe"
+      "public": "Öffentlich"
+    },
+    "typesOptions": {
+      "closed": "Geschlossen — Alle Beiträge nur für Gruppenmitglieder sichtbar",
+      "hidden": "Geheim — Gruppe (auch der Name) komplett unsichtbar",
+      "public": "Öffentlich — Gruppe und alle Beiträge für registrierte Nutzer sichtbar"
     },
     "update": "Änderung speichern",
     "updatedGroup": "Die Gruppendaten wurden geändert!"

webapp/locales/en.json

@@ -397,13 +397,13 @@
   },
   "group": {
     "actionRadii": {
-      "continental": "Continental Group",
+      "continental": "Continental",
-      "global": "Global Group",
+      "global": "Global or only virtual",
-      "interplanetary": "Interplanetary Group",
+      "interplanetary": "Interplanetary",
-      "national": "National Group",
+      "national": "National",
-      "regional": "Regional Group"
+      "regional": "Regional"
     },
-    "actionRadius": "Action radius",
+    "actionRadius": "Action radius of the group",
     "addMemberToGroup": "Add to group",
     "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
@@ -411,6 +411,7 @@
     "addUserPlaceholder": " Username",
     "allGroups": "All Groups",
     "categories": "Topic ::: Topics",
+    "categoriesTitle": "Topics of the group",
     "changeMemberRole": "The role has been changed to “{role}”!",
     "contentMenu": {
       "visitGroupPage": "Show group"
@@ -472,11 +473,16 @@
       "usual": "Simple Member"
     },
     "save": "Create new group",
-    "type": "Group type",
+    "type": "Visibility of the group",
     "types": {
-      "closed": "Closed Group",
+      "closed": "Closed",
-      "hidden": "Hidden Group",
+      "hidden": "Secret",
-      "public": "Public Group"
+      "public": "Public"
+    },
+    "typesOptions": {
+      "closed": "Closed — All posts only visible to the group's members",
+      "hidden": "Secret — Group (including the name) is completely invisible",
+      "public": "Public — Group and all posts are visible for all registered users"
     },
     "update": "Save change",
     "updatedGroup": "The group data has been changed."