From 3e1e8f29f7d11f4c11aee04d922543b1bf958d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Thu, 29 Jun 2017 18:36:04 +0200
Subject: [PATCH] move created by text into template

---
 src/c3nav/editor/templates/editor/changeset.html | 10 ++++++++--
 src/c3nav/editor/views/changes.py                |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 67c17b7e..3121080a 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -14,9 +14,15 @@
 <form method="post" action="{{ request.path }}">
 {% csrf_token %}
 <p class="text-muted">
-    {{ created }}{% if changeset.author %} {{ changeset.author.username }}{% endif %}
+    {% with datetime=changeset.created|date:"DATETIME_FORMAT" author=changeset.author %}
+        {% if author %}
+            {% blocktrans %}created at {{ datetime }} by {{ author }}{% endblocktrans %}
+        {% else %}
+            {% blocktrans %}created at {{ datetime }}{% endblocktrans %}
+        {% endif %}
+    {% endwith %}
     {% if changeset.proposed %}
-        <br>{% with date=changeset.proposed|date:"DATETIME_FORMAT" %}{% blocktrans %}proposed at {{ date }}{% endblocktrans %}{% endwith %}
+        <br>{% with datetime=changeset.proposed|date:"DATETIME_FORMAT" %}{% blocktrans %}proposed at {{ datetime }}{% endblocktrans %}{% endwith %}
     {% endif %}
 </p>
 {% bootstrap_messages %}
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index e0a6add8..97b8fe23 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -8,7 +8,6 @@ from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.formats import date_format
 from django.utils.translation import ugettext_lazy as _
 
 from c3nav.editor.forms import ChangeSetForm
@@ -250,14 +249,8 @@ def changeset_detail(request, pk):
 
     changed_objects_data = sorted(changed_objects_data, key=itemgetter('order'))
 
-    if changeset.author:
-        created = _('created at %(datetime)s by') % {'datetime': date_format(changeset.created, 'DATETIME_FORMAT')}
-    else:
-        created = _('created at %(datetime)s') % {'datetime': date_format(changeset.created, 'DATETIME_FORMAT')}
-
     ctx = {
         'changeset': changeset,
-        'created': created,
         'can_edit': can_edit,
         'can_delete': can_delete,
         'can_unpropose': changeset.can_unpropose(request),