From 057701bba9b5173890f9a5c9debb185a28e8b476 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 21 Feb 2014 17:03:28 +0000
Subject: [PATCH] Fix wagtailuserbar to assemble unicode properly as suggested
 by @spapas in 01646aafc8215f7d4a54ed0037d143fd354ad324, and use textual dates

---
 .../templates/wagtailadmin/pages/_moderator_userbar.html      | 2 +-
 wagtail/wagtailadmin/templatetags/wagtailuserbar.py           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_moderator_userbar.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_moderator_userbar.html
index fcf5031f3..40e22b2ac 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_moderator_userbar.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_moderator_userbar.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="wagtail-moderator-controls">
     <div class="message">
-        <p>{% blocktrans with title=revision.page.title submitted_by=revision.user.get_full_name|default:revision.user.username submitted_on=revision.created_at|date:"Y-m-d H:i" %}
+        <p>{% blocktrans with title=revision.page.title submitted_by=revision.user.get_full_name|default:revision.user.username submitted_on=revision.created_at|date:"d M Y H:i" %}
             Previewing '{{ title }}', submitted by {{ submitted_by }} on {{ submitted_on }}.
         {% endblocktrans %}</p>
     </div>
diff --git a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
index d2e550d20..e708740ff 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
@@ -8,10 +8,10 @@ register = template.Library()
 @register.simple_tag(takes_context=True)
 def wagtailuserbar(context, cssfile=None):
     try:
-        items = format_html_join('', '<li>{0}</li>', [(item,) for item in context['request'].userbar])
+        items = format_html_join(u'', u'<li>{0}</li>', [(item,) for item in context['request'].userbar])
         context.hasuserbar = True
         if not cssfile:
             cssfile = staticfiles_storage.url('wagtailadmin/css/wagtail-userbar.css')
-        return format_html('<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400" /><link rel="stylesheet" href="{0}" /><ul id="wagtail-userbar">{1}</ul>', cssfile, items)
+        return format_html(u'<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400" /><link rel="stylesheet" href="{0}" /><ul id="wagtail-userbar">{1}</ul>', cssfile, items)
     except AttributeError:
         return ''