From d0647c6ac46cf3ab6406544682ab75b6ab07af77 Mon Sep 17 00:00:00 2001 From: Will Franklin Date: Thu, 1 Aug 2024 15:43:04 +0200 Subject: [PATCH] Show newsletter group names, and move to new section --- apps/frontend/locales/de.json | 9 +- apps/frontend/locales/de@easy.json | 1 + apps/frontend/locales/de@informal.json | 9 +- apps/frontend/locales/en.json | 9 +- apps/frontend/locales/it.json | 1 + apps/frontend/locales/nl.json | 1 + apps/frontend/locales/pt.json | 5 +- apps/frontend/locales/ru.json | 7 +- .../src/pages/admin/contacts/[id]/index.vue | 104 +++++++++++------- 9 files changed, 93 insertions(+), 53 deletions(-) diff --git a/apps/frontend/locales/de.json b/apps/frontend/locales/de.json index 6f1b3b411..0518e5580 100644 --- a/apps/frontend/locales/de.json +++ b/apps/frontend/locales/de.json @@ -608,7 +608,11 @@ "contribution": "Beitrag", "contributionType": "Zahlungsart", "joinSurvey": "Anmelde-Fragebogen", - "newsletter": "Newsletter", + "newsletter": { + "groups": "Gruppe", + "status": "Status", + "title": "Newsletter" + }, "overview": "Überblick", "pickTag": "Tag aus der Liste wählen", "profile": "Profil", @@ -646,7 +650,6 @@ "description": "Beschreibung", "email": "E-Mail", "firstname": "Vorname", - "groups": "Gruppe", "joined": "Kontakt seit", "lastSeen": "Zuletzt angemeldet", "lastname": "Nachname", @@ -654,7 +657,7 @@ "membershipExpires": "Mitglied bis", "membershipStarts": "Mitglied seit", "name": "Name", - "newsletter": "Newsletter", + "newsletterGroups": "Newsletter-Gruppe", "newsletterStatus": "Newsletter-Status", "notes": "Notizen", "payingFee": "Übernimmt Transaktionskosten?", diff --git a/apps/frontend/locales/de@easy.json b/apps/frontend/locales/de@easy.json index fcc8fede7..e0dbaf127 100644 --- a/apps/frontend/locales/de@easy.json +++ b/apps/frontend/locales/de@easy.json @@ -166,6 +166,7 @@ }, "contactOverview": { "annotation": {}, + "newsletter": {}, "security": { "mfa": {} } diff --git a/apps/frontend/locales/de@informal.json b/apps/frontend/locales/de@informal.json index 654de1751..93aa8b7be 100644 --- a/apps/frontend/locales/de@informal.json +++ b/apps/frontend/locales/de@informal.json @@ -608,7 +608,11 @@ "contribution": "Beitrag", "contributionType": "Zahlungsart", "joinSurvey": "Anmelde-Fragebogen", - "newsletter": "Newsletter", + "newsletter": { + "groups": "Gruppe", + "status": "Status", + "title": "Newsletter" + }, "overview": "Überblick", "pickTag": "Tag aus der Liste wählen", "profile": "Profil", @@ -646,7 +650,6 @@ "description": "Beschreibung", "email": "E-Mail", "firstname": "Vorname", - "groups": "Gruppe", "joined": "Kontakt seit", "lastSeen": "Zuletzt angemeldet", "lastname": "Nachname", @@ -654,7 +657,7 @@ "membershipExpires": "Mitglied bis", "membershipStarts": "Mitglied seit", "name": "Name", - "newsletter": "Newsletter", + "newsletterGroups": "Newsletter-Gruppe", "newsletterStatus": "Newsletter-Status", "notes": "Notizen", "payingFee": "Übernimmt Transaktionskosten?", diff --git a/apps/frontend/locales/en.json b/apps/frontend/locales/en.json index 6fb47a24a..3ad10e672 100644 --- a/apps/frontend/locales/en.json +++ b/apps/frontend/locales/en.json @@ -612,7 +612,11 @@ "contribution": "Contribution", "contributionType": "Type", "joinSurvey": "Join survey", - "newsletter": "Newsletter", + "newsletter": { + "groups": "Groups", + "status": "Status", + "title": "Newsletter" + }, "overview": "Overview", "pickTag": "Pick a tag from the list below", "profile": "Profile", @@ -650,7 +654,6 @@ "description": "Description", "email": "Email", "firstname": "First name", - "groups": "Groups", "joined": "Joined", "lastSeen": "Last seen", "lastname": "Last name", @@ -658,7 +661,7 @@ "membershipExpires": "Member until", "membershipStarts": "Member since", "name": "Name", - "newsletter": "Newsletter", + "newsletterGroups": "Newsletter groups", "newsletterStatus": "Newsletter status", "notes": "Notes", "payingFee": "Paying fee?", diff --git a/apps/frontend/locales/it.json b/apps/frontend/locales/it.json index 73cea03d4..4cb5650b1 100644 --- a/apps/frontend/locales/it.json +++ b/apps/frontend/locales/it.json @@ -210,6 +210,7 @@ }, "contactOverview": { "annotation": {}, + "newsletter": {}, "security": { "mfa": {} } diff --git a/apps/frontend/locales/nl.json b/apps/frontend/locales/nl.json index c74855e5c..a3856208b 100644 --- a/apps/frontend/locales/nl.json +++ b/apps/frontend/locales/nl.json @@ -171,6 +171,7 @@ }, "contactOverview": { "annotation": {}, + "newsletter": {}, "security": { "mfa": { "disabledDesc": "Deze contactpersoon heeft geen 2FA geactiveerd." diff --git a/apps/frontend/locales/pt.json b/apps/frontend/locales/pt.json index 20d94baac..84f152728 100644 --- a/apps/frontend/locales/pt.json +++ b/apps/frontend/locales/pt.json @@ -378,6 +378,9 @@ }, "contactOverview": { "annotation": {}, + "newsletter": { + "groups": "Grupos" + }, "security": { "mfa": { "desc": "Este contato ativou o 2FA. Clica no botão \"{ disableLabel }\" para desativar.", @@ -402,7 +405,6 @@ "description": "Descrição", "email": "Email", "firstname": "Primeiro nome", - "groups": "Grupos", "joined": "Inscreveu-se em", "lastSeen": "Visto pela última vez em", "lastname": "Último nome", @@ -410,7 +412,6 @@ "membershipExpires": "Membro até", "membershipStarts": "Membro desde", "name": "Nome", - "newsletter": "Newsletter", "newsletterStatus": "Assinatura da newsletter", "notes": "Notas", "payingFee": "Paga a taxa?", diff --git a/apps/frontend/locales/ru.json b/apps/frontend/locales/ru.json index e0272aa57..742c39520 100644 --- a/apps/frontend/locales/ru.json +++ b/apps/frontend/locales/ru.json @@ -353,7 +353,11 @@ "copy": "

Вся информация, добавленная в этот раздел, видна только администраторам. Участники никогда не увидят их в своем профиле или личном кабинете.

\n" }, "contribution": "Взнос", - "newsletter": "Новости", + "newsletter": { + "groups": "Группы", + "status": "Статус", + "title": "Новости" + }, "overview": "Обзор", "roles": "Роль", "security": { @@ -376,7 +380,6 @@ "deliveryOptIn": "Согласие на доставку", "description": "Описание", "email": "Почтовый ящик", - "groups": "Группы", "joined": "Участник с", "lastSeen": "Последний раз онлайн", "name": "Имя", diff --git a/apps/frontend/src/pages/admin/contacts/[id]/index.vue b/apps/frontend/src/pages/admin/contacts/[id]/index.vue index 85a207a9b..68e3ea130 100644 --- a/apps/frontend/src/pages/admin/contacts/[id]/index.vue +++ b/apps/frontend/src/pages/admin/contacts/[id]/index.vue @@ -114,40 +114,57 @@ meta: @@ -228,7 +245,11 @@ meta: