Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions amelie/personal_tab/templates/lists/payment_transactions.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
{% trans 'Direct debit' %}
{% elif transaction|get_class == "ReversalTransaction" %}
{% trans 'Reversal of direct debit' %}
{% elif transaction|get_class == "ExtraManualPaymentTransaction" %}
{% elif transaction|get_class == "SettlementExtraBalanceTransaction" %}
{{ transaction.settlement.manualpaymentsettlement.payment_method.name|default:_("Unknown") }}
{% elif transaction|get_class == "ManualPaymentSettlementTransaction" %}
{% elif transaction|get_class == "SettlementManualPaymentTransaction" %}
{{ transaction.settlement.manualpaymentsettlement.payment_method.name|default:_("Unknown") }}
{% else %}
{% trans 'Unknown' %}
Expand Down
Binary file modified locale/nl/LC_MESSAGES/django.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions locale/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-08-20 12:13+0200\n"
"PO-Revision-Date: 2026-08-20 10:17+0000\n"
"PO-Revision-Date: 2026-08-24 10:29+0000\n"
"Last-Translator: Kevin Alberts <albertskja@inter-actief.net>\n"
"Language-Team: Dutch <https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/>\n"
"Language: nl\n"
Expand Down Expand Up @@ -10971,7 +10971,7 @@ msgstr "Er zijn geen rfid-kaarten geregistreerd."
#: amelie/members/templates/registration_status.html:5
#: amelie/members/templates/registration_status.html:11
msgid "Enrollment status"
msgstr "inschrijvingsstatus"
msgstr "Inschrijvingsstatus"

#: amelie/members/templates/registration_status.html:14
msgid "These are the new members this association year, per do-group. These memberships are already activated."
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ dependencies = [
"Django>=5.2.8,<5.3",
"importlib-metadata>=1.4.0,<10.0",
"celery>=5.6.0,<5.7",
"flower>=2.0.1,<2.1",
"flower>=2.0.1,<2.2",
"django-celery-results>=2.6,<2.7",

"django-compressor>=4.1,<4.7",
"django-localflavor>=5.0,<5.1",
"django-localflavor>=5.0,<5.2",
"django-extensions>=3.2.1,<4.2",
"django-formtools>=2.4,<2.8",
"django-betterforms>=3.0.0,<3.1",
"django-auditlog>=3.4.1,<3.5",
"django-oauth-toolkit>=1.7.1,<3.4",
"django-oauth-toolkit>=1.7.1,<3.5",
"django-cors-headers>=3.13.0,<4.10",
"django-colorfield",
"django-environ>=0.13.0,<0.15",
Expand Down Expand Up @@ -66,7 +66,7 @@ dependencies = [

# Other random dependencies, to be documented, see issue #556
"httplib2>=0.20.4,<0.33",
"icalendar>=7.0.3,<7.3",
"icalendar>=7.0.3,<7.4",
"Markdown>=3.10.2,<3.11",
"mysqlclient>=2.2.8",

Expand Down
2 changes: 1 addition & 1 deletion templates/basis.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}css/lustrum-matrix.css" />
{% endif %}

{% if request.person.is_candidate_board %}
{% if request.person.is_candidate_board and not request.person.is_board %}
{% compress css %}
{% now "H:i" as t %}
{% if t <= "06:00" %}
Expand Down
Loading