From f2a18c04b13680679c023085a9ded3857eac6f82 Mon Sep 17 00:00:00 2001 From: davwas Date: Thu, 21 Sep 2023 14:59:23 +0200 Subject: [PATCH 1/4] add translations --- locales/de.json | 3 ++- locales/en.json | 3 ++- locales/es.json | 3 ++- locales/uk.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/locales/de.json b/locales/de.json index 51c95e23bd..05e00435a3 100644 --- a/locales/de.json +++ b/locales/de.json @@ -336,7 +336,8 @@ }, "form_InvitationStudent": { "label": { - "distributeLinkToInvite": "Um in die {{shortTitle}} einzuladen, verteile folgenden Link an:" + "distributeLinkToInvite": "Um in die {{shortTitle}} einzuladen, verteile folgenden Link an:", + "distributeLinkToInviteShort": "Um in die {{shortTitle}} einzuladen, muss folgender Link verteilt werden:" }, "text": { "beforeTheSchoolCloudCanBeUsed": "Bevor die Nutzung der {{shortTitle}} möglich ist, müssen Eltern und/oder Schüler:innen den elektronischen Einwilligungsprozess durchlaufen haben.", diff --git a/locales/en.json b/locales/en.json index 47b794c44f..b263527c72 100644 --- a/locales/en.json +++ b/locales/en.json @@ -336,7 +336,8 @@ }, "form_InvitationStudent": { "label": { - "distributeLinkToInvite": "To invite to the {{shortTitle}}, send the following link to:" + "distributeLinkToInvite": "To invite to the {{shortTitle}}, send the following link to:", + "distributeLinkToInviteShort": "To invite to the {{shortTitle}}, send the following link:" }, "text": { "beforeTheSchoolCloudCanBeUsed": "Before the use of the {{shortTitle}} is possible, parents and / or students must have gone through the electronic consent process.", diff --git a/locales/es.json b/locales/es.json index 1dfedb1027..1883911a0b 100644 --- a/locales/es.json +++ b/locales/es.json @@ -336,7 +336,8 @@ }, "form_InvitationStudent": { "label": { - "distributeLinkToInvite": "Para invitar a la {{shortTitle}}, envía el siguiente enlace a:" + "distributeLinkToInvite": "Para invitar a la {{shortTitle}}, envía el siguiente enlace a:", + "distributeLinkToInviteShort": "Para invitar a la {{shortTitle}}, envía el siguiente enlace:" }, "text": { "beforeTheSchoolCloudCanBeUsed": "Antes de que sea posible el uso de la {{shortTitle}}, los padres y/o estudiantes deben haber pasado por el proceso de consentimiento electrónico.", diff --git a/locales/uk.json b/locales/uk.json index a2b45d35eb..6d4efe4430 100644 --- a/locales/uk.json +++ b/locales/uk.json @@ -1153,7 +1153,8 @@ "studentUnderYears": "Учні віком до {{age}} років: батьки
Учні віком від {{age}} років: самі учні
" }, "label": { - "distributeLinkToInvite": "Щоб запросити до {{shortTitle}}, відправте це посилання на:" + "distributeLinkToInvite": "Щоб запросити до {{shortTitle}}, відправте це посилання на:", + "distributeLinkToInviteShort": "Щоб запросити на {{shortTitle}}, надішліть наступне посилання:" } }, "form_InvitationTeacher": { From d8c507ef4abab85255e80c8bc5ac076b3ab097fe Mon Sep 17 00:00:00 2001 From: davwas Date: Thu, 21 Sep 2023 15:00:03 +0200 Subject: [PATCH 2/4] add instance specific html --- .../forms/form-invitation-student.hbs | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/views/administration/forms/form-invitation-student.hbs b/views/administration/forms/form-invitation-student.hbs index 540284c7d8..e51a46c6b6 100644 --- a/views/administration/forms/form-invitation-student.hbs +++ b/views/administration/forms/form-invitation-student.hbs @@ -1,9 +1,25 @@
- -

- {{{$t "administration.form_InvitationStudent.text.studentUnderYears" (dict "age" CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS)}}} -

-

{{$t "administration.form_InvitationStudent.text.beforeTheSchoolCloudCanBeUsed" (dict "shortTitle" @root.theme.short_title) }}

+ {{#ifeq @root.theme.name "brb"}} + + {{else}} + {{#ifeq @root.theme.name "n21"}} + + {{else}} + +

+ {{{$t "administration.form_InvitationStudent.text.studentUnderYears" (dict "age" CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS)}}} +

+

+ {{$t "administration.form_InvitationStudent.text.beforeTheSchoolCloudCanBeUsed" (dict "shortTitle" @root.theme.short_title) }} +

+ {{/ifeq}} + {{/ifeq}}
From 3b0b3f39ecf5bdcb2e6ea17be6abec7acda99ec2 Mon Sep 17 00:00:00 2001 From: davwas Date: Fri, 22 Sep 2023 09:06:02 +0200 Subject: [PATCH 3/4] add margins --- views/administration/forms/form-invitation-student.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/administration/forms/form-invitation-student.hbs b/views/administration/forms/form-invitation-student.hbs index e51a46c6b6..a3f7d57d95 100644 --- a/views/administration/forms/form-invitation-student.hbs +++ b/views/administration/forms/form-invitation-student.hbs @@ -1,12 +1,12 @@
{{#ifeq @root.theme.name "brb"}} -