Merge pull request #36 from Qabel/m/qwt

templates

index_service/admin.py

@@ -1,18 +1,28 @@
 from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _
 
 from . import models
 
-
-@admin.register(models.Identity)
-class IdentityAdmin(admin.ModelAdmin):
-    pass
+admin.site.site_title = _('Index')
+admin.site.site_header = _('Qabel Index Admin')
+admin.site.index_title = _('Qabel Index Admin')
 
 
 @admin.register(models.Entry)
 class EntryAdmin(admin.ModelAdmin):
     pass
 
 
+class EntryInlineAdmin(admin.TabularInline):
+    model = models.Entry
+    extra = 0
+
+
+@admin.register(models.Identity)
+class IdentityAdmin(admin.ModelAdmin):
+    inlines = [EntryInlineAdmin]
+
+
 class PendingVerificationInline(admin.TabularInline):
     model = models.PendingVerification
 

index_service/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,308 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# mabe <[email protected]>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \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 <[email protected]>\n"
+"Language-Team: English <[email protected]>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: admin.py:6
+msgid "Index"
+msgstr ""
+
+#: admin.py:7 admin.py:8
+msgid "Qabel Index Admin"
+msgstr "Qabel Index Verwaltung"
+
+#: models.py:57
+msgid "E-Mail address"
+msgstr "E-Mail-Addresse"
+
+#: models.py:58
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: templates/codeentry.html:11
+msgid "Enter the confirmation code you received to proceed"
+msgstr "Geben Sie einen Bestätigungscode ein, um fortzufahren"
+
+#: templates/codeentry.html:18
+msgid "Review"
+msgstr "Prüfen"
+
+#: templates/request_expired.html:4
+msgid "Request has expired"
+msgstr "Code ist abgelaufen"
+
+#: templates/request_expired.html:7
+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
+#| 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"
+msgstr "Eintrag prüfen"
+
+#: templates/review.html:15
+msgid "Identity"
+msgstr "Identität"
+
+#: templates/review.html:17
+#, python-format
+msgid ""
+"\n"
+"                Alias: %(alias)s<br/>\n"
+"                Public key: %(public_key)s\n"
+"                "
+msgstr ""
+"\n"
+"                Alias: %(alias)s<br/>\n"
+"                Öffentlicher Schlüssel: %(public_key)s\n"
+"                "
+
+#: templates/review.html:29
+#, python-format
+msgid ""
+"\n"
+"                    Unpublish %(field)s\n"
+"                    "
+msgstr ""
+"\n"
+"                    %(field)s entfernen\n"
+"                    "
+
+#: templates/review.html:33
+#, python-format
+msgid ""
+"\n"
+"                    Publish %(field)s\n"
+"                    "
+msgstr ""
+"\n"
+"                    %(field)s veröffentlichen\n"
+"                    "
+
+#: templates/review.html:46
+msgid "Deny"
+msgstr "Abbrechen"
+
+#: templates/review.html:47
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: templates/verification/email.html:7
+msgid "Qabel Index Confirmation"
+msgstr "Qabel Index Bestätigung"
+
+#: templates/verification/email.html:17
+#, python-format
+msgid ""
+"\n"
+"        <p>You (or someone else using your email) has requested to link this "
+"email address, %(email)s\n"
+"        to the following alias and public key publicly on Qabel Index:</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Sie, oder jemand, dere Ihre E-Mail-Addresse angegeben hat, möchte "
+"diese E-Mail-Addresse (%(email)s)\n"
+"        öffentlich mit dem folgenden Alias und öffentlichen Schlüssel auf "
+"dem Qabel Index verbinden:</p>\n"
+"        "
+
+#: templates/verification/email.html:22
+#, python-format
+msgid ""
+"\n"
+"        <p>You (or someone else using your email) has requested to remove "
+"this email address, %(email)s\n"
+"        from the following alias and public key on Qabel Index:</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Sie, oder jemand, dere Ihre E-Mail-Addresse angegeben hat, möchte "
+"diese E-Mail-Addresse (%(email)s)\n"
+"        vom Qabel Index entfernen. Der aktuell veröffentlichte Alias und "
+"öffentliche Schlüssel ist:</p>\n"
+"        "
+
+#: templates/verification/email.html:28
+#, python-format
+msgid ""
+"\n"
+"    <dl>\n"
+"    <dt>Alias</dt>\n"
+"    <dd>%(alias)s</dd>\n"
+"\n"
+"    <dt>Public key</dt>\n"
+"    <dd>%(public_key)s</dd>\n"
+"    </dl>\n"
+"    "
+msgstr ""
+"\n"
+"    <dl>\n"
+"    <dt>Alias</dt>\n"
+"    <dd>%(alias)s</dd>\n"
+"\n"
+"    <dt>Öffentlicher Schlüssel</dt>\n"
+"    <dd>%(public_key)s</dd>\n"
+"    </dl>\n"
+"    "
+
+#: templates/verification/email.html:38
+#, python-format
+msgid ""
+"\n"
+"    <p>The following link will take you to a page where you confirm or deny "
+"this action.</p>\n"
+"\n"
+"    <p>\n"
+"        <a href=\"%(review_url)s\"\n"
+"           style=\"background-color: #ff5908; border-radius: 4px; color: "
+"white; padding: 5px; text-decoration: none;\">Review</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\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:[email protected]"
+"\">[email protected]</a>.\n"
+"    </p>\n"
+"    "
+msgstr ""
+"\n"
+"    <p>Der folgende Link führt zu einer Seite, wo sie dies bestätigen bzw. "
+"abbrechen können.</p>\n"
+"\n"
+"    <p>\n"
+"        <a href=\"%(review_url)s\"\n"
+"           style=\"background-color: #ff5908; border-radius: 4px; color: "
+"white; padding: 5px; text-decoration: none;\">Eintragung prüfen</a>\n"
+"    </p>\n"
+"\n"
+"                <p>                Wenn Sie sich nicht bei Qabel angemeldet "
+"haben, dann ignorieren                Sie diese Mail bitte, oder schreiben "
+"Sie uns einen Hinweis an                <a href=\"mailto:[email protected]"
+"\">[email protected]</a>.            </p>"
+
+#: templates/verification/email.txt:5
+msgid ""
+"\n"
+"------------------------\n"
+"Qabel Index Confirmation\n"
+"------------------------\n"
+msgstr ""
+"\n"
+"-----------------------\n"
+"Qabel Index Bestätigung\n"
+"-----------------------\n"
+
+#: templates/verification/email.txt:20
+#, python-format
+msgid ""
+"\n"
+"You (or someone else using your email) has requested to link this email "
+"address, %(email)s\n"
+"to the following alias and public key publicly on Qabel Index:\n"
+msgstr ""
+"\n"
+"Sie, oder jemand, dere Ihre E-Mail-Addresse angegeben hat, möchte diese E-"
+"Mail-Addresse (%(email)s)\n"
+"öffentlich mit dem folgenden Alias und öffentlichen Schlüssel auf dem Qabel "
+"Index verbinden\n"
+
+#: templates/verification/email.txt:25
+#, python-format
+msgid ""
+"\n"
+"You (or someone else using your email) has requested to remove this email "
+"address, %(email)s\n"
+"from the following alias and public key on Qabel Index:\n"
+msgstr ""
+"\n"
+"Sie, oder jemand, dere Ihre E-Mail-Addresse angegeben hat, möchte diese E-"
+"Mail-Addresse (%(email)s)\n"
+"vom Qabel Index entfernen. Der aktuell veröffentlichte Alias und öffentliche "
+"Schlüssel ist:\n"
+
+#: templates/verification/email.txt:31
+#, python-format
+msgid ""
+"\n"
+"Alias: %(alias)s\n"
+"\n"
+"Public key: %(public_key)s\n"
+msgstr ""
+"\n"
+"    Alias: %(alias)s\n"
+"\n"
+"    Öffentlicher Schlüssel: %(public_key)s\n"
+
+#: 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 [email protected]\n"
+msgstr ""
+"\n"
+"Der folgende Link führt zu einer Seite, wo sie dies bestätigen bzw. "
+"abbrechen können.\n"
+"\n"
+"%(review_url)s\n"
+"Wenn Sie sich nicht bei Qabel angemeldet haben, dann ignorieren Sie diese "
+"Mail bitte, oder schreiben Sie uns einen Hinweis an [email protected]\n"
+
+#: verification.py:70
+msgid "Qabel Index confirmation"
+msgstr "Qabel Index Bestätigung"
+
+#: views.py:209
+msgid "This code doesn't exist or expired"
+msgstr "Dieser Code ist ungültig oder abgelaufen"
+
+#: views.py:213
+msgid "Confirmation code"
+msgstr "Bestätigungscode"
+
+#~ msgid "Confirmed"
+#~ msgstr "bestätigt"
+
+#~ msgid "Denied"
+#~ msgstr "abgebrochen"

index_service/models.py

@@ -4,6 +4,7 @@
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
 
 from django_prometheus.models import ExportModelOperationsMixin
 
@@ -53,8 +54,8 @@ class Entry(ExportModelOperationsMixin('Entry'), CreationTimestampModel):
     """
 
     FIELDS_CHOICES = (
-        ('email', 'E-Mail address'),
-        ('phone', 'phone number'),
+        ('email', _('E-Mail address')),
+        ('phone', _('Phone number')),
     )
 
     # These are the fields a client can search for

index_service/templates/codeentry.html

@@ -0,0 +1,22 @@
+{% extends "index.html" %}
+{% load i18n bootstrap %}
+
+{% block title %}Qabel Index{% endblock %}
+
+{% block content %}
+    {{ block.super }}
+    <form method="post" class="form-horizontal">
+        {% csrf_token %}
+        <legend>
+            {% trans "Enter the confirmation code you received to proceed" %}
+        </legend>
+
+        {{ form|bootstrap_horizontal }}
+
+        <div class="form-group">
+          <div class="col-sm-10 col-sm-offset-2">
+            <input type="submit" class="btn btn-primary" value="{% trans 'Review' %}">
+          </div>
+        </div>
+    </form>
+{% endblock %}

index_service/templates/index.html

@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block title %} – Qabel Index{% endblock %}
+
+{% block content %}<p>&nbsp;</p>{% endblock %}