Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-5041 - Remove consent notice in manual registration (SC BB & NBC) #3310

Merged
merged 7 commits into from
Sep 22, 2023
Merged

BC-5041 - Remove consent notice in manual registration (SC BB & NBC) #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2a18c0
add translations
davwas Sep 21, 2023
d8c507e
add instance specific html
davwas Sep 21, 2023
3b0b3f3
add margins
davwas Sep 22, 2023
47ac1fd
add missing translations and html
davwas Sep 22, 2023
e7cbe84
Merge branch 'main' into BC-5041-remove-consent-notice
davwas Sep 22, 2023
af45148
Merge branch 'main' into BC-5041-remove-consent-notice
davwas Sep 22, 2023
8ee91f3
Merge branch 'main' into BC-5041-remove-consent-notice
davwas Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -348,7 +349,8 @@
"distributeTheFollowingLinkToTheTeacher": "Verteile folgenden Link an die Lehrkraft:"
},
"text": {
"beforeUsingThe": "Bevor die Nutzung der {{title}} möglich ist, muss die Lehrkraft den Einwilligungsprozess durchlaufen haben."
"beforeUsingThe": "Bevor die Nutzung der {{title}} möglich ist, muss die Lehrkraft den Einwilligungsprozess durchlaufen haben.",
"toInvite": "Um in die {{shortTitle}} einzuladen, muss folgender Link verteilt werden:"
}
},
"form_Policy": {
Expand Down
6 changes: 4 additions & 2 deletions locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -348,7 +349,8 @@
"distributeTheFollowingLinkToTheTeacher": "Give the following link to the teacher:"
},
"text": {
"beforeUsingThe": "Before the use of the {{title}} possible, the teacher must have gone through the consent process."
"beforeUsingThe": "Before the use of the {{title}} possible, the teacher must have gone through the consent process.",
"toInvite": "To invite to the {{shortTitle}}, send the following link:"
}
},
"form_Policy": {
Expand Down
6 changes: 4 additions & 2 deletions locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -348,7 +349,8 @@
"distributeTheFollowingLinkToTheTeacher": "Comparte el siguiente enlace con el profesor:"
},
"text": {
"beforeUsingThe": "Antes de que sea posible el uso de {{title}}, el profesor debe haber pasado por el proceso de consentimiento."
"beforeUsingThe": "Antes de que sea posible el uso de {{title}}, el profesor debe haber pasado por el proceso de consentimiento.",
"toInvite": "Para invitar a la {{shortTitle}}, envía el siguiente enlace:"
}
},
"form_Policy": {
Expand Down
6 changes: 4 additions & 2 deletions locales/uk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,15 +1153,17 @@
"studentUnderYears": "<b>Учні віком до {{age}} років: </b> батьки <br/> <b> Учні віком від {{age}} років: </b> самі учні <br/>"
},
"label": {
"distributeLinkToInvite": "Щоб запросити до {{shortTitle}}, відправте це посилання на:"
"distributeLinkToInvite": "Щоб запросити до {{shortTitle}}, відправте це посилання на:",
"distributeLinkToInviteShort": "Щоб запросити на {{shortTitle}}, надішліть наступне посилання:"
}
},
"form_InvitationTeacher": {
"label": {
"distributeTheFollowingLinkToTheTeacher": "Дайте викладачу таке посилання:"
},
"text": {
"beforeUsingThe": "Перш ніж можливе використання {{title}}, викладач повинен пройти процедуру отримання згоди."
"beforeUsingThe": "Перш ніж можливе використання {{title}}, викладач повинен пройти процедуру отримання згоди.",
"toInvite": "Щоб запросити на {{shortTitle}}, надішліть наступне посилання:"
}
},
"form_Problem": {
Expand Down
26 changes: 21 additions & 5 deletions views/administration/forms/form-invitation-student.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
<input name="schoolId" type="hidden" data-force-value="true" value="{{currentSchool}}" />
<div class="form-group">
<label for="invitation-link">{{$t "administration.form_InvitationStudent.label.distributeLinkToInvite" (dict "shortTitle" @root.theme.short_title)}} </label>
<p>
{{{$t "administration.form_InvitationStudent.text.studentUnderYears" (dict "age" CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS)}}}
</p>
<p>{{$t "administration.form_InvitationStudent.text.beforeTheSchoolCloudCanBeUsed" (dict "shortTitle" @root.theme.short_title) }}</p>
{{#ifeq @root.theme.name "brb"}}
<label for="invitation-link" class="mb-1">
{{$t "administration.form_InvitationStudent.label.distributeLinkToInviteShort" (dict "shortTitle" @root.theme.theme_title)}}
</label>
{{else}}
{{#ifeq @root.theme.name "n21"}}
<label for="invitation-link" class="mb-1">
{{$t "administration.form_InvitationStudent.label.distributeLinkToInviteShort" (dict "shortTitle" @root.theme.theme_title)}}
</label>
{{else}}
<label for="invitation-link">
{{$t "administration.form_InvitationStudent.label.distributeLinkToInvite" (dict "shortTitle" @root.theme.theme_title)}}
</label>
<p>
{{{$t "administration.form_InvitationStudent.text.studentUnderYears" (dict "age" CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS)}}}
</p>
<p>
{{$t "administration.form_InvitationStudent.text.beforeTheSchoolCloudCanBeUsed" (dict "shortTitle" @root.theme.theme_title) }}
</p>
{{/ifeq}}
{{/ifeq}}
<input id="invitation-link" class="form-control" name="invitation" type="text" />
</div>
22 changes: 17 additions & 5 deletions views/administration/forms/form-invitation-teacher.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<input name="schoolId" type="hidden" data-force-value="true" value="{{currentSchool}}" />
<div class="form-group">
<p>
{{$t "administration.form_InvitationTeacher.text.beforeUsingThe" (dict "shortTitle" theme.title) }}
</p>
<label for="invitation-link">{{$t "administration.form_InvitationTeacher.label.distributeTheFollowingLinkToTheTeacher" }}</label>
{{#ifeq @root.theme.name "brb"}}
<label for="invitation-link" class="mb-1">
{{$t "administration.form_InvitationTeacher.text.toInvite" (dict "shortTitle" @root.theme.theme_title)}}
</label>
{{else}}
{{#ifeq @root.theme.name "n21"}}
<label for="invitation-link" class="mb-1">
{{$t "administration.form_InvitationTeacher.text.toInvite" (dict "shortTitle" @root.theme.theme_title)}}
</label>
{{else}}
<p>
{{$t "administration.form_InvitationTeacher.text.beforeUsingThe" (dict "title" @root.theme.theme_title) }}
</p>
<label for="invitation-link">{{$t "administration.form_InvitationTeacher.label.distributeTheFollowingLinkToTheTeacher" }}</label>
{{/ifeq}}
{{/ifeq}}
<input id="invitation-link" class="form-control" name="invitation" type="text" />
</div>
</div>