From d4ddc15315fb100ea2080cace169d17134971574 Mon Sep 17 00:00:00 2001
From: Marian Beermann <beermann@qabel.de>
Date: Mon, 26 Sep 2016 13:56:35 +0200
Subject: [PATCH] request_status.html: complete translation, no composing.

---
 index_service/locale/de/LC_MESSAGES/django.mo | Bin 5759 -> 5921 bytes
 index_service/locale/de/LC_MESSAGES/django.po |  53 +++++++++---------
 index_service/templates/request_status.html   |  12 +++-
 index_service/verification.py                 |   4 +-
 4 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/index_service/locale/de/LC_MESSAGES/django.mo b/index_service/locale/de/LC_MESSAGES/django.mo
index 9329481d4f5ba1cdd6362d07fa0562b8ce791044..2da2f5174fa98e6d34b18d0c985036be97f9d43e 100644
GIT binary patch
delta 966
zcmZwFPe>F|9Ki8k=4QKVrPlbbv>~a8)kPCMXbEc)B!(0f)NR(C)uG*4o1L&C*i%6#
zp`j2$BKmVJu^@uFh|r&7-HHgxQ&b-Md$R9u)J{G2&1c@*dB6AG@4cngTglS<n(}Kx
zF{#_Mt`SM7WjrX)u@_(9evGUYN#g;0g7@$dTIC`WSQim_LySorqMfM_N#YE?!w+}^
zpRO0VE>e<{Q4#uN5v%bx>Ox{Mkp|q2#Fi9p#Dmz0$B`Iv1uO9?>iC;jk25R2T<QOa
zI{pW4#`3txI_8&pUNpdV+<~pA6A$AgJ8^J;_8&gd4D@Xf8OMvbfM4(vz9#x5e7uQ8
zldZlgkwMzon&t5`_>1;WoX4-MVxIZs;T93*kPF804ld(P+Ecg-pCL(+1thk7!){zc
zHY44&BCJ7D$WMlOXa=$?mQcT&LY?O}Y6k9ONmD<^iw1s$d+;r8#Ymk92?z^a(nxKh
zHitcA3|V{lt#;{gXkmll1iA=4I*qMG7onNfMMS71Y%n}CO*eCe_kgU0MR%<CV70JW
z&TILi>TXvHnHKJ#$n11kq9XVlZD}))SZO<F9&$7GIn#E1?|f1QY}c_f|M@2{Vy7di
zOx|&WVyw4*q~K;9FK=h$sD0+FUG&XNI5M~!dl2d9?CIJYoQk(3^sOt=-qGG38?uUi
z+cD2_i#f|Lcs=G}%X2K(?6++%Z@KR5bli^y`;6wG+GvcY2|0JicSikWP-Pf34l}sU
w$e3^1Ubc|a?r~$H;)Lx@SUEpfG@63%Mni4?zhRO}kJ@RkFfwMlL1k_6FRZGRhX4Qo

delta 868
zcmZ9~KWI}?6vy$OF=@;{Ya5eV<DVFnnj)bhDA5WI73v?5t`17lJYxJ4HF-4_!7S|{
zr64@&;$lH`bSOe8IH(9NI@w7p4s~)UMZrbU?@2SLhg?4Q=DmCGIrqNV-0%I(Pu>0*
z5j$wxXwh|27Js6}L!WdMXYm*=VG&d7r3Ji$&oJ+o8n}Y*nOhD>XBZC#r5xVHk2sGH
zaAt#aUux<=NXqcX8|0b3Vi$fxehP%84(vqMRuVU23J+pGvX;(c6w9~;-L}&hXZ#p#
zodvY_USNj(^^Q(2f2`sJnMWeh5aWBiWfd>tb&SWPFF1kAc!?|~@ocBm$EhshDaOCZ
z-sTT?OFwWLU*jZMn5Q?BG<GG}i~Ti7$0{C1a?m+@fDYOT+(6dWZ9IfiXz#s5a?x9~
zia)gdj#hCjxptzv(B@|`i+N1pC^p;IEc#;JKe3gO9hIHVcA9NUq2kJ0R{^b!O}jda
zO>49^4A8f$>Y-UdmMq1$f<v(+`dW8qAD&fe_hXq`*avB0C!?^p>Wj}U`QpLM-hFkq
z;EvTV+;nQiY&|_vC^}ctC#xmrR@$k$weg&{6512gkW;NVCGU9nviCfk^P-U_fr0#y
zfy3T>WOuvwInv|5%JjL8s2l44d!Z8*Rw|U!jj>wEN&mNH&KpncOctHG`|6QfDZ45Z
b%TBR&ZS<m3^_CM2Zz>t{n#o@8X|nbQ337O<

diff --git a/index_service/locale/de/LC_MESSAGES/django.po b/index_service/locale/de/LC_MESSAGES/django.po
index 0e8b576..0bf6af6 100644
--- a/index_service/locale/de/LC_MESSAGES/django.po
+++ b/index_service/locale/de/LC_MESSAGES/django.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-26 09:07+0200\n"
-"PO-Revision-Date: 2016-09-26 09:07+0100\n"
-"Last-Translator: mabe <beermann@qabel.de>\n"
+"POT-Creation-Date: 2016-09-26 13:52+0200\n"
+"PO-Revision-Date: 2016-09-26 13:55+0100\n"
+"Last-Translator: Marian Beermann <beermann@qabel.de>\n"
 "Language-Team: English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: admin.py:7 admin.py:8
 msgid "Qabel Index Admin"
-msgstr ""
+msgstr "Qabel Index Verwaltung"
 
 #: models.py:57
 msgid "E-Mail address"
@@ -49,10 +49,25 @@ msgstr "Code ist abgelaufen"
 msgid "This request has expired."
 msgstr "Dieser Code ist abgelaufen."
 
+#: templates/request_status.html:5
+#| msgid "Request has expired"
+msgid "Request confirmed"
+msgstr "Bestätigt"
+
 #: templates/request_status.html:7
-#, python-format
-msgid "%(status_verb)s Qabel Index entry."
-msgstr "Qabel Index Eintrag wurde %(status_verb)s."
+#| msgid "Request has expired"
+msgid "Request denied"
+msgstr "Abgebrochen"
+
+#: templates/request_status.html:12
+#| msgid "%(status_verb)s Qabel Index entry."
+msgid "Confirmed Qabel Index entry."
+msgstr "Qabel Index Eintrag wurde bestätigt."
+
+#: templates/request_status.html:14
+#| msgid "%(status_verb)s Qabel Index entry."
+msgid "Denied Qabel Index entry."
+msgstr "Qabel Index Eintrag ist nicht erfolgt."
 
 #: templates/review.html:4 templates/review.html:11
 msgid "Review entry"
@@ -255,17 +270,6 @@ msgstr ""
 
 #: templates/verification/email.txt:38
 #, python-format
-#| msgid ""
-#| "\n"
-#| "The following link will take you to a page where you confirm or deny this "
-#| "action.\n"
-#| "\n"
-#| "%(review_url)s\n"
-#| "\n"
-#| "If you did not sign up for Qabel, please ignore this mail, or make us "
-#| "aware of\n"
-#| "this by sending a mail to <a href=\"mailto:abuse@qabel.de\">abuse@qabel."
-#| "de</a>.\n"
 msgid ""
 "\n"
 "The following link will take you to a page where you confirm or deny this "
@@ -289,14 +293,6 @@ msgstr ""
 msgid "Qabel Index confirmation"
 msgstr "Qabel Index Bestätigung"
 
-#: verification.py:157
-msgid "Confirmed"
-msgstr "bestätigt"
-
-#: verification.py:163
-msgid "Denied"
-msgstr "abgebrochen"
-
 #: views.py:209
 msgid "This code doesn't exist or expired"
 msgstr "Dieser Code ist ungültig oder abgelaufen"
@@ -305,3 +301,8 @@ msgstr "Dieser Code ist ungültig oder abgelaufen"
 msgid "Confirmation code"
 msgstr "Bestätigungscode"
 
+#~ msgid "Confirmed"
+#~ msgstr "bestätigt"
+
+#~ msgid "Denied"
+#~ msgstr "abgebrochen"
diff --git a/index_service/templates/request_status.html b/index_service/templates/request_status.html
index 2e70751..9d47f99 100644
--- a/index_service/templates/request_status.html
+++ b/index_service/templates/request_status.html
@@ -1,8 +1,16 @@
 {% extends "index.html" %}
 {% load i18n %}
 
-{% block title %}{{ status_verb }}{{ block.super }}{% endblock %}
+{% if status == 'confirmed' %}
+{% block title %}{% trans "Request confirmed" %}{{ block.super }}{% endblock %}
+{% else %}
+{% block title %}{% trans "Request denied" %}{{ block.super }}{% endblock %}
+{% endif %}
 
 {% block content %}
-    <h2>{% blocktrans %}{{ status_verb }} Qabel Index entry.{% endblocktrans %}</h2>
+{% if status == 'confirmed' %}
+<h2>{% trans "Confirmed Qabel Index entry." %}</h2>
+{% else %}
+<h2>{% trans "Denied Qabel Index entry." %}</h2>
+{% endif %}
 {% endblock %}
diff --git a/index_service/verification.py b/index_service/verification.py
index a33c0df..0477940 100644
--- a/index_service/verification.py
+++ b/index_service/verification.py
@@ -154,13 +154,13 @@ def expired(request):
 
 def confirmed(request):
     return render(request, 'request_status.html', {
-        'status_verb': _('Confirmed'),
+        'status': 'confirmed',
     })
 
 
 def denied(request):
     return render(request, 'request_status.html', {
-        'status_verb': _('Denied'),
+        'status': 'denied',
     })