From 43ba02b001b336eb4206d93b0e8167dd0fed6d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastiaan=20Versteeg?= Date: Mon, 9 Mar 2020 22:37:09 +0100 Subject: [PATCH] Fix merchandise app translations usage --- website/merchandise/locale/nl/LC_MESSAGES/django.po | 8 ++++---- website/merchandise/templates/merchandise/index.html | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/website/merchandise/locale/nl/LC_MESSAGES/django.po b/website/merchandise/locale/nl/LC_MESSAGES/django.po index d5d42bfc..30c3f08c 100644 --- a/website/merchandise/locale/nl/LC_MESSAGES/django.po +++ b/website/merchandise/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-11 20:07+0200\n" +"POT-Creation-Date: 2020-03-09 22:36+0100\n" "PO-Revision-Date: 2018-02-12 13:45+0100\n" "Last-Translator: Sébastiaan Versteeg \n" "Language-Team: \n" @@ -18,11 +18,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" -#: merchandise/apps.py merchandise/templates/merchandise/index.html +#: apps.py templates/merchandise/index.html msgid "Merchandise" msgstr "Merchandise" -#: merchandise/templates/merchandise/index.html +#: templates/merchandise/index.html msgid "" "Below you can find all the merchandise Thalia has available. During every " "lunch break, the merchandise is for sale in the board room (M1.0.08). " @@ -33,7 +33,7 @@ msgstr "" "zijn de spullen te koop bij de bestuurskamer (M1.0.08), daarbuiten zijn ze " "op afspraak te verkrijgen of tijdens borrels bij het bestuur." -#: merchandise/templates/merchandise/index.html +#: templates/merchandise/index.html #, python-format msgid "Price: € %(price)s" msgstr "Prijs: € %(price)s" diff --git a/website/merchandise/templates/merchandise/index.html b/website/merchandise/templates/merchandise/index.html index a94d889a..ec2ebd86 100644 --- a/website/merchandise/templates/merchandise/index.html +++ b/website/merchandise/templates/merchandise/index.html @@ -21,8 +21,11 @@

{{ item.name }}

{{ item.description }}

-

{% blocktrans with price=item.price %}Price: € - {{ price }}{% endblocktrans %}

+

+ {% blocktrans trimmed with price=item.price %} + Price: € {{ price }} + {% endblocktrans %} +

{% endfor %} -- GitLab