From 0efa487bb2259e6b34c7f45146d9ff7ca5289ff1 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Sun, 29 Oct 2023 19:34:47 +0100 Subject: [PATCH 1/2] split moderators and admins and show both --- frontend/src/graphql/queries.js | 1 + frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + frontend/src/locales/es.json | 1 + frontend/src/locales/fr.json | 1 + frontend/src/locales/nl.json | 1 + frontend/src/locales/tr.json | 1 + frontend/src/pages/InfoStatistic.vue | 20 +++++++++++++++----- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 3cdf55c3f..996c80777 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -241,6 +241,7 @@ export const searchAdminUsers = gql` userList { firstName lastName + role } } } diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 9d3dee531..e73d3da01 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -20,6 +20,7 @@ }, "back": "Zurück", "community": { + "admins": "Administratoren", "choose-another-community": "Eine andere Gemeinschaft auswählen", "community": "Gemeinschaft", "communityMember": "Du bist aktives Mitglied", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4ef319374..9dc029992 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -20,6 +20,7 @@ }, "back": "Back", "community": { + "admins": "Administrators", "choose-another-community": "Choose another community", "community": "Community", "communityMember": "You are an active member", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 439fcca67..a09074962 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -18,6 +18,7 @@ }, "back": "Volver", "community": { + "admins": "Administradores", "choose-another-community": "Escoger otra comunidad", "community": "Comunidad", "continue-to-registration": "Continuar con el registro", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 4ea1a083b..f419bc511 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -20,6 +20,7 @@ }, "back": "Retour", "community": { + "admins": "Administrateurs", "choose-another-community": "Choisissez une autre communauté", "community": "Communauté", "communityMember": "Vous etes un membre actif", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 31cd778a1..ba71c288b 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -18,6 +18,7 @@ }, "back": "Terug", "community": { + "admins": "Beheerders", "choose-another-community": "Kies een andere gemeenschap", "community": "Gemeenschap", "continue-to-registration": "Verder ter registratie", diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json index 610a7d149..0fbc55b95 100644 --- a/frontend/src/locales/tr.json +++ b/frontend/src/locales/tr.json @@ -20,6 +20,7 @@ }, "back": "Geri", "community": { + "admins": "Yöneticiler", "choose-another-community": "Başka bir topluluk seçin", "community": "Topluluk", "continue-to-registration": "Kayıt işlemine devam et", diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue index 1bfb53d4a..0b6a85dd2 100644 --- a/frontend/src/pages/InfoStatistic.vue +++ b/frontend/src/pages/InfoStatistic.vue @@ -11,7 +11,7 @@
-
{{ $t('community.openContributionLinks') }}
+ +
{{ $t('community.admins') }}
+
{{ $t('community.moderators') }}
@@ -96,6 +98,14 @@ export default { totalGradidoAvailable: null, } }, + computed: { + admins() { + return this.itemsAdminUser.filter((item) => item.role === 'ADMIN') + }, + moderators() { + return this.itemsAdminUser.filter((item) => item.role === 'MODERATOR') + }, + }, methods: { getContributionLinks() { this.$apollo From 3a70a548ecc71f982db4ffea578f45c79c26fb68 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Sun, 29 Oct 2023 20:09:14 +0100 Subject: [PATCH 2/2] fix linting --- frontend/src/locales/de.json | 6 +----- frontend/src/locales/en.json | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index b03b83538..3b35450bd 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -28,9 +28,6 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", - "openContributionLinks": "Per Link erzeugte Schöpfungen", - "openContributionLinkText": "Für Startguthaben oder ähnliche Zwecke kann die Gemeinschaft so genannte Schöpfungs-Links erstellen. Sie lösen automatische Schöpfungen aus, die dem Benutzer gut geschrieben werden.\nDie Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "startNewsButton": "Gradidos versenden", "submitContribution": "Schreiben" }, @@ -78,8 +75,7 @@ "yourActivity": "Bitte trage eine Tätigkeit ein!" }, "contribution-link": { - "thanksYouWith": "dankt dir mit", - "unique": "(einmalig)" + "thanksYouWith": "dankt dir mit" }, "contributionText": "Beitragstext", "creation": "Schöpfen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 1207150e8..059ee670c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -28,9 +28,6 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions", - "noOpenContributionLinkText": "Currently there are no link-generated creations.", - "openContributionLinks": "Creations generated by link", - "openContributionLinkText": "For starting credits or similar purposes, the community can create so-called creation links. They trigger automatic creations that are credited to the user.\nThe \"{name}\" community currently supports {count} link-generated creations:", "startNewsButton": "Send Gradidos", "submitContribution": "Contribute" }, @@ -78,8 +75,7 @@ "yourActivity": "Please enter an activity!" }, "contribution-link": { - "thanksYouWith": "thanks you with", - "unique": "(unique)" + "thanksYouWith": "thanks you with" }, "contributionText": "Contribution Text", "creation": "Creation",