From 4e1a35a5448fdcd49f5582a0adca92fa21e82bff Mon Sep 17 00:00:00 2001 From: Manuel Meister Date: Wed, 6 Nov 2024 00:17:07 +0100 Subject: [PATCH 1/2] Fix i18n --- common/locales/de.json | 14 ++++++------- common/locales/en.json | 10 +++++----- common/locales/it.json | 4 +++- common/locales/rm.json | 2 +- frontend/src/locales/de.json | 27 +++++++++++++------------ frontend/src/locales/en.json | 38 +++++++++++++++++++----------------- frontend/src/locales/fr.json | 26 ++++++++++++------------ frontend/src/locales/it.json | 17 +++++++++------- frontend/src/locales/rm.json | 37 ++++++++++++++--------------------- 9 files changed, 88 insertions(+), 87 deletions(-) diff --git a/common/locales/de.json b/common/locales/de.json index ee02dee977..5c546db9de 100644 --- a/common/locales/de.json +++ b/common/locales/de.json @@ -165,18 +165,18 @@ }, "name": "Block-Kategorien", "numberingStyles": { + "-": "keine Nummerierung", "1": "1, 2, 3 - Zahlen", "A": "A, B, C - grosse Buchstaben", "I": "I, II, III - grosse römische Zahlen", "a": "a, b, c - kleine Buchstaben", - "i": "i, ii, iii - kleine römische Zahlen", - "-": "keine Nummerierung" + "i": "i, ii, iii - kleine römische Zahlen" } }, "checklist": { "fields": { - "name": "Name", - "copyChecklistSource": "Vorlage" + "copyChecklistSource": "Vorlage", + "name": "Name" }, "name": "Checkliste | Checklisten" }, @@ -238,9 +238,9 @@ "endDate": "Enddatum", "endDatetime": "Endzeit", "nr": "Nr.", - "time": "Zeitpunkt", "startDate": "Startdatum", - "startDatetime": "Startzeit" + "startDatetime": "Startzeit", + "time": "Zeitpunkt" }, "name": "Zeitplaneintrag" } @@ -294,4 +294,4 @@ "title": "Inhaltsverzeichnis" } } -} \ No newline at end of file +} diff --git a/common/locales/en.json b/common/locales/en.json index fc6c679316..ceef95940c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -173,18 +173,18 @@ }, "name": "Activity categories", "numberingStyles": { + "-": "no numbering", "1": "1, 2, 3 - numbers", "A": "A, B, C - uppercase letters", "I": "I, II, III - uppercase roman numerals", "a": "a, b, c - lowercase letters", - "i": "i, ii, iii - lowercase roman numerals", - "-": "no numbering" + "i": "i, ii, iii - lowercase roman numerals" } }, "checklist": { "fields": { - "name": "Name", - "copyChecklistSource": "Prototype" + "copyChecklistSource": "Prototype", + "name": "Name" }, "name": "Checklist | Checklists" }, @@ -302,4 +302,4 @@ "title": "Table of contents" } } -} \ No newline at end of file +} diff --git a/common/locales/it.json b/common/locales/it.json index ea6c611789..7941dda9c2 100644 --- a/common/locales/it.json +++ b/common/locales/it.json @@ -129,7 +129,9 @@ "role": "Ruolo", "status": "Stato" }, - "inactive": "non attivo" + "status": { + "inactive": "non attivo" + } }, "category": { "fields": { diff --git a/common/locales/rm.json b/common/locales/rm.json index 28973a4e31..ea13c3db30 100644 --- a/common/locales/rm.json +++ b/common/locales/rm.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index c69a671ecb..2901cb882b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -131,8 +131,8 @@ "title": "Materialliste erstellen" }, "dialogMaterialListEdit": { - "title": "Materialliste bearbeiten", - "deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist." + "deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist.", + "title": "Materialliste bearbeiten" }, "dialogPeriodCreate": { "title": "Lagerabschnitt erstellen" @@ -198,6 +198,10 @@ "checklistCreate": { "title": "Checkliste erstellen" }, + "checklistDetail": { + "deleteError": "Checkliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Checkliste nicht mehr in Aktivitäten verwendet wird.", + "deleteWarning": "Möchtest du diese Checkliste wirklich löschen? Der komplette Inhalt dieser Checkliste wird gelöscht." + }, "checklistItemCreate": { "add": "Checklisteneintrag erstellen", "title": "Checklisteneintrag hinzufügen" @@ -206,10 +210,6 @@ "delete": "Möchtest du diesen Eintrag wirklich löschen?", "title": "Checklisteneintrag bearbeiten" }, - "checklistDetail": { - "deleteWarning": "Möchtest du diese Checkliste wirklich löschen? Der komplette Inhalt dieser Checkliste wird gelöscht.", - "deleteError": "Checkliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Checkliste nicht mehr in Aktivitäten verwendet wird." - }, "sortableChecklist": { "add": "Zu \"{parent}\" hinzufügen" } @@ -307,6 +307,7 @@ }, "navigation": { "userMeta": { + "admin": "Admin", "invitations": "Einladungen", "logOut": "Ausloggen", "myCamps": "Meine Lager", @@ -367,13 +368,13 @@ "add": "Inhalt hinzufügen", "config": { "Activity": "Einzelne Aktivität", + "ActivityList": "Aktivitätsübersicht (Kurse)", "Cover": "Titelseite", "Picasso": "Grobprogramm", "Program": "Detailprogramm", "SafetyConsiderations": "Sicherheits­überlegungen", "Story": "Roter Faden", - "Toc": "Inhaltsverzeichnis", - "ActivityList": "Aktivitätsübersicht (Kurse)" + "Toc": "Inhaltsverzeichnis" } }, "printNuxt": { @@ -651,6 +652,11 @@ }, "title": "Admin" }, + "campProgram": { + "reminderLockedCreate": "Ziehen zum Erstellen ist nur im entsperrten Modus möglich.", + "reminderLockedMove": "Ziehen zum Verschieben ist nur im entsperrten Modus möglich.", + "title": "Grobprogramm" + }, "category": { "category": { "copyCategory": "Kategorie kopieren", @@ -662,11 +668,6 @@ "title": "Kategorien" } }, - "campProgram": { - "reminderLockedCreate": "Ziehen zum Erstellen ist nur im entsperrten Modus möglich.", - "reminderLockedMove": "Ziehen zum Verschieben ist nur im entsperrten Modus möglich.", - "title": "Grobprogramm" - }, "checklistOverview": { "checklistLists": { "title": "Checklist-Übersicht" diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 29a35ebcec..3481989432 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -131,8 +131,8 @@ "title": "Create material list" }, "dialogMaterialListEdit": { - "title": "Edit material list", - "deleteError": "Could not delete the material list. Check if the list is empty before deleting it." + "deleteError": "Could not delete the material list. Check if the list is empty before deleting it.", + "title": "Edit material list" }, "dialogPeriodCreate": { "title": "Create period" @@ -159,7 +159,8 @@ } }, "campCreateStep1": { - "submitTooltip": "Please fill out all required fields." + "submitTooltip": "Please fill out all required fields.", + "titlePlaceholder": "Summer camp 2024" }, "campCreateStep2": { "category": "Activity categories", @@ -185,7 +186,7 @@ "layout": "Layout", "noTemplate": "No template" }, - "copyActivityInfoDialog": { + "copyCategoryInfoDialog": { "allow": "Allow now", "denied": "You have denied access to your clipboard. Therefore, you cannot paste copied categories.", "description": "In order to paste a copied category, you must allow eCamp to read your clipboard.", @@ -197,6 +198,10 @@ "checklistCreate": { "title": "Create checklist" }, + "checklistDetail": { + "deleteError": "Checklist couldn't be deleted. Ensure checklist is not used within activities before trying to delete it.", + "deleteWarning": "Do you really want to remove this checklist? All content of the checklist will be deleted." + }, "checklistItemCreate": { "add": "Create checklist entry", "title": "Add checklist entry" @@ -205,10 +210,6 @@ "delete": "Do you really want to remove this item?", "title": "Edit checklist entry" }, - "checklistDetail": { - "deleteWarning": "Do you really want to remove this checklist? All content of the checklist will be deleted.", - "deleteError": "Checklist couldn't be deleted. Ensure checklist is not used within activities before trying to delete it." - }, "sortableChecklist": { "add": "Add to \"{parent}\"" } @@ -306,8 +307,8 @@ }, "navigation": { "userMeta": { - "invitations": "Invitations", "admin": "Admin", + "invitations": "Invitations", "logOut": "Log out", "myCamps": "My camps", "profile": "Profile" @@ -330,7 +331,8 @@ "activity": "Activity" }, "picassoConfig": { - "orientation": "Page layout" + "orientation": "Page layout", + "periods": "Period(s)" }, "programConfig": { "dayOverview": "print day overview" @@ -366,13 +368,13 @@ "add": "Add content", "config": { "Activity": "Single activity", + "ActivityList": "Activity list (courses)", "Cover": "Cover page", "Picasso": "Picasso", "Program": "Program", "SafetyConsiderations": "Safety considerations", "Story": "Story", - "Toc": "Table of contents", - "ActivityList": "Activity list (courses)" + "Toc": "Table of contents" } }, "printNuxt": { @@ -650,6 +652,11 @@ }, "title": "Admin" }, + "campProgram": { + "reminderLockedCreate": "Drag to create is only possible in unlocked mode.", + "reminderLockedMove": "Drag to move is only possible in unlocked mode.", + "title": "Picasso" + }, "category": { "category": { "copyCategory": "Copy category", @@ -661,11 +668,6 @@ "title": "Categories" } }, - "campProgram": { - "reminderLockedCreate": "Drag to create is only possible in unlocked mode.", - "reminderLockedMove": "Drag to move is only possible in unlocked mode.", - "title": "Picasso" - }, "checklistOverview": { "checklistLists": { "title": "Checklist Overview" @@ -714,8 +716,8 @@ "desktop": { "navTopbar": { "admin": "Admin", - "checklist": "Checklist", "campIsLoading": "Camp is loading", + "checklist": "Checklist", "material": "Materials", "print": "Print", "program": "Program", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 275ccced6d..a4398d4761 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -120,8 +120,8 @@ "title": "Créer une liste de matériel" }, "dialogMaterialListEdit": { - "title": "Modifier la liste de matériel", - "deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer." + "deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer.", + "title": "Modifier la liste de matériel" }, "dialogPeriodCreate": { "title": "Créer une période" @@ -354,7 +354,7 @@ "clipboard": "Presse-papier", "copyActivity": "Copier une activité", "copyActivityContent": "Copier le contenu depuis une activité", - "copyPastActivity": "Copier et coller une activité", + "copyPasteActivity": "Copier et coller une activité", "copySourceInfo": "Vous pouvez coller ici l'URL d'une activité pour copier son contenu.", "pasteActivity": "coller l'activité" }, @@ -399,6 +399,11 @@ "title": "Confirmation de suppression" } }, + "story": { + "storyDay": { + "noStory": "Aucun file rouge trouvé ce jour-là..." + } + }, "toast": { "toasts": { "multiLineToast": { @@ -481,11 +486,6 @@ "409": "Oooops... Cette action a provoqué une erreur côté serveur.", "short": "erreur de serveur" }, - "story": { - "storyDay": { - "noStory": "Aucun file rouge trouvé ce jour-là..." - } - }, "toast": { "copied": "{source} copié" }, @@ -596,6 +596,11 @@ }, "title": "Admin" }, + "campProgram": { + "reminderLockedCreate": "Glisser pour créer n'est possible qu'en mode déverrouillé.", + "reminderLockedMove": "Glisser pour déplacer n'est possible qu'en mode déverrouillé.", + "title": "Programme général" + }, "category": { "category": { "deleteCategory": "Supprimer l'activité", @@ -606,11 +611,6 @@ "title": "Catégories" } }, - "campProgram": { - "reminderLockedCreate": "Glisser pour créer n'est possible qu'en mode déverrouillé.", - "reminderLockedMove": "Glisser pour déplacer n'est possible qu'en mode déverrouillé.", - "title": "Programme général" - }, "dashboard": { "activities": "Activités", "columns": { diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json index 839cdab188..5abe42ec73 100644 --- a/frontend/src/locales/it.json +++ b/frontend/src/locales/it.json @@ -20,6 +20,9 @@ } } }, + "copyActivityInfoDialog": { + "allow": "" + }, "menuCardlessContentNode": { "deletingDisabled": "Deve essere vuoto per essere eliminato" }, @@ -112,8 +115,8 @@ "title": "Crea l'elenco dei materiali" }, "dialogMaterialListEdit": { - "title": "Modifica elenco materiali", - "deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo." + "deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo.", + "title": "Modifica elenco materiali" }, "dialogPeriodCreate": { "title": "Creare il periodo" @@ -576,6 +579,11 @@ }, "title": "Admin" }, + "campProgram": { + "reminderLockedCreate": "Trascinare per creare è possibile solo in modalità sbloccata.", + "reminderLockedMove": "Trascinare per spostarsi è possibile solo in modalità sbloccata.", + "title": "Picasso" + }, "category": { "category": { "deleteCategory": "Elimina la categoria", @@ -586,11 +594,6 @@ "title": "Categorie" } }, - "campProgram": { - "reminderLockedCreate": "Trascinare per creare è possibile solo in modalità sbloccata.", - "reminderLockedMove": "Trascinare per spostarsi è possibile solo in modalità sbloccata.", - "title": "Picasso" - }, "dashboard": { "activities": "Attività", "columns": { diff --git a/frontend/src/locales/rm.json b/frontend/src/locales/rm.json index 2ac7d2d19e..9c1ec16579 100644 --- a/frontend/src/locales/rm.json +++ b/frontend/src/locales/rm.json @@ -10,11 +10,11 @@ }, "storyboard": { "controls": "Acziuns", - "reorder": "Spustar" - }, - "storyboardDialogRemoveSection": { - "deleteWarning": "Vuls ti propi stizzar questa part?", - "title": "Propi stizzar?" + "reorder": "Spustar", + "storyboardDialogRemoveSection": { + "deleteWarning": "Vuls ti propi stizzar questa part?", + "title": "Propi stizzar?" + } } }, "menuCardlessContentNode": { @@ -105,8 +105,8 @@ "title": "Crear ina glista da material" }, "dialogMaterialListEdit": { - "title": "Modifitgar la glista da material", - "deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar." + "deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar.", + "title": "Modifitgar la glista da material" }, "dialogPeriodCreate": { "title": "Craer ina part dal champ" @@ -446,7 +446,6 @@ "accountless": "N'has ti anc nagin conto?", "email": "E-mail", "infoText": { - "beta": "Quai è la versiun beta dad eCamp v3. Questa versiun po servir per planisaziuns da champs reals che na fan dentant betg prescha. Il dumber limità da persunas ch'utiliseschan la versiun beta sto quintar cun interrupziuns pervia da lavurs da mantegniment.", "dev": "Quai è la versiun per sviluppaders dad eCamp v3.{br}IMPURTANT: Mo adattà per il diever da sviluppaders. Tut las datas èn publicas e vegnan stizzadas regularmain!{br}Annunzia: test@example.com / test" }, "loginCallback": { @@ -505,6 +504,9 @@ "activity": { "title": "Parameters dad activitad" }, + "adminMaterialLists": { + "title": "Glistas da material" + }, "collaborators": { "email": "Adressa dad e-mail", "inactiveCollaborators": "Inactiv", @@ -515,9 +517,6 @@ "info": { "title": "Infus dal champ" }, - "materialLists": { - "title": "Glistas da material" - }, "print": { "title": "Stampar il champ" }, @@ -531,6 +530,11 @@ }, "title": "Admin" }, + "campProgram": { + "reminderLockedCreate": "Trair per crear è mo pussaivel en il modus debloccà.", + "reminderLockedMove": "Trair per spustar è mo pussaivel en il modus debloccà.", + "title": "Program general" + }, "category": { "category": { "deleteCategory": "Stizzar la categoria", @@ -541,11 +545,6 @@ "title": "Categorias" } }, - "campProgram": { - "reminderLockedCreate": "Trair per crear è mo pussaivel en il modus debloccà.", - "reminderLockedMove": "Trair per spustar è mo pussaivel en il modus debloccà.", - "title": "Program general" - }, "dashboard": { "activities": "Activitads", "columns": { @@ -617,12 +616,6 @@ } }, "campCreate": { - "couponKeyHint": "Per la beta betg publica dovri in cupon (code d'access). Sin ecamp3.ch/closed-beta vegns ti a savair co ti retschaivas in tal.", - "create": "Crear il champ", - "period": { - "add": "Agiuntar ina ulteriura part dal champ", - "remove": "Allontanar questa part dal champ" - }, "title": "Crear in champ" }, "camps": { From 0d1b0ff2bad2325bb9b2f43a6acf4b4879c9642f Mon Sep 17 00:00:00 2001 From: Manuel Meister Date: Sun, 10 Nov 2024 16:04:39 +0100 Subject: [PATCH 2/2] Update frontend/src/locales/it.json --- frontend/src/locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json index 5abe42ec73..a490fc15c3 100644 --- a/frontend/src/locales/it.json +++ b/frontend/src/locales/it.json @@ -21,7 +21,7 @@ } }, "copyActivityInfoDialog": { - "allow": "" + "allow": "Consenti ora" }, "menuCardlessContentNode": { "deletingDisabled": "Deve essere vuoto per essere eliminato"