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-4913 remove passage on user registration #2782

Merged
merged 3 commits into from
Sep 14, 2023
+1 −12
Merged

BC-4913 remove passage on user registration #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37ee3e
Delete passage on user registaration
Sep 1, 2023
17afbbd
Merge branch 'main' into BC-4913-Remove-passage-on-user-refistration
VikDavydiuk Sep 1, 2023
cf1e3d7
Merge branch 'main' into BC-4913-Remove-passage-on-user-registration
VikDavydiuk Sep 14, 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
1 change: 0 additions & 1 deletion src/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@
"pages.administration.school.index.back": "hier zurück zur alten Administrationsseite",
"pages.administration.school.index.error": "Beim Laden der Schule ist ein Fehler aufgetreten",
"pages.administration.school.index.error.gracePeriodExceeded": "Die Wartefrist nach Abschluss der Migration ist abgelaufen",
"pages.administration.school.index.longText.provideStudentsAndTheirParents": "Lass deinen Schüler:innen und den Eltern individuelle Links zum Erklären des Einverständnisses digital oder analog zukommen. Bei Abschluss der Registrierung wird ein Loginpasswort für die Schüler:innen erstellt.",
"pages.administration.school.index.generalSettings": "Allgemeine Einstellungen",
"pages.administration.school.index.generalSettings.save": "Allgemeine Einstellungen speichern",
"pages.administration.school.index.generalSettings.labels.nameOfSchool": "Name der Schule",
Expand Down
1 change: 0 additions & 1 deletion src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,6 @@
"pages.administration.school.index.title": "Manage school",
"pages.administration.school.index.error": "An error occured while loading the school",
"pages.administration.school.index.error.gracePeriodExceeded": "The grace period after finishing migration has expired",
"pages.administration.school.index.longText.provideStudentsAndTheirParents": "Provide your students and their parents with individual links to give their consent in digital or analog form. When registration is complete, a login password will be created for the student.",
"pages.administration.school.index.generalSettings": "General Settings",
"pages.administration.school.index.generalSettings.save": "Save general settings",
"pages.administration.school.index.generalSettings.labels.nameOfSchool": "Name of the school",
Expand Down
1 change: 0 additions & 1 deletion src/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,6 @@
"pages.administration.school.index.error.gracePeriodExceeded": "El período de gracia después de finalizar la migración ha expirado",
"pages.administration.school.index.info": "Para algunos ajustes ",
"pages.administration.school.index.back": "vuelva a la antigua página de administración aquí",
"pages.administration.school.index.longText.provideStudentsAndTheirParents": "Proporciona a tus estudiantes y sus padres enlaces individuales para dar su consentimiento de forma digital o analógica. Cuando se complete el registro, se creará una contraseña de inicio de sesión para el estudiante.",
"pages.administration.school.index.generalSettings": "Configuración general",
"pages.administration.school.index.generalSettings.save": "Guardar la configuración general",
"pages.administration.school.index.generalSettings.labels.nameOfSchool": "Nombre de la escuela",
Expand Down
1 change: 0 additions & 1 deletion src/locales/uk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,6 @@
"pages.administration.school.index.generalSettings.languageHint": "Якщо мову школи не встановлено, застосовується системна мова за замовчуванням (німецька).",
"pages.administration.school.index.generalSettings.save": "Зберегти загальні параметри",
"pages.administration.school.index.generalSettings.timezoneHint": "Щоб змінити часовий пояс, зверніться до одного з адміністраторів.",
"pages.administration.school.index.longText.provideStudentsAndTheirParents": "Надайте своїм учням та їхнім батькам індивідуальні посилання для надання згоди у цифровій або аналоговій формі. Після завершення реєстрації для учня буде створено пароль для входу.",
"pages.administration.school.index.privacySettings": "Параметри конфіденційності",
"pages.administration.school.index.privacySettings.labels.chatFunction": "Активувати функцію чату",
"pages.administration.school.index.privacySettings.labels.lernStore": "Навчальний магазин для учнів",
Expand Down
9 changes: 1 addition & 8 deletions src/pages/administration/SchoolSettings.page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,7 @@
<h2 class="text-h4">
{{ currentSchoolYear }}
</h2>
<p>
{{
$t(
"pages.administration.school.index.longText.provideStudentsAndTheirParents"
)
}}
</p>
<v-divider class="my-sm-6 my-md-8"></v-divider>
<v-divider class="my-sm-6 my-md-3"></v-divider>
<v-row>
<v-col>
<general-settings />
Expand Down