Skip to content
Snippets Groups Projects
Commit 94f525d9 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '190-fix-translations-in-person-overview' into 'master'

Resolve "Fix translations in person overview"

Closes #190

See merge request !232
parents b0f06ae4 4cfc5de4
No related branches found
No related tags found
1 merge request!232Resolve "Fix translations in person overview"
Pipeline #32865 failed
......@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* Translate table columns and filter button on person overview page.
`2.0rc6`_ - 2021-08-25
----------------------
......
......@@ -105,10 +105,10 @@ class PersonalNoteTable(tables.Table):
order_by=A("order_teachers"),
)
subject = tables.Column(verbose_name=_("Subject"), accessor=A("subject"))
absent = tables.Column()
late = tables.Column()
absent = tables.Column(verbose_name=_("Absent"))
late = tables.Column(verbose_name=_("Tardiness"))
excused = tables.Column(verbose_name=_("Excuse"))
extra_marks = tables.Column(verbose_name="Extra marks", accessor=A("extra_marks__all"))
extra_marks = tables.Column(verbose_name=_("Extra marks"), accessor=A("extra_marks__all"))
def render_groups(self, value, record):
if isinstance(record.register_object, LessonPeriod):
......@@ -126,7 +126,7 @@ class PersonalNoteTable(tables.Table):
return (
render_to_string(
"components/materialize-chips.html",
dict(content="Absent", classes="red white-text"),
dict(content=_("Absent"), classes="red white-text"),
)
if value
else ""
......
......@@ -88,7 +88,7 @@
{% if can_mark_all_as_excused %} medium-high-right {% endif %}"
data-target="filter-modal"
type="button">
Filter results ({{ num_filters }})<i class="material-icons right">filter_alt</i>
{% trans "Filter results" %} ({{ num_filters }})<i class="material-icons right">filter_alt</i>
</button>
</div>
<form action="" method="post" class="">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment