Skip to content
Snippets Groups Projects
Verified Commit 5143e011 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 73-add-rules-and-permissions 

# Conflicts:
#	aleksis/apps/alsijil/menus.py
#	aleksis/apps/alsijil/models.py
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py
parents 63c96016 0b8aa003
No related branches found
No related tags found
1 merge request!49Resolve "Add rules and permissions"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2760 additions and 1241 deletions
.gitignore
+ 3
− 0
View file @ 5143e011
......@@ -53,3 +53,6 @@ db.sqlite3
# Sphinx
docs/_build/
# Test
.tox/
aleksis/apps/alsijil/forms.py
+ 6
− 6
View file @ 5143e011
......@@ -11,7 +11,7 @@ from material import Layout, Row
from aleksis.apps.chronos.managers import TimetableType
from aleksis.core.models import Group, Person
from .models import ExcuseType, LessonDocumentation, PersonalNote, PersonalNoteFilter
from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote
class LessonDocumentationForm(forms.ModelForm):
......@@ -28,7 +28,7 @@ class LessonDocumentationForm(forms.ModelForm):
class PersonalNoteForm(forms.ModelForm):
class Meta:
model = PersonalNote
fields = ["absent", "late", "excused", "excuse_type", "remarks"]
fields = ["absent", "late", "excused", "excuse_type", "extra_marks", "remarks"]
person_name = forms.CharField(disabled=True)
......@@ -109,12 +109,12 @@ class RegisterAbsenceForm(forms.Form):
remarks = forms.CharField(label=_("Remarks"), max_length=30, required=False)
class PersonalNoteFilterForm(forms.ModelForm):
layout = Layout(Row("identifier", "description"), Row("regex"))
class ExtraMarkForm(forms.ModelForm):
layout = Layout("short_name", "name")
class Meta:
model = PersonalNoteFilter
fields = ["identifier", "description", "regex"]
model = ExtraMark
fields = ["short_name", "name"]
class ExcuseTypeForm(forms.ModelForm):
......
aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
+ 354
− 167
View file @ 5143e011
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:20+0200\n"
"POT-Creation-Date: 2020-08-03 20:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,53 +16,62 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: forms.py:41
#: forms.py:25
msgid "Homework for the next lesson"
msgstr ""
#: forms.py:50 templates/alsijil/print/full_register.html:199
msgid "Group"
msgstr ""
#: forms.py:49 templates/alsijil/print/full_register.html:101
#: forms.py:56 templates/alsijil/print/full_register.html:170
#: templates/alsijil/print/full_register.html:201
msgid "Teacher"
msgstr ""
#: forms.py:57
msgid "Room"
#: forms.py:73
msgid "You can't select a group and a teacher both."
msgstr ""
#: forms.py:70
#: forms.py:101
msgid "Start date"
msgstr ""
#: forms.py:73
#: forms.py:102
msgid "End date"
msgstr ""
#: forms.py:75
#: forms.py:103
msgid "From period"
msgstr ""
#: forms.py:77 templates/alsijil/lesson.html:58
#: forms.py:105 templates/alsijil/class_register/lesson.html:163
msgid "Person"
msgstr ""
#: forms.py:79 templates/alsijil/lesson.html:59
#: templates/alsijil/print/full_register.html:223
#: templates/alsijil/week_view.html:96
#: forms.py:107 templates/alsijil/class_register/lesson.html:164
#: templates/alsijil/class_register/week_view.html:109
#: templates/alsijil/print/full_register.html:75
#: templates/alsijil/print/full_register.html:312
msgid "Absent"
msgstr ""
#: forms.py:80 templates/alsijil/lesson.html:61
#: forms.py:108 templates/alsijil/class_register/lesson.html:166
#: templates/alsijil/print/full_register.html:84
#: templates/alsijil/print/full_register.html:275
msgid "Excused"
msgstr ""
#: forms.py:81 templates/alsijil/lesson.html:62
#: templates/alsijil/print/full_register.html:225
#: forms.py:109 templates/alsijil/class_register/lesson.html:170
#: templates/alsijil/class_register/lesson.html:223
#: templates/alsijil/class_register/lesson.html:231
#: templates/alsijil/print/full_register.html:314
msgid "Remarks"
msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:16
#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
msgid "Class register"
msgstr ""
......@@ -78,306 +87,484 @@ msgstr ""
msgid "Register absence"
msgstr ""
#: menus.py:34
msgid "Personal note filters"
#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
#: templates/alsijil/excuse_type/list.html:9
msgid "Excuse types"
msgstr ""
#: menus.py:40 models.py:66 models.py:138
#: templates/alsijil/class_register/lesson.html:168
#: templates/alsijil/extra_mark/list.html:8
#: templates/alsijil/extra_mark/list.html:9
#: templates/alsijil/print/full_register.html:293
msgid "Extra marks"
msgstr ""
#: models.py:18 models.py:124
msgid "Short name"
msgstr ""
#: models.py:20 models.py:126
msgid "Name"
msgstr ""
#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
#: templates/alsijil/class_register/lesson.html:202
msgid "Excuse type"
msgstr ""
#: models.py:51 templates/alsijil/print/full_register.html:271
#: models.py:75
msgid "Personal note"
msgstr ""
#: models.py:76 templates/alsijil/class_register/lesson.html:64
#: templates/alsijil/class_register/lesson.html:156
#: templates/alsijil/class_register/week_view.html:104
msgid "Personal notes"
msgstr ""
#: models.py:99 templates/alsijil/class_register/week_view.html:56
#: templates/alsijil/print/full_register.html:371
msgid "Lesson topic"
msgstr ""
#: models.py:52 templates/alsijil/print/full_register.html:272
#: models.py:100 templates/alsijil/print/full_register.html:372
msgid "Homework"
msgstr ""
#: models.py:68
msgid "Identifier"
#: models.py:102
msgid "Group note"
msgstr ""
#: models.py:106 templates/alsijil/class_register/lesson.html:60
#: templates/alsijil/class_register/lesson.html:143
msgid "Lesson documentation"
msgstr ""
#: models.py:107
msgid "Lesson documentations"
msgstr ""
#: models.py:71 templates/alsijil/print/full_register.html:178
msgid "Description"
#: models.py:137
msgid "Extra mark"
msgstr ""
#: models.py:74
msgid "Match expression"
#: preferences.py:16
msgid "Block adding personal notes for cancelled lessons"
msgstr ""
#: tables.py:14
#: tables.py:16 tables.py:36
msgid "Edit"
msgstr ""
#: templates/alsijil/lesson.html:5
#: tables.py:22 tables.py:42
msgid "Delete"
msgstr ""
#: templates/alsijil/absences/register.html:5
#: templates/alsijil/absences/register.html:6
msgid "Manage absence"
msgstr ""
#: templates/alsijil/class_register/lesson.html:6
msgid "Lesson"
msgstr ""
#: templates/alsijil/lesson.html:34
msgid "Lesson documentation"
#: templates/alsijil/class_register/lesson.html:14
#: templates/alsijil/class_register/lesson.html:83
#, python-format
msgid "%(period)s. period"
msgstr ""
#: templates/alsijil/class_register/lesson.html:38
msgid "Previous lesson"
msgstr ""
#: templates/alsijil/class_register/lesson.html:46
msgid "Next lesson"
msgstr ""
#: templates/alsijil/lesson.html:43
#: templates/alsijil/class_register/lesson.html:68
#: templates/alsijil/class_register/lesson.html:249
msgid "Change history"
msgstr ""
#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
msgid "Personal notes"
#: templates/alsijil/class_register/lesson.html:82
msgid "Overview: Previous lesson"
msgstr ""
#: templates/alsijil/lesson.html:60
#: templates/alsijil/print/full_register.html:202
#: templates/alsijil/class_register/lesson.html:89
msgid "Lesson topic of previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:96
msgid "Homework for this lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:103
msgid "Group notes for previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:110
msgid "Absent persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:117
msgid "Late persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:165
#: templates/alsijil/print/full_register.html:287
msgid "Tardiness"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:5
#: templates/alsijil/manage_personal_note_filter.html:6
msgid "Manage personal note filter"
#: templates/alsijil/class_register/lesson.html:188
msgid "Tardiness (in m)"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:11
msgid "Delete filter"
#: templates/alsijil/class_register/week_view.html:6
msgid "Week view"
msgstr ""
#: templates/alsijil/personal_note_filters.html:7
#: templates/alsijil/personal_note_filters.html:8
msgid "List of all personal note filters"
#: templates/alsijil/class_register/week_view.html:27
msgid "Select"
msgstr ""
#: templates/alsijil/personal_note_filters.html:12
msgid "Add filter"
#: templates/alsijil/class_register/week_view.html:33
#, python-format
msgid "CW %(week)s: %(instance)s"
msgstr ""
#: templates/alsijil/print/full_register.html:22
#: templates/alsijil/print/full_register.html:54
msgid "Owners"
#: templates/alsijil/class_register/week_view.html:50
msgid "Period"
msgstr ""
#: templates/alsijil/class_register/week_view.html:52
msgid "Groups"
msgstr ""
#: templates/alsijil/class_register/week_view.html:54
#: templates/alsijil/print/full_register.html:169
#: templates/alsijil/print/full_register.html:200
msgid "Subject"
msgstr ""
#: templates/alsijil/class_register/week_view.html:55
msgid "Teachers"
msgstr ""
#: templates/alsijil/class_register/week_view.html:110
msgid "unexcused"
msgstr ""
#: templates/alsijil/class_register/week_view.html:113
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/class_register/week_view.html:142
msgid "No lessons available"
msgstr ""
#: templates/alsijil/class_register/week_view.html:145
msgid ""
"\n"
" There are no lessons for the selected group or teacher in this week.\n"
" "
msgstr ""
#: templates/alsijil/excuse_type/create.html:6
#: templates/alsijil/excuse_type/create.html:7
#: templates/alsijil/excuse_type/list.html:16
msgid "Create excuse type"
msgstr ""
#: templates/alsijil/excuse_type/edit.html:6
#: templates/alsijil/excuse_type/edit.html:7
msgid "Edit excuse type"
msgstr ""
#: templates/alsijil/excuse_type/warning.html:5
msgid ""
"\n"
" This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
" Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
" "
msgstr ""
#: templates/alsijil/extra_mark/create.html:6
#: templates/alsijil/extra_mark/create.html:7
#: templates/alsijil/extra_mark/list.html:14
msgid "Create extra mark"
msgstr ""
#: templates/alsijil/extra_mark/edit.html:6
#: templates/alsijil/extra_mark/edit.html:7
msgid "Edit extra mark"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:126
msgid "(e)"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:130
msgid "(u)"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:6
msgid "Data complete"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:12
#: templates/alsijil/print/full_register.html:406
msgid "Lesson cancelled"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:14
msgid "Missing data"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:16
msgid "Pending"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:18
msgid "Substitution"
msgstr ""
#: templates/alsijil/print/full_register.html:6
msgid "Class register:"
msgstr ""
#: templates/alsijil/print/full_register.html:26
#: templates/alsijil/print/full_register.html:59
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:30
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:34
#: templates/alsijil/print/full_register.html:38
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:41
#: templates/alsijil/print/full_register.html:45
msgid ""
"\n"
" Copies of the class register, both digital and as printout, "
"must\n"
" only be kept inside the school and/or on devices authorised by "
"the\n"
" school.\n"
" "
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:48
#: templates/alsijil/print/full_register.html:52
msgid ""
"\n"
" The owner of the group and the headteacher confirm the above, "
"as\n"
" well as the correctness of this printout.\n"
" "
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:55
#: templates/alsijil/print/full_register.html:62
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:61
#: templates/alsijil/print/full_register.html:69
msgid "Abbreviations"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "General"
msgstr ""
#: templates/alsijil/print/full_register.html:78
msgid "Late"
msgstr ""
#: templates/alsijil/print/full_register.html:81
#: templates/alsijil/print/full_register.html:283
msgid "Unexcused"
msgstr ""
#: templates/alsijil/print/full_register.html:89
msgid "Custom excuse types"
msgstr ""
#: templates/alsijil/print/full_register.html:101
msgid "Available extra marks"
msgstr ""
#: templates/alsijil/print/full_register.html:115
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:66
#: templates/alsijil/print/full_register.html:120
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:67
#: templates/alsijil/print/full_register.html:121
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:68
#: templates/alsijil/print/full_register.html:122
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
#: templates/alsijil/print/full_register.html:123
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:70
#: templates/alsijil/print/full_register.html:124
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:71
#: templates/alsijil/print/full_register.html:200
msgid "Absences"
#: templates/alsijil/print/full_register.html:125
msgid "(a)"
msgstr ""
#: templates/alsijil/print/full_register.html:72
#: templates/alsijil/print/full_register.html:201
msgid "Unexcused"
#: templates/alsijil/print/full_register.html:131
msgid "(b)"
msgstr ""
#: templates/alsijil/print/full_register.html:73
#: templates/alsijil/print/full_register.html:224
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:95
#: templates/alsijil/print/full_register.html:164
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:100
#: templates/alsijil/week_view.html:48
msgid "Subject"
msgstr ""
#: templates/alsijil/print/full_register.html:102
#: templates/alsijil/print/full_register.html:171
#: templates/alsijil/print/full_register.html:202
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:103
#: templates/alsijil/print/full_register.html:172
#: templates/alsijil/print/full_register.html:203
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:104
#: templates/alsijil/print/full_register.html:173
#: templates/alsijil/print/full_register.html:204
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:124
#: templates/alsijil/print/full_register.html:194
msgid "Teachers and lessons in child groups"
msgstr ""
#: templates/alsijil/print/full_register.html:227
msgid "Personal overview"
msgstr ""
#: templates/alsijil/print/full_register.html:126
#: templates/alsijil/print/full_register.html:229
msgid "Contact details"
msgstr ""
#: templates/alsijil/print/full_register.html:174
msgid "Statistics on remarks"
#: templates/alsijil/print/full_register.html:266
msgid "Absences and tardiness"
msgstr ""
#: templates/alsijil/print/full_register.html:179
msgid "Count"
#: templates/alsijil/print/full_register.html:269
msgid "Absences"
msgstr ""
#: templates/alsijil/print/full_register.html:196
msgid "Absences and tardiness"
#: templates/alsijil/print/full_register.html:274
msgid "thereof"
msgstr ""
#: templates/alsijil/print/full_register.html:215
#: templates/alsijil/print/full_register.html:304
msgid "Relevant personal notes"
msgstr ""
#: templates/alsijil/print/full_register.html:219
#: templates/alsijil/print/full_register.html:308
msgid "Date"
msgstr ""
#: templates/alsijil/print/full_register.html:220
#: templates/alsijil/print/full_register.html:268
#: templates/alsijil/print/full_register.html:309
#: templates/alsijil/print/full_register.html:369
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:221
#: templates/alsijil/print/full_register.html:269
#: templates/alsijil/print/full_register.html:310
#: templates/alsijil/print/full_register.html:370
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:222
#: templates/alsijil/print/full_register.html:274
#: templates/alsijil/print/full_register.html:311
#: templates/alsijil/print/full_register.html:374
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:240
msgid "Yes"
#: templates/alsijil/print/full_register.html:313
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:242
#: templates/alsijil/print/full_register.html:314
#: templates/alsijil/print/full_register.html:324
msgid "e"
#: templates/alsijil/print/full_register.html:330
msgid "Yes"
msgstr ""
#: templates/alsijil/print/full_register.html:262
msgid "Lesson documentation for calendar week"
#: templates/alsijil/print/full_register.html:335
#: templates/alsijil/print/full_register.html:424
#: templates/alsijil/print/full_register.html:439
msgid "e"
msgstr ""
#: templates/alsijil/print/full_register.html:270
msgid "Subs."
#: templates/alsijil/print/full_register.html:363
msgid "Lesson documentation for week"
msgstr ""
#: templates/alsijil/print/full_register.html:273
#: templates/alsijil/print/full_register.html:373
msgid "Notes"
msgstr ""
#: templates/alsijil/print/full_register.html:301
msgid "Lesson cancelled"
#: views.py:76
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
#: templates/alsijil/register_absence.html:5
#: templates/alsijil/register_absence.html:6
msgid "Manage absence"
#: views.py:90
msgid "You are not allowed to create a lesson documentation for a lesson in the future."
msgstr ""
#: templates/alsijil/week_view.html:6
msgid "Week view"
#: views.py:116
msgid "The lesson documentation has been saved."
msgstr ""
#: templates/alsijil/week_view.html:21
msgid "Select"
#: views.py:136
msgid "The personal notes have been saved."
msgstr ""
#: templates/alsijil/week_view.html:47
msgid "Period"
msgstr ""
#: templates/alsijil/week_view.html:49
msgid "Teachers"
msgstr ""
#: templates/alsijil/week_view.html:97
msgid "unexcused"
#: views.py:327
msgid "There is no current school term."
msgstr ""
#: templates/alsijil/week_view.html:100
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/week_view.html:122
msgid "No group selected"
#: views.py:463
msgid "The absence has been saved."
msgstr ""
#: templates/alsijil/week_view.html:125
msgid ""
"\n"
" There are no lessons for the selected group, teacher, room or "
"time.\n"
" "
#: views.py:488
msgid "The extra mark has been created."
msgstr ""
#: views.py:56
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
#: views.py:499
msgid "The extra mark has been saved."
msgstr ""
#: views.py:68
msgid ""
"You are not allowed to create a lesson documentation for a lesson in the "
"future."
#: views.py:509
msgid "The extra mark has been deleted."
msgstr ""
#: views.py:306
msgid "The absence has been saved."
#: views.py:529
msgid "The excuse type has been created."
msgstr ""
#: views.py:344
msgid "The filter has been saved"
#: views.py:540
msgid "The excuse type has been saved."
msgstr ""
#: views.py:360
msgid "The filter has been deleted."
#: views.py:550
msgid "The excuse type has been deleted."
msgstr ""
aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
+ 454
− 221
View file @ 5143e011
This diff is collapsed.
aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
+ 476
− 207
View file @ 5143e011
This diff is collapsed.
aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
+ 375
− 175
View file @ 5143e011
......@@ -3,64 +3,75 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:20+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"POT-Creation-Date: 2020-08-03 20:03+0200\n"
"PO-Revision-Date: 2020-07-26 14:08+0000\n"
"Last-Translator: Julian <leuckerj@gmail.com>\n"
"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/>\n"
"Language: la\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.0.1\n"
#: forms.py:41
msgid "Group"
#: forms.py:25
msgid "Homework for the next lesson"
msgstr ""
#: forms.py:49 templates/alsijil/print/full_register.html:101
#: forms.py:50 templates/alsijil/print/full_register.html:199
msgid "Group"
msgstr "Grex"
#: forms.py:56 templates/alsijil/print/full_register.html:170
#: templates/alsijil/print/full_register.html:201
msgid "Teacher"
msgstr ""
#: forms.py:57
msgid "Room"
#: forms.py:73
msgid "You can't select a group and a teacher both."
msgstr ""
#: forms.py:70
#: forms.py:101
msgid "Start date"
msgstr ""
#: forms.py:73
#: forms.py:102
msgid "End date"
msgstr ""
#: forms.py:75
#: forms.py:103
msgid "From period"
msgstr ""
#: forms.py:77 templates/alsijil/lesson.html:58
#: forms.py:105 templates/alsijil/class_register/lesson.html:163
msgid "Person"
msgstr ""
msgstr "Persona"
#: forms.py:79 templates/alsijil/lesson.html:59
#: templates/alsijil/print/full_register.html:223
#: templates/alsijil/week_view.html:96
#: forms.py:107 templates/alsijil/class_register/lesson.html:164
#: templates/alsijil/class_register/week_view.html:109
#: templates/alsijil/print/full_register.html:75
#: templates/alsijil/print/full_register.html:312
msgid "Absent"
msgstr ""
#: forms.py:80 templates/alsijil/lesson.html:61
#: forms.py:108 templates/alsijil/class_register/lesson.html:166
#: templates/alsijil/print/full_register.html:84
#: templates/alsijil/print/full_register.html:275
msgid "Excused"
msgstr ""
#: forms.py:81 templates/alsijil/lesson.html:62
#: templates/alsijil/print/full_register.html:225
#: forms.py:109 templates/alsijil/class_register/lesson.html:170
#: templates/alsijil/class_register/lesson.html:223
#: templates/alsijil/class_register/lesson.html:231
#: templates/alsijil/print/full_register.html:314
msgid "Remarks"
msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:16
#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
msgid "Class register"
msgstr ""
......@@ -76,306 +87,495 @@ msgstr ""
msgid "Register absence"
msgstr ""
#: menus.py:34
msgid "Personal note filters"
#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
#: templates/alsijil/excuse_type/list.html:9
msgid "Excuse types"
msgstr ""
#: models.py:51 templates/alsijil/print/full_register.html:271
#: menus.py:40 models.py:66 models.py:138
#: templates/alsijil/class_register/lesson.html:168
#: templates/alsijil/extra_mark/list.html:8
#: templates/alsijil/extra_mark/list.html:9
#: templates/alsijil/print/full_register.html:293
msgid "Extra marks"
msgstr ""
#: models.py:18 models.py:124
#, fuzzy
#| msgid "First name"
msgid "Short name"
msgstr "Primus nomen"
#: models.py:20 models.py:126
msgid "Name"
msgstr ""
#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
#: templates/alsijil/class_register/lesson.html:202
msgid "Excuse type"
msgstr ""
#: models.py:75
#, fuzzy
#| msgid "Person"
msgid "Personal note"
msgstr "Persona"
#: models.py:76 templates/alsijil/class_register/lesson.html:64
#: templates/alsijil/class_register/lesson.html:156
#: templates/alsijil/class_register/week_view.html:104
msgid "Personal notes"
msgstr ""
#: models.py:99 templates/alsijil/class_register/week_view.html:56
#: templates/alsijil/print/full_register.html:371
msgid "Lesson topic"
msgstr ""
#: models.py:52 templates/alsijil/print/full_register.html:272
#: models.py:100 templates/alsijil/print/full_register.html:372
msgid "Homework"
msgstr ""
#: models.py:68
msgid "Identifier"
#: models.py:102
#, fuzzy
#| msgid "Group"
msgid "Group note"
msgstr "Grex"
#: models.py:106 templates/alsijil/class_register/lesson.html:60
#: templates/alsijil/class_register/lesson.html:143
msgid "Lesson documentation"
msgstr ""
#: models.py:107
msgid "Lesson documentations"
msgstr ""
#: models.py:71 templates/alsijil/print/full_register.html:178
msgid "Description"
#: models.py:137
msgid "Extra mark"
msgstr ""
#: models.py:74
msgid "Match expression"
#: preferences.py:16
msgid "Block adding personal notes for cancelled lessons"
msgstr ""
#: tables.py:14
#: tables.py:16 tables.py:36
msgid "Edit"
msgstr ""
#: templates/alsijil/lesson.html:5
#: tables.py:22 tables.py:42
msgid "Delete"
msgstr ""
#: templates/alsijil/absences/register.html:5
#: templates/alsijil/absences/register.html:6
msgid "Manage absence"
msgstr ""
#: templates/alsijil/class_register/lesson.html:6
msgid "Lesson"
msgstr ""
#: templates/alsijil/lesson.html:34
msgid "Lesson documentation"
#: templates/alsijil/class_register/lesson.html:14
#: templates/alsijil/class_register/lesson.html:83
#, python-format
msgid "%(period)s. period"
msgstr ""
#: templates/alsijil/class_register/lesson.html:38
msgid "Previous lesson"
msgstr ""
#: templates/alsijil/class_register/lesson.html:46
msgid "Next lesson"
msgstr ""
#: templates/alsijil/lesson.html:43
#: templates/alsijil/class_register/lesson.html:68
#: templates/alsijil/class_register/lesson.html:249
msgid "Change history"
msgstr ""
#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
msgid "Personal notes"
#: templates/alsijil/class_register/lesson.html:82
msgid "Overview: Previous lesson"
msgstr ""
#: templates/alsijil/lesson.html:60
#: templates/alsijil/print/full_register.html:202
#: templates/alsijil/class_register/lesson.html:89
msgid "Lesson topic of previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:96
msgid "Homework for this lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:103
msgid "Group notes for previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:110
msgid "Absent persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:117
msgid "Late persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:165
#: templates/alsijil/print/full_register.html:287
msgid "Tardiness"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:5
#: templates/alsijil/manage_personal_note_filter.html:6
msgid "Manage personal note filter"
#: templates/alsijil/class_register/lesson.html:188
msgid "Tardiness (in m)"
msgstr ""
#: templates/alsijil/class_register/week_view.html:6
msgid "Week view"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:11
msgid "Delete filter"
#: templates/alsijil/class_register/week_view.html:27
msgid "Select"
msgstr ""
#: templates/alsijil/personal_note_filters.html:7
#: templates/alsijil/personal_note_filters.html:8
msgid "List of all personal note filters"
#: templates/alsijil/class_register/week_view.html:33
#, python-format
msgid "CW %(week)s: %(instance)s"
msgstr ""
#: templates/alsijil/personal_note_filters.html:12
msgid "Add filter"
#: templates/alsijil/class_register/week_view.html:50
msgid "Period"
msgstr ""
#: templates/alsijil/print/full_register.html:22
#: templates/alsijil/print/full_register.html:54
msgid "Owners"
#: templates/alsijil/class_register/week_view.html:52
#, fuzzy
#| msgid "Group"
msgid "Groups"
msgstr "Grex"
#: templates/alsijil/class_register/week_view.html:54
#: templates/alsijil/print/full_register.html:169
#: templates/alsijil/print/full_register.html:200
msgid "Subject"
msgstr ""
#: templates/alsijil/class_register/week_view.html:55
msgid "Teachers"
msgstr ""
#: templates/alsijil/class_register/week_view.html:110
msgid "unexcused"
msgstr ""
#: templates/alsijil/class_register/week_view.html:113
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/class_register/week_view.html:142
msgid "No lessons available"
msgstr ""
#: templates/alsijil/class_register/week_view.html:145
msgid ""
"\n"
" There are no lessons for the selected group or teacher in this week.\n"
" "
msgstr ""
#: templates/alsijil/excuse_type/create.html:6
#: templates/alsijil/excuse_type/create.html:7
#: templates/alsijil/excuse_type/list.html:16
msgid "Create excuse type"
msgstr ""
#: templates/alsijil/excuse_type/edit.html:6
#: templates/alsijil/excuse_type/edit.html:7
msgid "Edit excuse type"
msgstr ""
#: templates/alsijil/excuse_type/warning.html:5
msgid ""
"\n"
" This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
" Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
" "
msgstr ""
#: templates/alsijil/extra_mark/create.html:6
#: templates/alsijil/extra_mark/create.html:7
#: templates/alsijil/extra_mark/list.html:14
msgid "Create extra mark"
msgstr ""
#: templates/alsijil/extra_mark/edit.html:6
#: templates/alsijil/extra_mark/edit.html:7
msgid "Edit extra mark"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:126
msgid "(e)"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:130
msgid "(u)"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:6
msgid "Data complete"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:12
#: templates/alsijil/print/full_register.html:406
msgid "Lesson cancelled"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:14
msgid "Missing data"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:16
msgid "Pending"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:18
msgid "Substitution"
msgstr ""
#: templates/alsijil/print/full_register.html:6
msgid "Class register:"
msgstr ""
#: templates/alsijil/print/full_register.html:26
#: templates/alsijil/print/full_register.html:59
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:30
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:34
#: templates/alsijil/print/full_register.html:38
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:41
#: templates/alsijil/print/full_register.html:45
msgid ""
"\n"
" Copies of the class register, both digital and as printout, "
"must\n"
" only be kept inside the school and/or on devices authorised by "
"the\n"
" school.\n"
" "
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:48
#: templates/alsijil/print/full_register.html:52
msgid ""
"\n"
" The owner of the group and the headteacher confirm the above, "
"as\n"
" well as the correctness of this printout.\n"
" "
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:55
#: templates/alsijil/print/full_register.html:62
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:61
msgid "Persons in group"
#: templates/alsijil/print/full_register.html:69
msgid "Abbreviations"
msgstr ""
#: templates/alsijil/print/full_register.html:66
msgid "No."
#: templates/alsijil/print/full_register.html:71
msgid "General"
msgstr ""
#: templates/alsijil/print/full_register.html:67
msgid "Last name"
#: templates/alsijil/print/full_register.html:78
msgid "Late"
msgstr ""
#: templates/alsijil/print/full_register.html:68
msgid "First name"
#: templates/alsijil/print/full_register.html:81
#: templates/alsijil/print/full_register.html:283
msgid "Unexcused"
msgstr ""
#: templates/alsijil/print/full_register.html:69
msgid "Sex"
#: templates/alsijil/print/full_register.html:89
msgid "Custom excuse types"
msgstr ""
#: templates/alsijil/print/full_register.html:70
msgid "Date of birth"
#: templates/alsijil/print/full_register.html:101
msgid "Available extra marks"
msgstr ""
#: templates/alsijil/print/full_register.html:71
#: templates/alsijil/print/full_register.html:200
msgid "Absences"
#: templates/alsijil/print/full_register.html:115
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:72
#: templates/alsijil/print/full_register.html:201
msgid "Unexcused"
#: templates/alsijil/print/full_register.html:120
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:73
#: templates/alsijil/print/full_register.html:224
msgid "Tard."
#: templates/alsijil/print/full_register.html:121
msgid "Last name"
msgstr "Secondus nomen"
#: templates/alsijil/print/full_register.html:122
msgid "First name"
msgstr "Primus nomen"
#: templates/alsijil/print/full_register.html:123
msgid "Sex"
msgstr "Genus"
#: templates/alsijil/print/full_register.html:124
msgid "Date of birth"
msgstr "Dies natalis"
#: templates/alsijil/print/full_register.html:125
msgid "(a)"
msgstr ""
#: templates/alsijil/print/full_register.html:95
msgid "Teachers and lessons in group"
#: templates/alsijil/print/full_register.html:131
msgid "(b)"
msgstr ""
#: templates/alsijil/print/full_register.html:100
#: templates/alsijil/week_view.html:48
msgid "Subject"
#: templates/alsijil/print/full_register.html:164
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:102
#: templates/alsijil/print/full_register.html:171
#: templates/alsijil/print/full_register.html:202
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:103
#: templates/alsijil/print/full_register.html:172
#: templates/alsijil/print/full_register.html:203
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:104
#: templates/alsijil/print/full_register.html:173
#: templates/alsijil/print/full_register.html:204
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:124
#: templates/alsijil/print/full_register.html:194
msgid "Teachers and lessons in child groups"
msgstr ""
#: templates/alsijil/print/full_register.html:227
msgid "Personal overview"
msgstr ""
#: templates/alsijil/print/full_register.html:126
#: templates/alsijil/print/full_register.html:229
msgid "Contact details"
msgstr ""
#: templates/alsijil/print/full_register.html:174
msgid "Statistics on remarks"
#: templates/alsijil/print/full_register.html:266
msgid "Absences and tardiness"
msgstr ""
#: templates/alsijil/print/full_register.html:179
msgid "Count"
#: templates/alsijil/print/full_register.html:269
msgid "Absences"
msgstr ""
#: templates/alsijil/print/full_register.html:196
msgid "Absences and tardiness"
#: templates/alsijil/print/full_register.html:274
msgid "thereof"
msgstr ""
#: templates/alsijil/print/full_register.html:215
#: templates/alsijil/print/full_register.html:304
msgid "Relevant personal notes"
msgstr ""
#: templates/alsijil/print/full_register.html:219
#: templates/alsijil/print/full_register.html:308
msgid "Date"
msgstr ""
msgstr "dies"
#: templates/alsijil/print/full_register.html:220
#: templates/alsijil/print/full_register.html:268
#: templates/alsijil/print/full_register.html:309
#: templates/alsijil/print/full_register.html:369
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:221
#: templates/alsijil/print/full_register.html:269
#: templates/alsijil/print/full_register.html:310
#: templates/alsijil/print/full_register.html:370
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:222
#: templates/alsijil/print/full_register.html:274
#: templates/alsijil/print/full_register.html:311
#: templates/alsijil/print/full_register.html:374
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:240
msgid "Yes"
#: templates/alsijil/print/full_register.html:313
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:242
#: templates/alsijil/print/full_register.html:314
#: templates/alsijil/print/full_register.html:324
msgid "e"
#: templates/alsijil/print/full_register.html:330
msgid "Yes"
msgstr ""
#: templates/alsijil/print/full_register.html:262
msgid "Lesson documentation for calendar week"
#: templates/alsijil/print/full_register.html:335
#: templates/alsijil/print/full_register.html:424
#: templates/alsijil/print/full_register.html:439
msgid "e"
msgstr ""
#: templates/alsijil/print/full_register.html:270
msgid "Subs."
#: templates/alsijil/print/full_register.html:363
msgid "Lesson documentation for week"
msgstr ""
#: templates/alsijil/print/full_register.html:273
#: templates/alsijil/print/full_register.html:373
msgid "Notes"
msgstr ""
#: templates/alsijil/print/full_register.html:301
msgid "Lesson cancelled"
#: views.py:76
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
#: templates/alsijil/register_absence.html:5
#: templates/alsijil/register_absence.html:6
msgid "Manage absence"
#: views.py:90
msgid "You are not allowed to create a lesson documentation for a lesson in the future."
msgstr ""
#: templates/alsijil/week_view.html:6
msgid "Week view"
msgstr ""
#: templates/alsijil/week_view.html:21
msgid "Select"
msgstr ""
#: templates/alsijil/week_view.html:47
msgid "Period"
#: views.py:116
msgid "The lesson documentation has been saved."
msgstr ""
#: templates/alsijil/week_view.html:49
msgid "Teachers"
#: views.py:136
msgid "The personal notes have been saved."
msgstr ""
#: templates/alsijil/week_view.html:97
msgid "unexcused"
#: views.py:327
msgid "There is no current school term."
msgstr ""
#: templates/alsijil/week_view.html:100
msgid "Summed up tardiness"
#: views.py:463
msgid "The absence has been saved."
msgstr ""
#: templates/alsijil/week_view.html:122
msgid "No group selected"
#: views.py:488
msgid "The extra mark has been created."
msgstr ""
#: templates/alsijil/week_view.html:125
msgid ""
"\n"
" There are no lessons for the selected group, teacher, room or "
"time.\n"
" "
#: views.py:499
msgid "The extra mark has been saved."
msgstr ""
#: views.py:56
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
#: views.py:509
msgid "The extra mark has been deleted."
msgstr ""
#: views.py:68
msgid ""
"You are not allowed to create a lesson documentation for a lesson in the "
"future."
#: views.py:529
msgid "The excuse type has been created."
msgstr ""
#: views.py:306
msgid "The absence has been saved."
#: views.py:540
msgid "The excuse type has been saved."
msgstr ""
#: views.py:344
msgid "The filter has been saved"
#: views.py:550
msgid "The excuse type has been deleted."
msgstr ""
#: views.py:360
msgid "The filter has been deleted."
msgstr ""
#~ msgid "Description"
#~ msgstr "Descriptio"
aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
+ 353
− 165
View file @ 5143e011
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:20+0200\n"
"POT-Creation-Date: 2020-08-03 20:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,50 +17,60 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: forms.py:41
#: forms.py:25
msgid "Homework for the next lesson"
msgstr ""
#: forms.py:50 templates/alsijil/print/full_register.html:199
msgid "Group"
msgstr ""
#: forms.py:49 templates/alsijil/print/full_register.html:101
#: forms.py:56 templates/alsijil/print/full_register.html:170
#: templates/alsijil/print/full_register.html:201
msgid "Teacher"
msgstr ""
#: forms.py:57
msgid "Room"
#: forms.py:73
msgid "You can't select a group and a teacher both."
msgstr ""
#: forms.py:70
#: forms.py:101
msgid "Start date"
msgstr ""
#: forms.py:73
#: forms.py:102
msgid "End date"
msgstr ""
#: forms.py:75
#: forms.py:103
msgid "From period"
msgstr ""
#: forms.py:77 templates/alsijil/lesson.html:58
#: forms.py:105 templates/alsijil/class_register/lesson.html:163
msgid "Person"
msgstr ""
#: forms.py:79 templates/alsijil/lesson.html:59
#: templates/alsijil/print/full_register.html:223
#: templates/alsijil/week_view.html:96
#: forms.py:107 templates/alsijil/class_register/lesson.html:164
#: templates/alsijil/class_register/week_view.html:109
#: templates/alsijil/print/full_register.html:75
#: templates/alsijil/print/full_register.html:312
msgid "Absent"
msgstr ""
#: forms.py:80 templates/alsijil/lesson.html:61
#: forms.py:108 templates/alsijil/class_register/lesson.html:166
#: templates/alsijil/print/full_register.html:84
#: templates/alsijil/print/full_register.html:275
msgid "Excused"
msgstr ""
#: forms.py:81 templates/alsijil/lesson.html:62
#: templates/alsijil/print/full_register.html:225
#: forms.py:109 templates/alsijil/class_register/lesson.html:170
#: templates/alsijil/class_register/lesson.html:223
#: templates/alsijil/class_register/lesson.html:231
#: templates/alsijil/print/full_register.html:314
msgid "Remarks"
msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:16
#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
msgid "Class register"
msgstr ""
......@@ -76,306 +86,484 @@ msgstr ""
msgid "Register absence"
msgstr ""
#: menus.py:34
msgid "Personal note filters"
#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
#: templates/alsijil/excuse_type/list.html:9
msgid "Excuse types"
msgstr ""
#: menus.py:40 models.py:66 models.py:138
#: templates/alsijil/class_register/lesson.html:168
#: templates/alsijil/extra_mark/list.html:8
#: templates/alsijil/extra_mark/list.html:9
#: templates/alsijil/print/full_register.html:293
msgid "Extra marks"
msgstr ""
#: models.py:18 models.py:124
msgid "Short name"
msgstr ""
#: models.py:20 models.py:126
msgid "Name"
msgstr ""
#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
#: templates/alsijil/class_register/lesson.html:202
msgid "Excuse type"
msgstr ""
#: models.py:51 templates/alsijil/print/full_register.html:271
#: models.py:75
msgid "Personal note"
msgstr ""
#: models.py:76 templates/alsijil/class_register/lesson.html:64
#: templates/alsijil/class_register/lesson.html:156
#: templates/alsijil/class_register/week_view.html:104
msgid "Personal notes"
msgstr ""
#: models.py:99 templates/alsijil/class_register/week_view.html:56
#: templates/alsijil/print/full_register.html:371
msgid "Lesson topic"
msgstr ""
#: models.py:52 templates/alsijil/print/full_register.html:272
#: models.py:100 templates/alsijil/print/full_register.html:372
msgid "Homework"
msgstr ""
#: models.py:68
msgid "Identifier"
#: models.py:102
msgid "Group note"
msgstr ""
#: models.py:106 templates/alsijil/class_register/lesson.html:60
#: templates/alsijil/class_register/lesson.html:143
msgid "Lesson documentation"
msgstr ""
#: models.py:107
msgid "Lesson documentations"
msgstr ""
#: models.py:71 templates/alsijil/print/full_register.html:178
msgid "Description"
#: models.py:137
msgid "Extra mark"
msgstr ""
#: models.py:74
msgid "Match expression"
#: preferences.py:16
msgid "Block adding personal notes for cancelled lessons"
msgstr ""
#: tables.py:14
#: tables.py:16 tables.py:36
msgid "Edit"
msgstr ""
#: templates/alsijil/lesson.html:5
#: tables.py:22 tables.py:42
msgid "Delete"
msgstr ""
#: templates/alsijil/absences/register.html:5
#: templates/alsijil/absences/register.html:6
msgid "Manage absence"
msgstr ""
#: templates/alsijil/class_register/lesson.html:6
msgid "Lesson"
msgstr ""
#: templates/alsijil/lesson.html:34
msgid "Lesson documentation"
#: templates/alsijil/class_register/lesson.html:14
#: templates/alsijil/class_register/lesson.html:83
#, python-format
msgid "%(period)s. period"
msgstr ""
#: templates/alsijil/class_register/lesson.html:38
msgid "Previous lesson"
msgstr ""
#: templates/alsijil/class_register/lesson.html:46
msgid "Next lesson"
msgstr ""
#: templates/alsijil/lesson.html:43
#: templates/alsijil/class_register/lesson.html:68
#: templates/alsijil/class_register/lesson.html:249
msgid "Change history"
msgstr ""
#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
msgid "Personal notes"
#: templates/alsijil/class_register/lesson.html:82
msgid "Overview: Previous lesson"
msgstr ""
#: templates/alsijil/lesson.html:60
#: templates/alsijil/print/full_register.html:202
#: templates/alsijil/class_register/lesson.html:89
msgid "Lesson topic of previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:96
msgid "Homework for this lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:103
msgid "Group notes for previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:110
msgid "Absent persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:117
msgid "Late persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:165
#: templates/alsijil/print/full_register.html:287
msgid "Tardiness"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:5
#: templates/alsijil/manage_personal_note_filter.html:6
msgid "Manage personal note filter"
#: templates/alsijil/class_register/lesson.html:188
msgid "Tardiness (in m)"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:11
msgid "Delete filter"
#: templates/alsijil/class_register/week_view.html:6
msgid "Week view"
msgstr ""
#: templates/alsijil/personal_note_filters.html:7
#: templates/alsijil/personal_note_filters.html:8
msgid "List of all personal note filters"
#: templates/alsijil/class_register/week_view.html:27
msgid "Select"
msgstr ""
#: templates/alsijil/personal_note_filters.html:12
msgid "Add filter"
#: templates/alsijil/class_register/week_view.html:33
#, python-format
msgid "CW %(week)s: %(instance)s"
msgstr ""
#: templates/alsijil/print/full_register.html:22
#: templates/alsijil/print/full_register.html:54
msgid "Owners"
#: templates/alsijil/class_register/week_view.html:50
msgid "Period"
msgstr ""
#: templates/alsijil/class_register/week_view.html:52
msgid "Groups"
msgstr ""
#: templates/alsijil/class_register/week_view.html:54
#: templates/alsijil/print/full_register.html:169
#: templates/alsijil/print/full_register.html:200
msgid "Subject"
msgstr ""
#: templates/alsijil/class_register/week_view.html:55
msgid "Teachers"
msgstr ""
#: templates/alsijil/class_register/week_view.html:110
msgid "unexcused"
msgstr ""
#: templates/alsijil/class_register/week_view.html:113
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/class_register/week_view.html:142
msgid "No lessons available"
msgstr ""
#: templates/alsijil/class_register/week_view.html:145
msgid ""
"\n"
" There are no lessons for the selected group or teacher in this week.\n"
" "
msgstr ""
#: templates/alsijil/excuse_type/create.html:6
#: templates/alsijil/excuse_type/create.html:7
#: templates/alsijil/excuse_type/list.html:16
msgid "Create excuse type"
msgstr ""
#: templates/alsijil/excuse_type/edit.html:6
#: templates/alsijil/excuse_type/edit.html:7
msgid "Edit excuse type"
msgstr ""
#: templates/alsijil/excuse_type/warning.html:5
msgid ""
"\n"
" This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
" Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
" "
msgstr ""
#: templates/alsijil/extra_mark/create.html:6
#: templates/alsijil/extra_mark/create.html:7
#: templates/alsijil/extra_mark/list.html:14
msgid "Create extra mark"
msgstr ""
#: templates/alsijil/extra_mark/edit.html:6
#: templates/alsijil/extra_mark/edit.html:7
msgid "Edit extra mark"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:126
msgid "(e)"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:130
msgid "(u)"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:6
msgid "Data complete"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:12
#: templates/alsijil/print/full_register.html:406
msgid "Lesson cancelled"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:14
msgid "Missing data"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:16
msgid "Pending"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:18
msgid "Substitution"
msgstr ""
#: templates/alsijil/print/full_register.html:6
msgid "Class register:"
msgstr ""
#: templates/alsijil/print/full_register.html:26
#: templates/alsijil/print/full_register.html:59
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:30
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:34
#: templates/alsijil/print/full_register.html:38
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:41
#: templates/alsijil/print/full_register.html:45
msgid ""
"\n"
" Copies of the class register, both digital and as printout, "
"must\n"
" only be kept inside the school and/or on devices authorised by "
"the\n"
" school.\n"
" "
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:48
#: templates/alsijil/print/full_register.html:52
msgid ""
"\n"
" The owner of the group and the headteacher confirm the above, "
"as\n"
" well as the correctness of this printout.\n"
" "
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:55
#: templates/alsijil/print/full_register.html:62
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:61
#: templates/alsijil/print/full_register.html:69
msgid "Abbreviations"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "General"
msgstr ""
#: templates/alsijil/print/full_register.html:78
msgid "Late"
msgstr ""
#: templates/alsijil/print/full_register.html:81
#: templates/alsijil/print/full_register.html:283
msgid "Unexcused"
msgstr ""
#: templates/alsijil/print/full_register.html:89
msgid "Custom excuse types"
msgstr ""
#: templates/alsijil/print/full_register.html:101
msgid "Available extra marks"
msgstr ""
#: templates/alsijil/print/full_register.html:115
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:66
#: templates/alsijil/print/full_register.html:120
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:67
#: templates/alsijil/print/full_register.html:121
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:68
#: templates/alsijil/print/full_register.html:122
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
#: templates/alsijil/print/full_register.html:123
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:70
#: templates/alsijil/print/full_register.html:124
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:71
#: templates/alsijil/print/full_register.html:200
msgid "Absences"
#: templates/alsijil/print/full_register.html:125
msgid "(a)"
msgstr ""
#: templates/alsijil/print/full_register.html:72
#: templates/alsijil/print/full_register.html:201
msgid "Unexcused"
#: templates/alsijil/print/full_register.html:131
msgid "(b)"
msgstr ""
#: templates/alsijil/print/full_register.html:73
#: templates/alsijil/print/full_register.html:224
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:95
#: templates/alsijil/print/full_register.html:164
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:100
#: templates/alsijil/week_view.html:48
msgid "Subject"
msgstr ""
#: templates/alsijil/print/full_register.html:102
#: templates/alsijil/print/full_register.html:171
#: templates/alsijil/print/full_register.html:202
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:103
#: templates/alsijil/print/full_register.html:172
#: templates/alsijil/print/full_register.html:203
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:104
#: templates/alsijil/print/full_register.html:173
#: templates/alsijil/print/full_register.html:204
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:124
#: templates/alsijil/print/full_register.html:194
msgid "Teachers and lessons in child groups"
msgstr ""
#: templates/alsijil/print/full_register.html:227
msgid "Personal overview"
msgstr ""
#: templates/alsijil/print/full_register.html:126
#: templates/alsijil/print/full_register.html:229
msgid "Contact details"
msgstr ""
#: templates/alsijil/print/full_register.html:174
msgid "Statistics on remarks"
#: templates/alsijil/print/full_register.html:266
msgid "Absences and tardiness"
msgstr ""
#: templates/alsijil/print/full_register.html:179
msgid "Count"
#: templates/alsijil/print/full_register.html:269
msgid "Absences"
msgstr ""
#: templates/alsijil/print/full_register.html:196
msgid "Absences and tardiness"
#: templates/alsijil/print/full_register.html:274
msgid "thereof"
msgstr ""
#: templates/alsijil/print/full_register.html:215
#: templates/alsijil/print/full_register.html:304
msgid "Relevant personal notes"
msgstr ""
#: templates/alsijil/print/full_register.html:219
#: templates/alsijil/print/full_register.html:308
msgid "Date"
msgstr ""
#: templates/alsijil/print/full_register.html:220
#: templates/alsijil/print/full_register.html:268
#: templates/alsijil/print/full_register.html:309
#: templates/alsijil/print/full_register.html:369
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:221
#: templates/alsijil/print/full_register.html:269
#: templates/alsijil/print/full_register.html:310
#: templates/alsijil/print/full_register.html:370
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:222
#: templates/alsijil/print/full_register.html:274
#: templates/alsijil/print/full_register.html:311
#: templates/alsijil/print/full_register.html:374
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:240
msgid "Yes"
#: templates/alsijil/print/full_register.html:313
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:242
#: templates/alsijil/print/full_register.html:314
#: templates/alsijil/print/full_register.html:324
msgid "e"
#: templates/alsijil/print/full_register.html:330
msgid "Yes"
msgstr ""
#: templates/alsijil/print/full_register.html:262
msgid "Lesson documentation for calendar week"
#: templates/alsijil/print/full_register.html:335
#: templates/alsijil/print/full_register.html:424
#: templates/alsijil/print/full_register.html:439
msgid "e"
msgstr ""
#: templates/alsijil/print/full_register.html:270
msgid "Subs."
#: templates/alsijil/print/full_register.html:363
msgid "Lesson documentation for week"
msgstr ""
#: templates/alsijil/print/full_register.html:273
#: templates/alsijil/print/full_register.html:373
msgid "Notes"
msgstr ""
#: templates/alsijil/print/full_register.html:301
msgid "Lesson cancelled"
#: views.py:76
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
#: templates/alsijil/register_absence.html:5
#: templates/alsijil/register_absence.html:6
msgid "Manage absence"
#: views.py:90
msgid "You are not allowed to create a lesson documentation for a lesson in the future."
msgstr ""
#: templates/alsijil/week_view.html:6
msgid "Week view"
#: views.py:116
msgid "The lesson documentation has been saved."
msgstr ""
#: templates/alsijil/week_view.html:21
msgid "Select"
#: views.py:136
msgid "The personal notes have been saved."
msgstr ""
#: templates/alsijil/week_view.html:47
msgid "Period"
msgstr ""
#: templates/alsijil/week_view.html:49
msgid "Teachers"
msgstr ""
#: templates/alsijil/week_view.html:97
msgid "unexcused"
#: views.py:327
msgid "There is no current school term."
msgstr ""
#: templates/alsijil/week_view.html:100
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/week_view.html:122
msgid "No group selected"
#: views.py:463
msgid "The absence has been saved."
msgstr ""
#: templates/alsijil/week_view.html:125
msgid ""
"\n"
" There are no lessons for the selected group, teacher, room or "
"time.\n"
" "
#: views.py:488
msgid "The extra mark has been created."
msgstr ""
#: views.py:56
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
#: views.py:499
msgid "The extra mark has been saved."
msgstr ""
#: views.py:68
msgid ""
"You are not allowed to create a lesson documentation for a lesson in the "
"future."
#: views.py:509
msgid "The extra mark has been deleted."
msgstr ""
#: views.py:306
msgid "The absence has been saved."
#: views.py:529
msgid "The excuse type has been created."
msgstr ""
#: views.py:344
msgid "The filter has been saved"
#: views.py:540
msgid "The excuse type has been saved."
msgstr ""
#: views.py:360
msgid "The filter has been deleted."
#: views.py:550
msgid "The excuse type has been deleted."
msgstr ""
aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
+ 353
− 165
View file @ 5143e011
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:20+0200\n"
"POT-Creation-Date: 2020-08-03 20:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,50 +17,60 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: forms.py:41
#: forms.py:25
msgid "Homework for the next lesson"
msgstr ""
#: forms.py:50 templates/alsijil/print/full_register.html:199
msgid "Group"
msgstr ""
#: forms.py:49 templates/alsijil/print/full_register.html:101
#: forms.py:56 templates/alsijil/print/full_register.html:170
#: templates/alsijil/print/full_register.html:201
msgid "Teacher"
msgstr ""
#: forms.py:57
msgid "Room"
#: forms.py:73
msgid "You can't select a group and a teacher both."
msgstr ""
#: forms.py:70
#: forms.py:101
msgid "Start date"
msgstr ""
#: forms.py:73
#: forms.py:102
msgid "End date"
msgstr ""
#: forms.py:75
#: forms.py:103
msgid "From period"
msgstr ""
#: forms.py:77 templates/alsijil/lesson.html:58
#: forms.py:105 templates/alsijil/class_register/lesson.html:163
msgid "Person"
msgstr ""
#: forms.py:79 templates/alsijil/lesson.html:59
#: templates/alsijil/print/full_register.html:223
#: templates/alsijil/week_view.html:96
#: forms.py:107 templates/alsijil/class_register/lesson.html:164
#: templates/alsijil/class_register/week_view.html:109
#: templates/alsijil/print/full_register.html:75
#: templates/alsijil/print/full_register.html:312
msgid "Absent"
msgstr ""
#: forms.py:80 templates/alsijil/lesson.html:61
#: forms.py:108 templates/alsijil/class_register/lesson.html:166
#: templates/alsijil/print/full_register.html:84
#: templates/alsijil/print/full_register.html:275
msgid "Excused"
msgstr ""
#: forms.py:81 templates/alsijil/lesson.html:62
#: templates/alsijil/print/full_register.html:225
#: forms.py:109 templates/alsijil/class_register/lesson.html:170
#: templates/alsijil/class_register/lesson.html:223
#: templates/alsijil/class_register/lesson.html:231
#: templates/alsijil/print/full_register.html:314
msgid "Remarks"
msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:16
#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
msgid "Class register"
msgstr ""
......@@ -76,306 +86,484 @@ msgstr ""
msgid "Register absence"
msgstr ""
#: menus.py:34
msgid "Personal note filters"
#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
#: templates/alsijil/excuse_type/list.html:9
msgid "Excuse types"
msgstr ""
#: menus.py:40 models.py:66 models.py:138
#: templates/alsijil/class_register/lesson.html:168
#: templates/alsijil/extra_mark/list.html:8
#: templates/alsijil/extra_mark/list.html:9
#: templates/alsijil/print/full_register.html:293
msgid "Extra marks"
msgstr ""
#: models.py:18 models.py:124
msgid "Short name"
msgstr ""
#: models.py:20 models.py:126
msgid "Name"
msgstr ""
#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
#: templates/alsijil/class_register/lesson.html:202
msgid "Excuse type"
msgstr ""
#: models.py:51 templates/alsijil/print/full_register.html:271
#: models.py:75
msgid "Personal note"
msgstr ""
#: models.py:76 templates/alsijil/class_register/lesson.html:64
#: templates/alsijil/class_register/lesson.html:156
#: templates/alsijil/class_register/week_view.html:104
msgid "Personal notes"
msgstr ""
#: models.py:99 templates/alsijil/class_register/week_view.html:56
#: templates/alsijil/print/full_register.html:371
msgid "Lesson topic"
msgstr ""
#: models.py:52 templates/alsijil/print/full_register.html:272
#: models.py:100 templates/alsijil/print/full_register.html:372
msgid "Homework"
msgstr ""
#: models.py:68
msgid "Identifier"
#: models.py:102
msgid "Group note"
msgstr ""
#: models.py:106 templates/alsijil/class_register/lesson.html:60
#: templates/alsijil/class_register/lesson.html:143
msgid "Lesson documentation"
msgstr ""
#: models.py:107
msgid "Lesson documentations"
msgstr ""
#: models.py:71 templates/alsijil/print/full_register.html:178
msgid "Description"
#: models.py:137
msgid "Extra mark"
msgstr ""
#: models.py:74
msgid "Match expression"
#: preferences.py:16
msgid "Block adding personal notes for cancelled lessons"
msgstr ""
#: tables.py:14
#: tables.py:16 tables.py:36
msgid "Edit"
msgstr ""
#: templates/alsijil/lesson.html:5
#: tables.py:22 tables.py:42
msgid "Delete"
msgstr ""
#: templates/alsijil/absences/register.html:5
#: templates/alsijil/absences/register.html:6
msgid "Manage absence"
msgstr ""
#: templates/alsijil/class_register/lesson.html:6
msgid "Lesson"
msgstr ""
#: templates/alsijil/lesson.html:34
msgid "Lesson documentation"
#: templates/alsijil/class_register/lesson.html:14
#: templates/alsijil/class_register/lesson.html:83
#, python-format
msgid "%(period)s. period"
msgstr ""
#: templates/alsijil/class_register/lesson.html:38
msgid "Previous lesson"
msgstr ""
#: templates/alsijil/class_register/lesson.html:46
msgid "Next lesson"
msgstr ""
#: templates/alsijil/lesson.html:43
#: templates/alsijil/class_register/lesson.html:68
#: templates/alsijil/class_register/lesson.html:249
msgid "Change history"
msgstr ""
#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
msgid "Personal notes"
#: templates/alsijil/class_register/lesson.html:82
msgid "Overview: Previous lesson"
msgstr ""
#: templates/alsijil/lesson.html:60
#: templates/alsijil/print/full_register.html:202
#: templates/alsijil/class_register/lesson.html:89
msgid "Lesson topic of previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:96
msgid "Homework for this lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:103
msgid "Group notes for previous lesson:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:110
msgid "Absent persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:117
msgid "Late persons:"
msgstr ""
#: templates/alsijil/class_register/lesson.html:165
#: templates/alsijil/print/full_register.html:287
msgid "Tardiness"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:5
#: templates/alsijil/manage_personal_note_filter.html:6
msgid "Manage personal note filter"
#: templates/alsijil/class_register/lesson.html:188
msgid "Tardiness (in m)"
msgstr ""
#: templates/alsijil/manage_personal_note_filter.html:11
msgid "Delete filter"
#: templates/alsijil/class_register/week_view.html:6
msgid "Week view"
msgstr ""
#: templates/alsijil/personal_note_filters.html:7
#: templates/alsijil/personal_note_filters.html:8
msgid "List of all personal note filters"
#: templates/alsijil/class_register/week_view.html:27
msgid "Select"
msgstr ""
#: templates/alsijil/personal_note_filters.html:12
msgid "Add filter"
#: templates/alsijil/class_register/week_view.html:33
#, python-format
msgid "CW %(week)s: %(instance)s"
msgstr ""
#: templates/alsijil/print/full_register.html:22
#: templates/alsijil/print/full_register.html:54
msgid "Owners"
#: templates/alsijil/class_register/week_view.html:50
msgid "Period"
msgstr ""
#: templates/alsijil/class_register/week_view.html:52
msgid "Groups"
msgstr ""
#: templates/alsijil/class_register/week_view.html:54
#: templates/alsijil/print/full_register.html:169
#: templates/alsijil/print/full_register.html:200
msgid "Subject"
msgstr ""
#: templates/alsijil/class_register/week_view.html:55
msgid "Teachers"
msgstr ""
#: templates/alsijil/class_register/week_view.html:110
msgid "unexcused"
msgstr ""
#: templates/alsijil/class_register/week_view.html:113
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/class_register/week_view.html:142
msgid "No lessons available"
msgstr ""
#: templates/alsijil/class_register/week_view.html:145
msgid ""
"\n"
" There are no lessons for the selected group or teacher in this week.\n"
" "
msgstr ""
#: templates/alsijil/excuse_type/create.html:6
#: templates/alsijil/excuse_type/create.html:7
#: templates/alsijil/excuse_type/list.html:16
msgid "Create excuse type"
msgstr ""
#: templates/alsijil/excuse_type/edit.html:6
#: templates/alsijil/excuse_type/edit.html:7
msgid "Edit excuse type"
msgstr ""
#: templates/alsijil/excuse_type/warning.html:5
msgid ""
"\n"
" This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
" Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
" "
msgstr ""
#: templates/alsijil/extra_mark/create.html:6
#: templates/alsijil/extra_mark/create.html:7
#: templates/alsijil/extra_mark/list.html:14
msgid "Create extra mark"
msgstr ""
#: templates/alsijil/extra_mark/edit.html:6
#: templates/alsijil/extra_mark/edit.html:7
msgid "Edit extra mark"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:126
msgid "(e)"
msgstr ""
#: templates/alsijil/partials/absences.html:4
#: templates/alsijil/print/full_register.html:130
msgid "(u)"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:6
msgid "Data complete"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:12
#: templates/alsijil/print/full_register.html:406
msgid "Lesson cancelled"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:14
msgid "Missing data"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:16
msgid "Pending"
msgstr ""
#: templates/alsijil/partials/lesson_status_icon.html:18
msgid "Substitution"
msgstr ""
#: templates/alsijil/print/full_register.html:6
msgid "Class register:"
msgstr ""
#: templates/alsijil/print/full_register.html:26
#: templates/alsijil/print/full_register.html:59
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:30
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:34
#: templates/alsijil/print/full_register.html:38
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:41
#: templates/alsijil/print/full_register.html:45
msgid ""
"\n"
" Copies of the class register, both digital and as printout, "
"must\n"
" only be kept inside the school and/or on devices authorised by "
"the\n"
" school.\n"
" "
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:48
#: templates/alsijil/print/full_register.html:52
msgid ""
"\n"
" The owner of the group and the headteacher confirm the above, "
"as\n"
" well as the correctness of this printout.\n"
" "
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:55
#: templates/alsijil/print/full_register.html:62
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:61
#: templates/alsijil/print/full_register.html:69
msgid "Abbreviations"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "General"
msgstr ""
#: templates/alsijil/print/full_register.html:78
msgid "Late"
msgstr ""
#: templates/alsijil/print/full_register.html:81
#: templates/alsijil/print/full_register.html:283
msgid "Unexcused"
msgstr ""
#: templates/alsijil/print/full_register.html:89
msgid "Custom excuse types"
msgstr ""
#: templates/alsijil/print/full_register.html:101
msgid "Available extra marks"
msgstr ""
#: templates/alsijil/print/full_register.html:115
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:66
#: templates/alsijil/print/full_register.html:120
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:67
#: templates/alsijil/print/full_register.html:121
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:68
#: templates/alsijil/print/full_register.html:122
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
#: templates/alsijil/print/full_register.html:123
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:70
#: templates/alsijil/print/full_register.html:124
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:71
#: templates/alsijil/print/full_register.html:200
msgid "Absences"
#: templates/alsijil/print/full_register.html:125
msgid "(a)"
msgstr ""
#: templates/alsijil/print/full_register.html:72
#: templates/alsijil/print/full_register.html:201
msgid "Unexcused"
#: templates/alsijil/print/full_register.html:131
msgid "(b)"
msgstr ""
#: templates/alsijil/print/full_register.html:73
#: templates/alsijil/print/full_register.html:224
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:95
#: templates/alsijil/print/full_register.html:164
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:100
#: templates/alsijil/week_view.html:48
msgid "Subject"
msgstr ""
#: templates/alsijil/print/full_register.html:102
#: templates/alsijil/print/full_register.html:171
#: templates/alsijil/print/full_register.html:202
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:103
#: templates/alsijil/print/full_register.html:172
#: templates/alsijil/print/full_register.html:203
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:104
#: templates/alsijil/print/full_register.html:173
#: templates/alsijil/print/full_register.html:204
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:124
#: templates/alsijil/print/full_register.html:194
msgid "Teachers and lessons in child groups"
msgstr ""
#: templates/alsijil/print/full_register.html:227
msgid "Personal overview"
msgstr ""
#: templates/alsijil/print/full_register.html:126
#: templates/alsijil/print/full_register.html:229
msgid "Contact details"
msgstr ""
#: templates/alsijil/print/full_register.html:174
msgid "Statistics on remarks"
#: templates/alsijil/print/full_register.html:266
msgid "Absences and tardiness"
msgstr ""
#: templates/alsijil/print/full_register.html:179
msgid "Count"
#: templates/alsijil/print/full_register.html:269
msgid "Absences"
msgstr ""
#: templates/alsijil/print/full_register.html:196
msgid "Absences and tardiness"
#: templates/alsijil/print/full_register.html:274
msgid "thereof"
msgstr ""
#: templates/alsijil/print/full_register.html:215
#: templates/alsijil/print/full_register.html:304
msgid "Relevant personal notes"
msgstr ""
#: templates/alsijil/print/full_register.html:219
#: templates/alsijil/print/full_register.html:308
msgid "Date"
msgstr ""
#: templates/alsijil/print/full_register.html:220
#: templates/alsijil/print/full_register.html:268
#: templates/alsijil/print/full_register.html:309
#: templates/alsijil/print/full_register.html:369
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:221
#: templates/alsijil/print/full_register.html:269
#: templates/alsijil/print/full_register.html:310
#: templates/alsijil/print/full_register.html:370
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:222
#: templates/alsijil/print/full_register.html:274
#: templates/alsijil/print/full_register.html:311
#: templates/alsijil/print/full_register.html:374
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:240
msgid "Yes"
#: templates/alsijil/print/full_register.html:313
msgid "Tard."
msgstr ""
#: templates/alsijil/print/full_register.html:242
#: templates/alsijil/print/full_register.html:314
#: templates/alsijil/print/full_register.html:324
msgid "e"
#: templates/alsijil/print/full_register.html:330
msgid "Yes"
msgstr ""
#: templates/alsijil/print/full_register.html:262
msgid "Lesson documentation for calendar week"
#: templates/alsijil/print/full_register.html:335
#: templates/alsijil/print/full_register.html:424
#: templates/alsijil/print/full_register.html:439
msgid "e"
msgstr ""
#: templates/alsijil/print/full_register.html:270
msgid "Subs."
#: templates/alsijil/print/full_register.html:363
msgid "Lesson documentation for week"
msgstr ""
#: templates/alsijil/print/full_register.html:273
#: templates/alsijil/print/full_register.html:373
msgid "Notes"
msgstr ""
#: templates/alsijil/print/full_register.html:301
msgid "Lesson cancelled"
#: views.py:76
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
#: templates/alsijil/register_absence.html:5
#: templates/alsijil/register_absence.html:6
msgid "Manage absence"
#: views.py:90
msgid "You are not allowed to create a lesson documentation for a lesson in the future."
msgstr ""
#: templates/alsijil/week_view.html:6
msgid "Week view"
#: views.py:116
msgid "The lesson documentation has been saved."
msgstr ""
#: templates/alsijil/week_view.html:21
msgid "Select"
#: views.py:136
msgid "The personal notes have been saved."
msgstr ""
#: templates/alsijil/week_view.html:47
msgid "Period"
msgstr ""
#: templates/alsijil/week_view.html:49
msgid "Teachers"
msgstr ""
#: templates/alsijil/week_view.html:97
msgid "unexcused"
#: views.py:327
msgid "There is no current school term."
msgstr ""
#: templates/alsijil/week_view.html:100
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/week_view.html:122
msgid "No group selected"
#: views.py:463
msgid "The absence has been saved."
msgstr ""
#: templates/alsijil/week_view.html:125
msgid ""
"\n"
" There are no lessons for the selected group, teacher, room or "
"time.\n"
" "
#: views.py:488
msgid "The extra mark has been created."
msgstr ""
#: views.py:56
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
#: views.py:499
msgid "The extra mark has been saved."
msgstr ""
#: views.py:68
msgid ""
"You are not allowed to create a lesson documentation for a lesson in the "
"future."
#: views.py:509
msgid "The extra mark has been deleted."
msgstr ""
#: views.py:306
msgid "The absence has been saved."
#: views.py:529
msgid "The excuse type has been created."
msgstr ""
#: views.py:344
msgid "The filter has been saved"
#: views.py:540
msgid "The excuse type has been saved."
msgstr ""
#: views.py:360
msgid "The filter has been deleted."
#: views.py:550
msgid "The excuse type has been deleted."
msgstr ""
aleksis/apps/alsijil/menus.py
+ 6
− 11
View file @ 5143e011
......@@ -45,17 +45,6 @@ MENUS = {
),
],
},
{
"name": _("Personal note filters"),
"url": "list_personal_note_filters",
"icon": "filter_list",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
"alsijil.view_personal_note_filters",
),
],
},
{
"name": _("Excuse types"),
"url": "excuse_types",
......@@ -67,6 +56,12 @@ MENUS = {
),
],
},
{
"name": _("Extra marks"),
"url": "extra_marks",
"icon": "label",
"validators": ["menu_generator.validators.is_superuser"],
},
],
}
]
......
aleksis/apps/alsijil/migrations/0003_extra_mark.py 0 → 100644
+ 72
− 0
View file @ 5143e011
# Generated by Django 3.0.8 on 2020-07-12 12:43
import django.contrib.postgres.fields.jsonb
import django.contrib.sites.managers
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("sites", "0002_alter_domain_unique"),
("alsijil", "0002_excuse_type"),
]
operations = [
migrations.CreateModel(
name="ExtraMark",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
default=dict, editable=False
),
),
(
"short_name",
models.CharField(
max_length=255, unique=True, verbose_name="Short name"
),
),
(
"name",
models.CharField(max_length=255, unique=True, verbose_name="Name"),
),
(
"site",
models.ForeignKey(
default=1,
editable=False,
on_delete=django.db.models.deletion.CASCADE,
to="sites.Site",
),
),
],
options={
"verbose_name": "Extra mark",
"verbose_name_plural": "Extra marks",
"ordering": ["short_name"],
},
managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
),
migrations.AddField(
model_name="personalnote",
name="extra_marks",
field=models.ManyToManyField(
blank=True,
null=True,
to="alsijil.ExtraMark",
verbose_name="Extra marks",
),
),
]
aleksis/apps/alsijil/migrations/0003_group_notes.py → aleksis/apps/alsijil/migrations/0004_group_notes.py
+ 20
− 0
View file @ 5143e011
......@@ -6,13 +6,15 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('alsijil', '0002_excuse_type'),
("alsijil", "0003_extra_mark"),
]
operations = [
migrations.AddField(
model_name='lessondocumentation',
name='group_note',
field=models.CharField(blank=True, max_length=200, verbose_name='Group note'),
model_name="lessondocumentation",
name="group_note",
field=models.CharField(
blank=True, max_length=200, verbose_name="Group note"
),
),
]
aleksis/apps/alsijil/migrations/0005_groups_of_person.py 0 → 100644
+ 33
− 0
View file @ 5143e011
# Generated by Django 3.0.8 on 2020-07-22 17:29
from django.db import migrations, models
def add_groups(apps, schema_editor):
PersonalNote = apps.get_model("alsijil", "PersonalNote")
db_alias = schema_editor.connection.alias
for personal_note in PersonalNote.objects.using(db_alias).all():
groups = list(personal_note.person.member_of.using(db_alias).all())
personal_note.groups_of_person.set(groups)
personal_note.save()
class Migration(migrations.Migration):
dependencies = [
("core", "0003_drop_image_cropping"),
("alsijil", "0004_group_notes"),
]
operations = [
migrations.AddField(
model_name="personalnote",
name="groups_of_person",
field=models.ManyToManyField(
related_name="_personalnote_groups_of_person_+", to="core.Group"
),
),
migrations.RunPython(add_groups),
]
aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py 0 → 100644
+ 14
− 0
View file @ 5143e011
# Generated by Django 3.0.8 on 2020-07-18 15:23
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("alsijil", "0005_groups_of_person"),
]
operations = [
migrations.DeleteModel(name="PersonalNoteFilter",),
]
aleksis/apps/alsijil/model_extensions.py
+ 19
− 2
View file @ 5143e011
from datetime import date
from typing import Optional, Union
from typing import Dict, Optional, Union
from django.db.models import Exists, OuterRef, QuerySet
from django.utils.translation import gettext as _
......@@ -9,7 +9,7 @@ from calendarweek import CalendarWeek
from aleksis.apps.chronos.models import LessonPeriod
from aleksis.core.models import Group, Person
from .models import ExcuseType, LessonDocumentation, PersonalNote
from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote
@Person.method
......@@ -182,3 +182,20 @@ def get_tardinesses(self, week: Optional[CalendarWeek] = None) -> QuerySet:
if not week:
week = self.week
return self.personal_notes.filter(week=week.week, late__gt=0)
@LessonPeriod.method
def get_extra_marks(
self, week: Optional[CalendarWeek] = None
) -> Dict[ExtraMark, QuerySet]:
"""Get all statistics on extra marks for this lesson."""
if not week:
week = self.week
stats = {}
for extra_mark in ExtraMark.objects.all():
qs = self.personal_notes.filter(week=week.week, extra_marks=extra_mark)
if qs:
stats[extra_mark] = qs
return stats
aleksis/apps/alsijil/models.py
+ 25
− 17
View file @ 5143e011
......@@ -42,6 +42,7 @@ class PersonalNote(ExtensibleModel):
person = models.ForeignKey(
"core.Person", models.CASCADE, related_name="personal_notes"
)
groups_of_person = models.ManyToManyField("core.Group", related_name="+")
week = models.IntegerField()
lesson_period = models.ForeignKey(
......@@ -61,6 +62,10 @@ class PersonalNote(ExtensibleModel):
remarks = models.CharField(max_length=200, blank=True)
extra_marks = models.ManyToManyField(
"ExtraMark", null=True, blank=True, verbose_name=_("Extra marks")
)
def save(self, *args, **kwargs):
if self.excuse_type:
self.excused = True
......@@ -93,7 +98,9 @@ class LessonDocumentation(ExtensibleModel):
topic = models.CharField(verbose_name=_("Lesson topic"), max_length=200, blank=True)
homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True)
group_note = models.CharField(verbose_name=_("Group note"), max_length=200, blank=True)
group_note = models.CharField(
verbose_name=_("Group note"), max_length=200, blank=True
)
class Meta:
verbose_name = _("Lesson documentation")
......@@ -107,27 +114,28 @@ class LessonDocumentation(ExtensibleModel):
]
class PersonalNoteFilter(ExtensibleModel):
"""A filter definition that can generate statistics on personal note texts."""
class ExtraMark(ExtensibleModel):
"""A model for extra marks.
identifier = models.CharField(
verbose_name=_("Identifier"),
max_length=30,
validators=[isidentifier],
unique=True,
)
description = models.CharField(
verbose_name=_("Description"), max_length=60, blank=True, unique=True
)
Can be used for lesson-based counting of things (like forgotten homework).
"""
regex = models.CharField(
verbose_name=_("Match expression"), max_length=100, unique=True
short_name = models.CharField(
max_length=255, unique=True, verbose_name=_("Short name")
)
name = models.CharField(max_length=255, unique=True, verbose_name=_("Name"))
def __str__(self):
return f"{self.name}"
@property
def count_label(self):
return f"{self.short_name}_count"
class Meta:
verbose_name = _("Personal note filter")
verbose_name_plural = _("Personal note filters")
ordering = ["identifier"]
ordering = ["short_name"]
verbose_name = _("Extra mark")
verbose_name_plural = _("Extra marks")
class AlsijilGlobalPermissions(ExtensibleModel):
......
aleksis/apps/alsijil/preferences.py 0 → 100644
+ 16
− 0
View file @ 5143e011
from django.utils.translation import gettext as _
from dynamic_preferences.preferences import Section
from dynamic_preferences.types import BooleanPreference
from aleksis.core.registries import site_preferences_registry
alsijil = Section("alsijil", verbose_name=_("Class register"))
@site_preferences_registry.register
class BlockPersonalNotesForCancelled(BooleanPreference):
section = alsijil
name = "block_personal_notes_for_cancelled"
default = True
verbose_name = _("Block adding personal notes for cancelled lessons")
aleksis/apps/alsijil/static/css/alsijil/lesson.css
+ 8
− 0
View file @ 5143e011
.alsijil-check-box {
margin-right: 10px;
}
.alsijil-check-box [type="checkbox"] {
padding-left: 30px;
}
.alsijil-lesson-cancelled {
text-decoration: line-through;
}
......
aleksis/apps/alsijil/tables.py
+ 12
− 7
View file @ 5143e011
......@@ -4,18 +4,23 @@ import django_tables2 as tables
from django_tables2.utils import A
class PersonalNoteFilterTable(tables.Table):
class ExtraMarkTable(tables.Table):
class Meta:
attrs = {"class": "highlight"}
identifier = tables.Column()
description = tables.Column()
regex = tables.Column()
edit_filter = tables.LinkColumn(
"edit_personal_note_filter",
name = tables.LinkColumn("edit_extra_mark", args=[A("id")])
short_name = tables.Column()
edit = tables.LinkColumn(
"edit_extra_mark",
args=[A("id")],
text=_("Edit"),
attrs={"a": {"class": "btn-flat waves-effect waves-orange"}},
attrs={"a": {"class": "btn-flat waves-effect waves-orange orange-text"}},
)
delete = tables.LinkColumn(
"delete_extra_mark",
args=[A("id")],
text=_("Delete"),
attrs={"a": {"class": "btn-flat waves-effect waves-red red-text"}},
)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment