From 926edacd98134aadcfd1367955af16865b0d7906 Mon Sep 17 00:00:00 2001 From: ftsell Date: Thu, 11 Jan 2024 21:42:56 +0100 Subject: [PATCH 01/14] use display_name in group mail moderation notification --- .../templates/mailinglist/moderated_mail_admin.mail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mafiasi/mailinglist/templates/mailinglist/moderated_mail_admin.mail b/mafiasi/mailinglist/templates/mailinglist/moderated_mail_admin.mail index 0926e068..4860f7f4 100644 --- a/mafiasi/mailinglist/templates/mailinglist/moderated_mail_admin.mail +++ b/mafiasi/mailinglist/templates/mailinglist/moderated_mail_admin.mail @@ -1,6 +1,6 @@ {% autoescape off %}(english below) -Hallo {{ user.first_name}}, +Hallo {{ user.display_name }}, es gibt für die Mailingliste der Gruppe {{ mailinglist.group.name }} eine neue E-Mail zu moderieren. @@ -8,7 +8,7 @@ Kthxbye! ---- -Hi {{ user.first_name}}, +Hi {{ user.display_name }}, there is a new email to be moderated for the mailinglist of the group {{ mailinglist.group.name }}. From 46d2134219bc27c5539b115d99df0040d671d71f Mon Sep 17 00:00:00 2001 From: ftsell Date: Fri, 12 Jan 2024 16:46:33 +0100 Subject: [PATCH 02/14] use trimmed blocktrans template tags This makes the translation files better to work with since all formatting is now ignored. --- mafiasi/base/templates/500.html | 2 +- mafiasi/gprot/templates/gprot/create.html | 4 ++-- mafiasi/gprot/templates/gprot/delete.html | 2 +- .../gprot/templates/gprot/edit_metadata.html | 2 +- mafiasi/gprot/templates/gprot/forget.html | 2 +- mafiasi/gprot/templates/gprot/index.html | 2 +- .../gprot/templates/gprot/notifications.html | 2 +- mafiasi/gprot/templates/gprot/publish.html | 6 +++--- mafiasi/gprot/templates/gprot/reminders.html | 2 +- mafiasi/gprot/templates/gprot/view.html | 8 +++++--- .../groups/templates/groups/groups_base.html | 2 +- .../templates/registration/account.html | 6 ++++-- .../templates/registration/request_account.html | 17 ++++++++++++----- 13 files changed, 34 insertions(+), 23 deletions(-) diff --git a/mafiasi/base/templates/500.html b/mafiasi/base/templates/500.html index 551d7a28..7f032dfb 100644 --- a/mafiasi/base/templates/500.html +++ b/mafiasi/base/templates/500.html @@ -7,7 +7,7 @@ {% block content %} {% url 'base_problems' as problems_url %}

- {% blocktrans %} + {% blocktrans trimmed %} We're sorry, but we didn't expect this to happen. Our error reporting tool should have sent an email to us with some technical details. Please try again later. diff --git a/mafiasi/gprot/templates/gprot/create.html b/mafiasi/gprot/templates/gprot/create.html index 7fef585a..537b9c49 100644 --- a/mafiasi/gprot/templates/gprot/create.html +++ b/mafiasi/gprot/templates/gprot/create.html @@ -12,7 +12,7 @@ {% block content %}

- {% blocktrans %} + {% blocktrans trimmed %} This page needs javascript in order to function correctly. Please activate it before you proceed. {% endblocktrans %} @@ -20,7 +20,7 @@
- {% blocktrans %} + {% blocktrans trimmed %} Please take care to only upload memory minutes. This is not the place for photos of exams or similar. {% endblocktrans %}
diff --git a/mafiasi/gprot/templates/gprot/delete.html b/mafiasi/gprot/templates/gprot/delete.html index bc0eef78..2eb05eeb 100644 --- a/mafiasi/gprot/templates/gprot/delete.html +++ b/mafiasi/gprot/templates/gprot/delete.html @@ -28,7 +28,7 @@
-{% blocktrans %} +{% blocktrans trimmed %} Do you really want to delete these memory minutes? {% endblocktrans %}
diff --git a/mafiasi/gprot/templates/gprot/edit_metadata.html b/mafiasi/gprot/templates/gprot/edit_metadata.html index 9619b960..d36a8ebb 100644 --- a/mafiasi/gprot/templates/gprot/edit_metadata.html +++ b/mafiasi/gprot/templates/gprot/edit_metadata.html @@ -14,7 +14,7 @@ {% block content %}