From e62dfedf4aa7412da5d646bcb51699d36f0aeae5 Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Fri, 6 Nov 2020 19:53:22 +0100
Subject: [PATCH] Unify wording: 'Present AK (results) (in the final plenum)'
---
AKModel/locale/de_DE/LC_MESSAGES/django.po | 6 +++---
AKModel/models.py | 2 +-
AKSubmission/locale/de_DE/LC_MESSAGES/django.po | 8 ++++----
AKSubmission/templates/AKSubmission/ak_history.html | 2 +-
AKSubmission/templates/AKSubmission/ak_table.html | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po
index cb539c5b..b3f4316f 100644
--- a/AKModel/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po
@@ -399,11 +399,11 @@ msgstr "Beabsichtigt eine Resolution einzureichen"
#: AKModel/models.py:215
msgid "Present this AK"
-msgstr "AK Präsentieren"
+msgstr "AK präsentieren"
#: AKModel/models.py:216
-msgid "Present results of this AK"
-msgstr "Die Ergebnisse dieses AKs vorstellen"
+msgid "Present results of this AK in the final plenum"
+msgstr "Die Ergebnisse dieses AKs im Abschlussplenum vorstellen"
#: AKModel/models.py:218 AKModel/templates/admin/AKModel/status.html:83
msgid "Requirements"
diff --git a/AKModel/models.py b/AKModel/models.py
index e581f00d..f4925eda 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -213,7 +213,7 @@ class AK(models.Model):
reso = models.BooleanField(verbose_name=_('Resolution Intention'), default=False,
help_text=_('Intends to submit a resolution'))
present = models.BooleanField(verbose_name=_("Present this AK"), null=True,
- help_text=_("Present results of this AK"))
+ help_text=_("Present results of this AK in the final plenum"))
requirements = models.ManyToManyField(to=AKRequirement, blank=True, verbose_name=_('Requirements'),
help_text=_("AK's Requirements"))
diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
index 0588fd07..f675b80d 100644
--- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
@@ -177,8 +177,8 @@ msgid "Track"
msgstr "Track"
#: AKSubmission/templates/AKSubmission/ak_detail.html:114
-msgid "Present this AK"
-msgstr "Diesen AK vorstellen"
+msgid "Present AK results"
+msgstr "AK-Ergebnisse vorstellen"
#: AKSubmission/templates/AKSubmission/ak_detail.html:118
#: AKSubmission/templates/AKSubmission/ak_table.html:12
@@ -262,8 +262,8 @@ msgstr "Zeit"
#: AKSubmission/templates/AKSubmission/ak_history.html:48
#: AKSubmission/templates/AKSubmission/ak_table.html:26
-msgid "present this AK"
-msgstr "Diesen AK vorstellen"
+msgid "Present results of this AK in the final plenum"
+msgstr "Die Ergebnisse dieses AKs im Abschlussplenum vorstellen"
#: AKSubmission/templates/AKSubmission/ak_history.html:52
#: AKSubmission/templates/AKSubmission/ak_table.html:30
diff --git a/AKSubmission/templates/AKSubmission/ak_history.html b/AKSubmission/templates/AKSubmission/ak_history.html
index fa8ceed9..f8659a60 100644
--- a/AKSubmission/templates/AKSubmission/ak_history.html
+++ b/AKSubmission/templates/AKSubmission/ak_history.html
@@ -45,7 +45,7 @@
<b>{{ h.name }}</b>
{% if h.present %}
<span class="badge badge-dark badge-pill"
- title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+ title="{% trans 'Present results of this AK in the final plenum' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
{% endif %}
{% if h.reso %}
<span class="badge badge-dark badge-pill"
diff --git a/AKSubmission/templates/AKSubmission/ak_table.html b/AKSubmission/templates/AKSubmission/ak_table.html
index 79f5ac76..f7af8075 100644
--- a/AKSubmission/templates/AKSubmission/ak_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_table.html
@@ -23,7 +23,7 @@
</a>
{% if ak.present %}
<span class="badge badge-dark badge-pill"
- title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+ title="{% trans 'Present results of this AK in the final plenum' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
{% endif %}
{% if ak.reso %}
<span class="badge badge-dark badge-pill"
--
GitLab