From 9d6f6400820b089906d1a7c730e456a798b8e282 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Mon, 15 Jan 2024 23:50:09 +0100 Subject: [PATCH 001/163] New translations email+intl-icu.en.json (English) --- api/translations/email+intl-icu.en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index ac419d19bc..d46172b304 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { "subject": "Welcome to eCamp3" }, "passwordReset": { - "subject": "[eCamp3] Password reset" + "subject": "[eCamp v3] Password reset" }, "emailVerification": { - "subject": "[eCamp3] Verify email address" + "subject": "[eCamp v3] Verify email address" } } \ No newline at end of file From 66f66866ad0386888845d1c7d1adbf80e53255be Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Mon, 15 Jan 2024 23:50:11 +0100 Subject: [PATCH 002/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 538f3aec7df8b8bcbbc5542ee0236891a2a42f3e Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Tue, 16 Jan 2024 01:35:40 +0100 Subject: [PATCH 003/163] Update source file email+intl-icu.en.json --- api/translations/email+intl-icu.en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index d46172b304..ac419d19bc 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { "subject": "Welcome to eCamp3" }, "passwordReset": { - "subject": "[eCamp v3] Password reset" + "subject": "[eCamp3] Password reset" }, "emailVerification": { - "subject": "[eCamp v3] Verify email address" + "subject": "[eCamp3] Verify email address" } } \ No newline at end of file From 2c46adad24616c5fb34272ccc2eba7c1eec8f5ce Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Tue, 16 Jan 2024 01:35:42 +0100 Subject: [PATCH 004/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 2d6d595773c111f94efd5dddded8be69533715df Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Thu, 18 Jan 2024 09:46:42 +0100 Subject: [PATCH 005/163] New translations en.json (French, Switzerland) --- frontend/src/locales/fr.json | 38 +++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 2c9fb9bfa3..b93f631867 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -20,12 +20,20 @@ } } }, + "copyActivityInfoDialog": { + "allow": "Autoriser maintenant", + "denied": "Vous avez refusé l'accès à votre presse-papiers. Par conséquent, vous ne pouvez pas coller les activités copiées.", + "description": "Pour coller une activité copiée, vous devez autoriser eCamp à lire votre presse-papiers.", + "granted": "Vous pouvez maintenant coller les activités copiées.", + "title": "Copier et coller une activité" + }, "menuCardlessContentNode": { "deletingDisabled": "Doit être vide pour être supprimé" }, "scheduleEntry": { "backToContents": "Retour à l'édition du contenu", "changeLayout": "Changer la mise en page", + "copyScheduleEntry": "Copier une activité", "deleteWarning": "Veux-tu vraiment supprimer cette activité ? Tout le contenu de cette activité sera supprimé." }, "togglePaperSize": { @@ -138,7 +146,7 @@ "campCreate": { "steps": { "configurate": "Configuration", - "infos": "Info", + "infos": "Infos", "template": "Modèle" } }, @@ -166,7 +174,7 @@ "categoryTemplate": { "contents": "Contenus", "createLayoutHelp": "Ici, vous pouvez définir le modèle pour de nouvelles activités {categoryShort}.{br}Le contenu et la mise en page des activités {categoryShort} déjà créées ne seront pas ajustés.", - "layout": "Layout", + "layout": "Mise en page", "noTemplate": "Pas de modèle" } }, @@ -312,7 +320,7 @@ "config": { "Activity": "Activité unique", "Cover": "Page de couverture", - "Picasso": "Picasso", + "Picasso": "Programme général", "Program": "Programme", "Story": "Histoire", "Toc": "Table des matières" @@ -337,6 +345,15 @@ } }, "program": { + "dialogActivityCreate": { + "clearClipboard": "Vider le presse-papier", + "clipboard": "Presse-papier", + "copyActivity": "Copier une activité", + "copyActivityContent": "Copier le contenu depuis une activité", + "copyPastActivity": "Copier et coller une activité", + "copySourceInfo": "Vous pouvez coller ici l'URL d'une activité pour copier son contenu.", + "pasteActivity": "coller l'activité" + }, "formScheduleEntryItem": { "end": "Fin", "start": "Début" @@ -414,13 +431,13 @@ "discard": "Rejeter", "download": "Télécharger", "edit": "Éditer", - "editable": "Editable", + "editable": "Modifiable", "filter": "Filtrer", "lock": "Verrouiller", "login": "Se connecter", "logout": "Déconnexion", "move": "Déplacer", - "ok": "OK", + "ok": "Ok", "open": "Ouvrir", "remove": "Retirer", "rename": "Renommer", @@ -452,6 +469,9 @@ "409": "Oooops... Cette action a provoqué une erreur côté serveur.", "short": "erreur de serveur" }, + "toast": { + "copied": "{source} copié" + }, "validation": { "greaterThanOrEqual_date": "{_field_} ne peut pas être antérieure à {min}", "greaterThan_time": "{_field_} doit être postérieure à {min}", @@ -480,7 +500,7 @@ "inactiveCollaborators": "Inactif", "members": "Membres", "openInvitations": "Invitations ouvertes", - "title": "Team" + "title": "Équipe" }, "info": { "title": "Infos sur le camp" @@ -491,7 +511,7 @@ "sideBarAdmin": { "itemActivity": "Activités", "itemActivitySubtitle": "Catégorie, modèle & statut", - "itemCollaborators": "Team", + "itemCollaborators": "Équipe", "itemInfos": "Infos sur le camp", "itemMaterialLists": "Liste de matériel", "itemPrint": "PDF / Imprimer" @@ -604,7 +624,7 @@ "print": "Imprimer", "program": "Programme", "story": "Histoire", - "team": "Team" + "team": "Équipe" } }, "mobile": { @@ -619,7 +639,7 @@ "itemActivitySubtitle": "Catégorie, modèle & statut", "itemCamps": "Mes Camps", "itemClose": "Fermer le menu", - "itemCollaborators": "Team", + "itemCollaborators": "Équipe", "itemInfos": "Infos sur le camp", "itemMaterialLists": "Liste de matériel", "itemPrinting": "PDF / Imprimer" From 08f45dbef77201812bc6ba94e0ad993e3bebbc90 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 31 Jan 2024 19:18:21 +0100 Subject: [PATCH 006/163] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ea49c354b3..2ec4e1a3ee 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -174,7 +174,7 @@ "categoryTemplate": { "contents": "Inhalte", "createLayoutHelp": "Hier kannst du die Vorlage für neue {categoryShort}-Blöcke definieren.{br}Blockinhalt & Layout bereits erstellter {categoryShort}-Blöcke, werden nicht angepasst.", - "layout": "Layout", + "layout": "Format", "noTemplate": "Keine Vorlage" } }, @@ -415,7 +415,7 @@ "password": "Passwort", "surname": "Nachname" }, - "name": "User" + "name": "Benutzer" } }, "global": { @@ -462,7 +462,7 @@ "loading": "Laden …", "navigation": { "admin": { - "title": "Admin" + "title": "Administrator" } }, "serverError": { @@ -516,7 +516,7 @@ "itemMaterialLists": "Materiallisten", "itemPrint": "PDF / Drucken" }, - "title": "Admin" + "title": "Administrator" }, "auth": { "activate": { @@ -618,7 +618,7 @@ "navigation": { "desktop": { "navTopbar": { - "admin": "Admin", + "admin": "Administrator", "campIsLoading": "Lager wird geladen", "material": "Material", "print": "Drucken", From 34573048c4a119edc64122423bbd4e848797ad98 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 31 Jan 2024 22:52:33 +0100 Subject: [PATCH 007/163] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 2ec4e1a3ee..760e3a5000 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -174,7 +174,7 @@ "categoryTemplate": { "contents": "Inhalte", "createLayoutHelp": "Hier kannst du die Vorlage für neue {categoryShort}-Blöcke definieren.{br}Blockinhalt & Layout bereits erstellter {categoryShort}-Blöcke, werden nicht angepasst.", - "layout": "Format", + "layout": "Layout", "noTemplate": "Keine Vorlage" } }, @@ -462,7 +462,7 @@ "loading": "Laden …", "navigation": { "admin": { - "title": "Administrator" + "title": "Admin" } }, "serverError": { @@ -516,7 +516,7 @@ "itemMaterialLists": "Materiallisten", "itemPrint": "PDF / Drucken" }, - "title": "Administrator" + "title": "Admin" }, "auth": { "activate": { From 176a6b2b1f4967e74d08d98d8f02fc3cf670b36d Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 31 Jan 2024 22:52:36 +0100 Subject: [PATCH 008/163] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 api/translations/validators.de_CH.yml diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml new file mode 100644 index 0000000000..71345b56d1 --- /dev/null +++ b/api/translations/validators.de_CH.yml @@ -0,0 +1,7 @@ +Cannot delete the last entry.: "Letzter Eintrag kann nicht gelöscht werden." +Cannot delete the last schedule entry.: "Der letzte Kalendereintrag konnte nicht gelöscht werden." +"Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." +This inviteEmail is already present in the camp.: "Diese Email ist bereits im Lager vorhanden." +This is a test message for i18n variants: "en" +This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser Email Adresse nimmt bereits an diesem Lager teil." +"value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war {{ value }}" From 828b4df589dbcea8264db370ff052f48a848df25 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 31 Jan 2024 22:52:38 +0100 Subject: [PATCH 009/163] New translations email+intl-icu.en.json (English) --- api/translations/email+intl-icu.en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index ac419d19bc..df5e61e81e 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { - "subject": "Welcome to eCamp3" + "subject": "Welcome to eCamp v3" }, "passwordReset": { - "subject": "[eCamp3] Password reset" + "subject": "[eCamp v3] Password reset" }, "emailVerification": { - "subject": "[eCamp3] Verify email address" + "subject": "[eCamp v3] Verify email address" } } \ No newline at end of file From 02905e3432b8b2d9601e753e518058086f52e1cd Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 31 Jan 2024 22:52:39 +0100 Subject: [PATCH 010/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 1ce395f9cf39b8ec1bce23d3ec538c46e59a7ea0 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:37:13 +0100 Subject: [PATCH 011/163] Update source file email+intl-icu.en.json --- api/translations/email+intl-icu.en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index df5e61e81e..ac419d19bc 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { - "subject": "Welcome to eCamp v3" + "subject": "Welcome to eCamp3" }, "passwordReset": { - "subject": "[eCamp v3] Password reset" + "subject": "[eCamp3] Password reset" }, "emailVerification": { - "subject": "[eCamp v3] Verify email address" + "subject": "[eCamp3] Verify email address" } } \ No newline at end of file From 6ca67aecc0d4b3a756757200fbe08c07877f3496 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:37:14 +0100 Subject: [PATCH 012/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 77c4e8d01f617cf583bf71760c3517bafe543063 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:37:43 +0100 Subject: [PATCH 013/163] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 760e3a5000..ea49c354b3 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -415,7 +415,7 @@ "password": "Passwort", "surname": "Nachname" }, - "name": "Benutzer" + "name": "User" } }, "global": { @@ -618,7 +618,7 @@ "navigation": { "desktop": { "navTopbar": { - "admin": "Administrator", + "admin": "Admin", "campIsLoading": "Lager wird geladen", "material": "Material", "print": "Drucken", From 60a59b1ea1aa563b80dce25d863aa888fb240dcb Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:37:44 +0100 Subject: [PATCH 014/163] New translations en.json (French, Switzerland) --- frontend/src/locales/fr.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index b93f631867..9bdb9c7e21 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -146,7 +146,7 @@ "campCreate": { "steps": { "configurate": "Configuration", - "infos": "Infos", + "infos": "Info", "template": "Modèle" } }, @@ -174,7 +174,7 @@ "categoryTemplate": { "contents": "Contenus", "createLayoutHelp": "Ici, vous pouvez définir le modèle pour de nouvelles activités {categoryShort}.{br}Le contenu et la mise en page des activités {categoryShort} déjà créées ne seront pas ajustés.", - "layout": "Mise en page", + "layout": "Layout", "noTemplate": "Pas de modèle" } }, @@ -320,7 +320,7 @@ "config": { "Activity": "Activité unique", "Cover": "Page de couverture", - "Picasso": "Programme général", + "Picasso": "Picasso", "Program": "Programme", "Story": "Histoire", "Toc": "Table des matières" @@ -431,13 +431,13 @@ "discard": "Rejeter", "download": "Télécharger", "edit": "Éditer", - "editable": "Modifiable", + "editable": "Editable", "filter": "Filtrer", "lock": "Verrouiller", "login": "Se connecter", "logout": "Déconnexion", "move": "Déplacer", - "ok": "Ok", + "ok": "OK", "open": "Ouvrir", "remove": "Retirer", "rename": "Renommer", @@ -500,7 +500,7 @@ "inactiveCollaborators": "Inactif", "members": "Membres", "openInvitations": "Invitations ouvertes", - "title": "Équipe" + "title": "Team" }, "info": { "title": "Infos sur le camp" @@ -511,7 +511,7 @@ "sideBarAdmin": { "itemActivity": "Activités", "itemActivitySubtitle": "Catégorie, modèle & statut", - "itemCollaborators": "Équipe", + "itemCollaborators": "Team", "itemInfos": "Infos sur le camp", "itemMaterialLists": "Liste de matériel", "itemPrint": "PDF / Imprimer" @@ -624,7 +624,7 @@ "print": "Imprimer", "program": "Programme", "story": "Histoire", - "team": "Équipe" + "team": "Team" } }, "mobile": { @@ -639,7 +639,7 @@ "itemActivitySubtitle": "Catégorie, modèle & statut", "itemCamps": "Mes Camps", "itemClose": "Fermer le menu", - "itemCollaborators": "Équipe", + "itemCollaborators": "Team", "itemInfos": "Infos sur le camp", "itemMaterialLists": "Liste de matériel", "itemPrinting": "PDF / Imprimer" From e1e52178bc02b546d00348bde395dc2cf973ae26 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:37:47 +0100 Subject: [PATCH 015/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 54402699dca5d373978c8f2d18396492cb7d3b1a Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:09:51 +0100 Subject: [PATCH 016/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From c90b9dcb8a7db4312c383ae595524fad92566fd1 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:09:55 +0100 Subject: [PATCH 017/163] New translations email+intl-icu.en.json (English) --- api/translations/email+intl-icu.en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index ac419d19bc..df5e61e81e 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { - "subject": "Welcome to eCamp3" + "subject": "Welcome to eCamp v3" }, "passwordReset": { - "subject": "[eCamp3] Password reset" + "subject": "[eCamp v3] Password reset" }, "emailVerification": { - "subject": "[eCamp3] Verify email address" + "subject": "[eCamp v3] Verify email address" } } \ No newline at end of file From 661c9fea28191c595853705bffd657d86880dfb3 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:09:56 +0100 Subject: [PATCH 018/163] New translations email+intl-icu.en.json (German, Switzerland) --- api/translations/email+intl-icu.de.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.de.json b/api/translations/email+intl-icu.de.json index 12dc0cc5c7..08097db216 100644 --- a/api/translations/email+intl-icu.de.json +++ b/api/translations/email+intl-icu.de.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp3] Du wurdest ins Lager \"{campName}\" eingeladen" + "subject": "[eCamp v3] Du wurdest ins Lager \"{campName}\" eingeladen" }, "userActivation": { - "subject": "Willkommen bei eCamp3" + "subject": "Willkommen bei eCamp v3" }, "passwordReset": { - "subject": "[eCamp3] Passwort zurücksetzen" + "subject": "[eCamp v3] Passwort zurücksetzen" }, "emailVerification": { - "subject": "[eCamp3] E-Mail-Adresse verifizieren" + "subject": "[eCamp v3] E-Mail-Adresse verifizieren" } } \ No newline at end of file From 2bb31e0797ce032850c4fd2c52bedf6d088d5fde Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:09:57 +0100 Subject: [PATCH 019/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 847d966155ef5027f76935544604168d22f8134c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:16 +0100 Subject: [PATCH 020/163] Update source file email+intl-icu.en.json --- api/translations/email+intl-icu.en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index df5e61e81e..ac419d19bc 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { - "subject": "Welcome to eCamp v3" + "subject": "Welcome to eCamp3" }, "passwordReset": { - "subject": "[eCamp v3] Password reset" + "subject": "[eCamp3] Password reset" }, "emailVerification": { - "subject": "[eCamp v3] Verify email address" + "subject": "[eCamp3] Verify email address" } } \ No newline at end of file From bf762e03f25f5a03399b6d9647e11537d25affbc Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:17 +0100 Subject: [PATCH 021/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From babd234b76533a3488c1e367e42acc672c8d5d85 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:19 +0100 Subject: [PATCH 022/163] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ea49c354b3..7732c9a69f 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -99,8 +99,8 @@ }, "campPeriodsListItem": { "changePeriodDescription": "Bezeichnung ändern", - "deleteWarning": "Möchtest du diese Periode wirklich löschen?", - "lastPeriodNotDeletable": "Die letzte Periode kann nicht gelöscht werden.", + "deleteWarning": "Möchtest du diesen Lagerabschnitt wirklich löschen?", + "lastPeriodNotDeletable": "Der letzte Lagerabschnitt kann nicht gelöscht werden.", "movePeriod": "Lagerabschnitt verschieben", "periodChangeEnd": "Am Ende Tage hinzufügen/entfernen", "periodChangeStart": "Zu Begin Tage hinzufügen/entfernen" From b4f052bf615de7287f560e77e7a0a21d542302cd Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:21 +0100 Subject: [PATCH 023/163] New translations email+intl-icu.en.json (English) --- api/translations/email+intl-icu.en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index ac419d19bc..df5e61e81e 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1,14 @@ { "inviteToCamp": { - "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\"" + "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" }, "userActivation": { - "subject": "Welcome to eCamp3" + "subject": "Welcome to eCamp v3" }, "passwordReset": { - "subject": "[eCamp3] Password reset" + "subject": "[eCamp v3] Password reset" }, "emailVerification": { - "subject": "[eCamp3] Verify email address" + "subject": "[eCamp v3] Verify email address" } } \ No newline at end of file From dabbc7f83a51f3908ecdc229c7303ec621be04f8 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:22 +0100 Subject: [PATCH 024/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From f98ef8c31ecc7230ef06f8c1cac80a8808917dad Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:28:23 +0100 Subject: [PATCH 025/163] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml index 71345b56d1..51289b6381 100644 --- a/api/translations/validators.de_CH.yml +++ b/api/translations/validators.de_CH.yml @@ -3,5 +3,5 @@ Cannot delete the last schedule entry.: "Der letzte Kalendereintrag konnte nicht "Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." This inviteEmail is already present in the camp.: "Diese Email ist bereits im Lager vorhanden." This is a test message for i18n variants: "en" -This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser Email Adresse nimmt bereits an diesem Lager teil." +This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser E-Mail-Adresse nimmt bereits an diesem Lager teil." "value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war {{ value }}" From 2e8bf5baed020f40e6b96365b70cdf9fe4714af3 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:31:38 +0100 Subject: [PATCH 026/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 131cc166488a7c9120c3119851d08c72a0cf3804 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:31:43 +0100 Subject: [PATCH 027/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 81a7850ad307017ace6c71c14d239dbb5230399e Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:31 +0100 Subject: [PATCH 028/163] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 19a15dbb18..cea2e8f3ec 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -466,7 +466,7 @@ } }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -684,7 +684,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 5b78874adde80127f9a1c980acdd5bc595f536ca Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:32 +0100 Subject: [PATCH 029/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..557b8ead4f 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." "Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." -This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." "value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +This invite email is already present in the camp.: This invite email is already present in the camp. From 10439981b85f752b44e689d30d7ee653c5f0829a Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:33 +0100 Subject: [PATCH 030/163] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index cea2e8f3ec..19a15dbb18 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -466,7 +466,7 @@ } }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -684,7 +684,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 5ac57c78d1c681296bf6daa06096701c3323849b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:34 +0100 Subject: [PATCH 031/163] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 7732c9a69f..7ef77b5c0d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -22,7 +22,7 @@ }, "copyActivityInfoDialog": { "allow": "Jetzt erlauben", - "denied": "Du hast das Lesen von der Zwischenablage untersagt. Du kannst daher kopierte Aktivitäten nicht einfügen.", + "denied": "Du hast das Lesen aus der Zwischenablage untersagt. Du kannst daher kopierte Aktivitäten nicht einfügen.", "description": "Damit du eine kopierte Aktivität einfügen kannst, musst du eCamp erlauben deine Zwischenablage zu lesen.", "granted": "Du kannst nun kopierte Aktivitäten einfügen.", "title": "Aktivität kopieren & einfügen" @@ -167,7 +167,7 @@ "prototypeHint": "Kopiere Kategorien, Blockvorlagen und Blockstatus von einer Lagervorlage", "prototypeHintEmpty": "Keine Kategorien, Blockvorlagen und Blockstatus aus einer Lagervorlage kopieren", "prototypeHintSelected": "Kopiere Kategorien, Blockvorlagen und Blockstatus von dieser Lagervorlage", - "submitTooltipPrototype": "Du must noch auswählen ob und welche Lagervorlage du verwenden möchtest." + "submitTooltipPrototype": "Du musst noch auswählen, ob und welche Lagervorlage du verwenden möchtest." } }, "category": { @@ -215,15 +215,15 @@ "form": { "base": { "eColorPicker": { - "openPicker": "Dialog öffnen um eine Farbe für {label} zu wählen" + "openPicker": "Dialog öffnen, um eine Farbe für {label} zu wählen" }, "eDatePicker": { "invalidFormat": "Ungültiges Format, bitte gib das Datum im Format DD.MM.YYYY ein", - "openPicker": "Dialog öffnen um ein Datum für {label} zu wählen" + "openPicker": "Dialog öffnen, um ein Datum für {label} zu wählen" }, "eTimePicker": { "invalidFormat": "Ungültiges Format, bitte gib die Zeit im Format HH:MM ein", - "openPicker": "Dialog öffnen um eine Zeit für {label} zu wählen" + "openPicker": "Dialog öffnen, um eine Zeit für {label} zu wählen" } } }, @@ -351,7 +351,7 @@ "copyActivity": "Aktivität kopieren", "copyActivityContent": "Inhalt von Aktivität kopieren", "copyPastActivity": "Aktivität kopieren & einfügen", - "copySourceInfo": "Hier kannst du die URL einer Aktivität einfügen um dessen Inhalte zu kopieren.", + "copySourceInfo": "Hier kannst du die URL einer Aktivität einfügen, um dessen Inhalte zu kopieren.", "pasteActivity": "Kopierte Aktivität einfügen" }, "formScheduleEntryItem": { From 28c7606f9318e72a2e9a1b8bd9adab21177929b6 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:35 +0100 Subject: [PATCH 032/163] New translations en.json (French, Switzerland) --- frontend/src/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 9bdb9c7e21..bdc1384bca 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -444,7 +444,7 @@ "save": "Sauvegarder", "saving": "En cours de sauvegarde", "search": "Rechercher", - "submit": "Soumettre", + "submit": "Envoyer", "tryagain": "Réessayer", "unlock": "Déverrouiller", "update": "Mise à jour" From 000b1ddb8917871ea2945fbab96c60a73e8344ab Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:38 +0100 Subject: [PATCH 033/163] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 557b8ead4f..d6d1b53d27 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -3,5 +3,5 @@ Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." "Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "Value must be one of {{ to }}, was {{ value }}" This invite email is already present in the camp.: This invite email is already present in the camp. From 798f935beb44ed4f4e1dbfe3a60439b460a3beae Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:19:39 +0100 Subject: [PATCH 034/163] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml index 51289b6381..1317a3a732 100644 --- a/api/translations/validators.de_CH.yml +++ b/api/translations/validators.de_CH.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Letzter Eintrag kann nicht gelöscht werden." Cannot delete the last schedule entry.: "Der letzte Kalendereintrag konnte nicht gelöscht werden." "Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." -This inviteEmail is already present in the camp.: "Diese Email ist bereits im Lager vorhanden." This is a test message for i18n variants: "en" This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser E-Mail-Adresse nimmt bereits an diesem Lager teil." "value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war {{ value }}" +This invite email is already present in the camp.: Diese Emaileinladung ist bereits im Lager vorhanden. From 06a2b741f3f34d59b65d33b31e6bf970b3573a3b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 03:11:02 +0100 Subject: [PATCH 035/163] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 19a15dbb18..cea2e8f3ec 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -466,7 +466,7 @@ } }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -684,7 +684,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 359b2163886dcba0addc1d815dd4b43ee93993ae Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 1 Feb 2024 03:11:03 +0100 Subject: [PATCH 036/163] Update source file validators.en.yml --- api/translations/validators.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index d6d1b53d27..557b8ead4f 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -3,5 +3,5 @@ Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." "Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "Value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" This invite email is already present in the camp.: This invite email is already present in the camp. From cd9fde6f155bd00e1e1b63eeff1019d71062d8b5 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Wed, 6 Mar 2024 22:41:07 +0100 Subject: [PATCH 037/163] Adjust tests to changed translations --- api/tests/Api/ResetPassword/ResetPasswordTest.php | 2 +- api/tests/Service/MailServiceTest.php | 10 +++++----- .../form/api/__tests__/ApiColorPicker.spec.js | 2 +- .../form/api/__tests__/ApiDatePicker.spec.js | 2 +- .../form/api/__tests__/ApiTimePicker.spec.js | 2 +- .../form/base/__tests__/EColorPicker.spec.js | 2 +- .../components/form/base/__tests__/EDatePicker.spec.js | 2 +- .../components/form/base/__tests__/ETimePicker.spec.js | 2 +- .../__tests__/__snapshots__/EColorPicker.spec.js.snap | 4 ++-- .../__tests__/__snapshots__/EDatePicker.spec.js.snap | 4 ++-- .../__tests__/__snapshots__/ETimePicker.spec.js.snap | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/tests/Api/ResetPassword/ResetPasswordTest.php b/api/tests/Api/ResetPassword/ResetPasswordTest.php index ea7c4156bf..5e5d087a25 100644 --- a/api/tests/Api/ResetPassword/ResetPasswordTest.php +++ b/api/tests/Api/ResetPassword/ResetPasswordTest.php @@ -31,7 +31,7 @@ public function testPostResetPasswordResetsPasswordForAnonymousUser() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(); self::assertEmailAddressContains($mailerMessage, 'To', $user->getEmail()); - self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Password reset'); + self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Password reset'); self::assertEmailHtmlBodyContains($mailerMessage, $user->getDisplayName()); self::assertEmailHtmlBodyContains($mailerMessage, 'http://localhost:3000/reset-password/'); diff --git a/api/tests/Service/MailServiceTest.php b/api/tests/Service/MailServiceTest.php index ecf962176a..14846bfaa7 100644 --- a/api/tests/Service/MailServiceTest.php +++ b/api/tests/Service/MailServiceTest.php @@ -52,7 +52,7 @@ public function testSendInviteToCampMailDeChScout() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(0); self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL); - self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Du wurdest ins Lager "some camp" eingeladen'); + self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Du wurdest ins Lager "some camp" eingeladen'); self::assertEmailHtmlBodyContains($mailerMessage, $this->camp->name); self::assertEmailHtmlBodyContains($mailerMessage, $this->user->getDisplayName()); @@ -89,7 +89,7 @@ public function testSendUserActivationMailDeChScout() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(0); self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL); - self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp3'); + self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp v3'); self::assertEmailHtmlBodyContains($mailerMessage, 'Willkommen'); self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY); @@ -106,7 +106,7 @@ public function testSendUserActivationMailFr() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(0); self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL); - self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp3'); + self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp v3'); self::assertEmailHtmlBodyContains($mailerMessage, 'Welcome'); self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY); @@ -140,7 +140,7 @@ public function testSendResetPasswordMailDeChScout() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(0); self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL); - self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Passwort zurücksetzen'); + self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Passwort zurücksetzen'); self::assertEmailHtmlBodyContains($mailerMessage, 'Passwort zurücksetzen'); self::assertEmailHtmlBodyContains($mailerMessage, 'reset-password/some-id'); @@ -176,7 +176,7 @@ public function testSendEmailVerificationMail() { self::assertEmailCount(1); $mailerMessage = self::getMailerMessage(0); self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL); - self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] E-Mail-Adresse verifizieren'); + self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] E-Mail-Adresse verifizieren'); self::assertEmailHtmlBodyContains($mailerMessage, 'Wir haben die Anfrage erhalten, deine E-Mail-Adresse bei eCamp zu ändern.'); self::assertEmailHtmlBodyContains($mailerMessage, 'profile/verify-mail/some-id'); diff --git a/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js b/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js index f420b0616b..6cd32a75ea 100644 --- a/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js @@ -15,7 +15,7 @@ describe('An ApiColorPicker', () => { const FIELD_LABEL = 'Test field' const COLOR_1 = '#FF0000' const COLOR_2 = '#FAFFAF' - const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen um eine Farbe für Test field zu wählen' + const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen, um eine Farbe für Test field zu wählen' beforeEach(() => { apiMock = ApiMock.create() diff --git a/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js b/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js index 259f3cfbd5..84a752c33c 100644 --- a/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js @@ -11,7 +11,7 @@ describe('An ApiDatePicker', () => { const FIELD_LABEL = 'Test field' const DATE_1 = '2020-03-01' const DATE_2 = '2020-03-19' - const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen um ein Datum für Test field zu wählen' + const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen, um ein Datum für Test field zu wählen' beforeEach(() => { setTestLocale('de') diff --git a/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js b/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js index ff904ce248..2e865b3024 100644 --- a/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js @@ -11,7 +11,7 @@ describe('An ApiTimePicker', () => { const FIELD_LABEL = 'Test field' const TIME_1 = '2037-07-18T09:52:00+00:00' const TIME_2 = '2037-07-18T00:52:00+00:00' - const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen um eine Zeit für Test field zu wählen' + const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen, um eine Zeit für Test field zu wählen' beforeEach(() => { setTestLocale('de') diff --git a/frontend/src/components/form/base/__tests__/EColorPicker.spec.js b/frontend/src/components/form/base/__tests__/EColorPicker.spec.js index c017724b56..4091401cb5 100644 --- a/frontend/src/components/form/base/__tests__/EColorPicker.spec.js +++ b/frontend/src/components/form/base/__tests__/EColorPicker.spec.js @@ -12,7 +12,7 @@ describe('An EColorPicker', () => { const COLOR2 = '#ff00ff' const COLOR3 = '#FAFFAF' const INVALID_COLOR = 'some new color' - const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen um eine Farbe für test zu wählen' + const PICKER_BUTTON_LABEL_TEXT = 'Dialog öffnen, um eine Farbe für test zu wählen' const VALIDATION_MESSAGE = 'test is not valid' beforeEach(() => { diff --git a/frontend/src/components/form/base/__tests__/EDatePicker.spec.js b/frontend/src/components/form/base/__tests__/EDatePicker.spec.js index 760139d2d8..504c7261be 100644 --- a/frontend/src/components/form/base/__tests__/EDatePicker.spec.js +++ b/frontend/src/components/form/base/__tests__/EDatePicker.spec.js @@ -13,7 +13,7 @@ describe('An EDatePicker', () => { date2: '19.03.2020', dateShort: '2.4.2021', dateInWrongLocale: '03/19/2020', - labelText: 'Dialog öffnen um ein Datum für test zu wählen', + labelText: 'Dialog öffnen, um ein Datum für test zu wählen', date1Heading: 'März 2020', date3Heading: 'Januar 2111', date4Heading: 'Januar 1999', diff --git a/frontend/src/components/form/base/__tests__/ETimePicker.spec.js b/frontend/src/components/form/base/__tests__/ETimePicker.spec.js index 540ed56756..d2ad9deb61 100644 --- a/frontend/src/components/form/base/__tests__/ETimePicker.spec.js +++ b/frontend/src/components/form/base/__tests__/ETimePicker.spec.js @@ -15,7 +15,7 @@ describe('An ETimePicker', () => { time2: '18:33', time3: '00:52', firstHour: '0', - labelText: 'Dialog öffnen um eine Zeit für test zu wählen', + labelText: 'Dialog öffnen, um eine Zeit für test zu wählen', closeButton: 'Schliessen', timeInWrongLocale: '9:52 AM', validationMessage: 'Ungültiges Format, bitte gib die Zeit im Format HH:MM ein', diff --git a/frontend/src/components/form/base/__tests__/__snapshots__/EColorPicker.spec.js.snap b/frontend/src/components/form/base/__tests__/__snapshots__/EColorPicker.spec.js.snap index b1627fd494..d1f498b819 100644 --- a/frontend/src/components/form/base/__tests__/__snapshots__/EColorPicker.spec.js.snap +++ b/frontend/src/components/form/base/__tests__/__snapshots__/EColorPicker.spec.js.snap @@ -9,7 +9,7 @@ exports[`An EColorPicker > looks like a color picker > pickerclosed 1`] = `
-
@@ -42,7 +42,7 @@ exports[`An EDatePicker > in locale de > looks like a date picker > pickeropen 1 value="01.03.2020">
-
diff --git a/frontend/src/components/form/base/__tests__/__snapshots__/ETimePicker.spec.js.snap b/frontend/src/components/form/base/__tests__/__snapshots__/ETimePicker.spec.js.snap index e3cddc7c44..a1612962b8 100644 --- a/frontend/src/components/form/base/__tests__/__snapshots__/ETimePicker.spec.js.snap +++ b/frontend/src/components/form/base/__tests__/__snapshots__/ETimePicker.spec.js.snap @@ -10,7 +10,7 @@ exports[`An ETimePicker > in locale de > looks like a time picker > pickerclosed value>
-
@@ -42,7 +42,7 @@ exports[`An ETimePicker > in locale de > looks like a time picker > pickeropen 1 value="09:52">
-
From f9ea00a28747e8fcbf0a17a53064d521110dafc6 Mon Sep 17 00:00:00 2001 From: Manuel Meister Date: Wed, 6 Mar 2024 23:18:24 +0100 Subject: [PATCH 038/163] Migrate fieldname and name to new path prop --- common/locales/de.json | 6 +- common/locales/en.json | 4 + common/locales/fr.json | 4 + common/locales/it.json | 4 + .../activity/ActivityResponsibles.vue | 7 +- .../src/components/activity/ScheduleEntry.vue | 64 ++--- .../src/components/activity/content/Notes.vue | 2 +- .../activity/content/SafetyConcept.vue | 2 +- .../activity/content/Storycontext.vue | 2 +- .../content/layout/ContentNodeCard.vue | 2 +- .../storyboard/StoryboardRowDefault.vue | 6 +- .../content/storyboard/StoryboardRowDense.vue | 6 +- .../src/components/campAdmin/CampAddress.vue | 8 +- .../campAdmin/CampConditionalFields.vue | 51 ++-- .../src/components/campAdmin/CampSettings.vue | 24 +- .../campAdmin/CreateCampPeriods.vue | 120 ++++----- .../DialogActivityProgressLabelForm.vue | 6 +- .../campAdmin/DialogCategoryForm.vue | 24 +- .../campAdmin/DialogMaterialListForm.vue | 6 +- .../components/campAdmin/DialogPeriodForm.vue | 11 +- .../components/campCreate/CampCreateStep1.vue | 96 ++++---- .../components/campCreate/CampCreateStep2.vue | 212 ++++++++-------- .../category/CategoryProperties.vue | 8 +- .../collaborator/CollaboratorCreate.vue | 7 +- .../collaborator/CollaboratorForm.vue | 12 +- frontend/src/components/form/api/ApiForm.vue | 2 + .../src/components/form/api/ApiWrapper.vue | 12 +- .../components/form/base/BaseComponent.vue | 4 +- .../src/components/form/base/BasePicker.vue | 2 - .../src/components/form/base/ECheckbox.vue | 4 +- .../src/components/form/base/EColorPicker.vue | 1 - .../src/components/form/base/EDatePicker.vue | 1 - frontend/src/components/form/base/EForm.vue | 19 ++ .../src/components/form/base/ERichtext.vue | 4 +- frontend/src/components/form/base/ESelect.vue | 4 +- frontend/src/components/form/base/ESwitch.vue | 4 +- .../src/components/form/base/ETextField.vue | 6 +- .../src/components/form/base/ETextarea.vue | 4 +- .../src/components/form/base/ETimePicker.vue | 1 - .../material/DialogMaterialItemForm.vue | 17 +- .../material/MaterialCreateItem.vue | 24 +- .../src/components/material/MaterialTable.vue | 8 +- .../components/program/DialogActivityForm.vue | 17 +- .../program/FormScheduleEntryItem.vue | 8 +- .../program/FormScheduleEntryList.vue | 2 +- .../program/picasso/DayResponsibles.vue | 7 +- frontend/src/components/story/StoryDay.vue | 2 +- .../src/components/user/DialogChangeMail.vue | 6 +- frontend/src/mixins/apiPropsMixin.js | 2 +- .../src/mixins/formComponentPropsMixin.js | 45 +++- frontend/src/plugins/formBaseComponents.js | 2 + frontend/src/views/Profile.vue | 76 +++--- frontend/src/views/auth/Register.vue | 228 +++++++++--------- frontend/src/views/auth/ResetPassword.vue | 149 ++++++------ frontend/src/views/dev/Controls.vue | 18 +- 55 files changed, 701 insertions(+), 672 deletions(-) create mode 100644 frontend/src/components/form/base/EForm.vue diff --git a/common/locales/de.json b/common/locales/de.json index 055759171c..ec930758fe 100644 --- a/common/locales/de.json +++ b/common/locales/de.json @@ -192,8 +192,12 @@ "scheduleEntry": { "fields": { "duration": "Dauer", + "endDate": "Enddatum", + "endTime": "Endzeit", "nr": "Nr.", - "time": "Zeitpunkt" + "time": "Zeitpunkt", + "startDate": "Startdatum", + "startTime": "Startzeit" }, "name": "Zeitplaneintrag" } diff --git a/common/locales/en.json b/common/locales/en.json index e2ad714de1..675fdce2d4 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -199,7 +199,11 @@ "scheduleEntry": { "fields": { "duration": "Duration", + "endDate": "Enddate", + "endTime": "Endtime", "nr": "No.", + "startDate": "Startdate", + "startTime": "Starttime", "time": "Time" }, "name": "Activity scheduled" diff --git a/common/locales/fr.json b/common/locales/fr.json index 701849b7e6..d3e79d449e 100644 --- a/common/locales/fr.json +++ b/common/locales/fr.json @@ -191,7 +191,11 @@ "scheduleEntry": { "fields": { "duration": "Durée", + "endDate": "Date de fin", + "endTime": "Heure de fin", "nr": "No.", + "startDate": "Date de début", + "startTime": "Heure de début", "time": "Moment" }, "name": "Inscription au calendrier" diff --git a/common/locales/it.json b/common/locales/it.json index b837c93bf5..c7282e13ab 100644 --- a/common/locales/it.json +++ b/common/locales/it.json @@ -176,7 +176,11 @@ "scheduleEntry": { "fields": { "duration": "Durata", + "endDate": "Data di fine", + "endTime": "Ora di fine", "nr": "N.", + "startDate": "Data di inizio", + "startTime": "Ora di inizio", "time": "Tempo" }, "name": "Inserimento nel programma" diff --git a/frontend/src/components/activity/ActivityResponsibles.vue b/frontend/src/components/activity/ActivityResponsibles.vue index 8a297b2f0f..f4a30b3fe5 100644 --- a/frontend/src/components/activity/ActivityResponsibles.vue +++ b/frontend/src/components/activity/ActivityResponsibles.vue @@ -3,7 +3,7 @@ v-model="selectedCampCollaborations" :items="availableCampCollaborations" :loading="isSaving || isLoading ? 'secondary' : false" - :name="$tc('entity.activity.fields.responsible')" + path="responsible" :error-messages="errorMessages" outlined :filled="false" @@ -38,6 +38,11 @@ import UserAvatar from '@/components/user/UserAvatar.vue' export default { name: 'ActivityResponsibles', components: { UserAvatar }, + provide() { + return { + entityName: 'activity', + } + }, props: { activity: { type: Object, diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue index 47903df81c..a0ff3637c9 100644 --- a/frontend/src/components/activity/ScheduleEntry.vue +++ b/frontend/src/components/activity/ScheduleEntry.vue @@ -78,7 +78,7 @@ Displays a single scheduleEntry
- - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -265,10 +263,14 @@ import CategoryChip from '@/components/generic/CategoryChip.vue' import CopyActivityInfoDialog from '@/components/activity/CopyActivityInfoDialog.vue' import DialogEntityDelete from '@/components/dialog/DialogEntityDelete.vue' import TogglePaperSize from '@/components/activity/TogglePaperSize.vue' +import ApiForm from '@/components/form/api/ApiForm.vue' +import ApiSelect from '@/components/form/api/ApiSelect.vue' export default { name: 'ScheduleEntry', components: { + ApiForm, + ApiSelect, TogglePaperSize, DialogEntityDelete, ContentCard, diff --git a/frontend/src/components/activity/content/Notes.vue b/frontend/src/components/activity/content/Notes.vue index 00a194c89e..6e5deaccd7 100644 --- a/frontend/src/components/activity/content/Notes.vue +++ b/frontend/src/components/activity/content/Notes.vue @@ -2,7 +2,7 @@
diff --git a/frontend/src/components/activity/content/storyboard/StoryboardRowDefault.vue b/frontend/src/components/activity/content/storyboard/StoryboardRowDefault.vue index 25eb751177..4ae42222d4 100644 --- a/frontend/src/components/activity/content/storyboard/StoryboardRowDefault.vue +++ b/frontend/src/components/activity/content/storyboard/StoryboardRowDefault.vue @@ -17,14 +17,14 @@ @@ -33,7 +33,7 @@ diff --git a/frontend/src/components/activity/content/storyboard/StoryboardRowDense.vue b/frontend/src/components/activity/content/storyboard/StoryboardRowDense.vue index 6a56e7a108..d1b7cdb525 100644 --- a/frontend/src/components/activity/content/storyboard/StoryboardRowDense.vue +++ b/frontend/src/components/activity/content/storyboard/StoryboardRowDense.vue @@ -17,7 +17,7 @@
@@ -25,14 +25,14 @@
diff --git a/frontend/src/components/campAdmin/CampAddress.vue b/frontend/src/components/campAdmin/CampAddress.vue index 69092160cc..205b057ba7 100644 --- a/frontend/src/components/campAdmin/CampAddress.vue +++ b/frontend/src/components/campAdmin/CampAddress.vue @@ -8,22 +8,22 @@ Displays address and allows to edit
diff --git a/frontend/src/components/campAdmin/CampConditionalFields.vue b/frontend/src/components/campAdmin/CampConditionalFields.vue index ea345a8000..9158db5805 100644 --- a/frontend/src/components/campAdmin/CampConditionalFields.vue +++ b/frontend/src/components/campAdmin/CampConditionalFields.vue @@ -17,22 +17,12 @@ Displays fields which don't apply to all camps, but are required for some >
- - - - + + + + + +
@@ -43,27 +33,14 @@ Displays fields which don't apply to all camps, but are required for some >
- - - - - + + + + + + + +
diff --git a/frontend/src/components/campAdmin/CampSettings.vue b/frontend/src/components/campAdmin/CampSettings.vue index e1d2c2d4a5..59a073839b 100644 --- a/frontend/src/components/campAdmin/CampSettings.vue +++ b/frontend/src/components/campAdmin/CampSettings.vue @@ -6,24 +6,12 @@ Displays details on a single camp and allows to edit them.
- - - - + + + + + +
diff --git a/frontend/src/components/campAdmin/CreateCampPeriods.vue b/frontend/src/components/campAdmin/CreateCampPeriods.vue index 6895ddc1e9..965740615f 100644 --- a/frontend/src/components/campAdmin/CreateCampPeriods.vue +++ b/frontend/src/components/campAdmin/CreateCampPeriods.vue @@ -7,66 +7,66 @@ color="grey lighten-3" class="period mb-2 rounded-b-0" > - - - - {{ $tc('entity.period.name') }} - - - - - mdi-close - - - - - - - - - - - - - - - - + + + + + {{ $tc('entity.period.name') }} + + + + + mdi-close + + + + + + + + + + + + + + + + + mdi-plus diff --git a/frontend/src/components/campAdmin/DialogActivityProgressLabelForm.vue b/frontend/src/components/campAdmin/DialogActivityProgressLabelForm.vue index 348cdbba68..10b234db90 100644 --- a/frontend/src/components/campAdmin/DialogActivityProgressLabelForm.vue +++ b/frontend/src/components/campAdmin/DialogActivityProgressLabelForm.vue @@ -1,12 +1,12 @@ diff --git a/frontend/src/components/form/api/ApiWrapper.vue b/frontend/src/components/form/api/ApiWrapper.vue index f58f0e03db..88e676e1f2 100644 --- a/frontend/src/components/form/api/ApiWrapper.vue +++ b/frontend/src/components/form/api/ApiWrapper.vue @@ -105,15 +105,15 @@ export default { // return value from API unless `value` is set explicitly } else { const resource = this.api.get(this.uri) - let val = get(resource, this.fieldname) + let val = get(resource, this.path) // resource is loaded, but val is still undefined (=doesn't exist) if (val === undefined) { console.error( - 'You are trying to use a fieldname ' + - this.fieldname + + 'You are trying to use a path ' + + this.path + ' in an ApiFormComponent, but ' + - this.fieldname + + this.path + " doesn't exist on entity " + this.uri ) @@ -233,7 +233,7 @@ export default { // construct payload (nested path allowed) const payload = {} - set(payload, this.fieldname, this.parsedLocalValue) + set(payload, this.path, this.parsedLocalValue) this.api.patch(this.uri, payload).then( () => { @@ -247,7 +247,7 @@ export default { }, (error) => { this.isSaving = false - this.serverErrorMessage = serverErrorToString(error, this.fieldname) + this.serverErrorMessage = serverErrorToString(error, this.path) this.hasServerError = true } ) diff --git a/frontend/src/components/form/base/BaseComponent.vue b/frontend/src/components/form/base/BaseComponent.vue index b2d4d96723..5355e37543 100644 --- a/frontend/src/components/form/base/BaseComponent.vue +++ b/frontend/src/components/form/base/BaseComponent.vue @@ -1,7 +1,7 @@ From b1db1f5bf90302dbe26aca90f0bc93168146c01a Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Sat, 13 Apr 2024 17:39:40 +0200 Subject: [PATCH 162/163] Fix small issues from testing --- frontend/src/components/navigation/UserMeta.vue | 2 ++ .../personal_invitations/DialogPersonalInvitationReject.vue | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/navigation/UserMeta.vue b/frontend/src/components/navigation/UserMeta.vue index 18649b4a21..7b49b20f3d 100644 --- a/frontend/src/components/navigation/UserMeta.vue +++ b/frontend/src/components/navigation/UserMeta.vue @@ -165,6 +165,8 @@ export default { .v-badge:deep(.v-badge__badge::after) { border-color: red; background-color: red; +} +.v-badge.v-badge--inline:deep(.v-badge__badge::after) { z-index: -1; } diff --git a/frontend/src/components/personal_invitations/DialogPersonalInvitationReject.vue b/frontend/src/components/personal_invitations/DialogPersonalInvitationReject.vue index b22d8e5c75..5a22f40878 100644 --- a/frontend/src/components/personal_invitations/DialogPersonalInvitationReject.vue +++ b/frontend/src/components/personal_invitations/DialogPersonalInvitationReject.vue @@ -52,7 +52,6 @@ export default { props: { entity: { type: Object, required: true }, campTitle: { type: String, required: true }, - align: { type: String, required: true }, }, created() { this.entityUri = this.entity._meta.self From 3743a16a6d0806e79e6b81517d5fd7555f3d29e2 Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Sat, 13 Apr 2024 17:49:01 +0200 Subject: [PATCH 163/163] Simplify without z-index --- frontend/src/components/navigation/UserMeta.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/src/components/navigation/UserMeta.vue b/frontend/src/components/navigation/UserMeta.vue index 7b49b20f3d..e8e4cc3a02 100644 --- a/frontend/src/components/navigation/UserMeta.vue +++ b/frontend/src/components/navigation/UserMeta.vue @@ -23,7 +23,7 @@ v-on="on" >