From 03d8cfb401476426228b68758079c2dd258a47ac Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 11 Apr 2017 10:54:12 +0200
Subject: [PATCH] Cosmetic changes to locale change form

---
 src/pretix/control/forms/orders.py                          | 3 ++-
 src/pretix/control/templates/pretixcontrol/order/index.html | 6 +++---
 src/pretix/control/views/orders.py                          | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py
index 99073aac80..0cf22310e0 100644
--- a/src/pretix/control/forms/orders.py
+++ b/src/pretix/control/forms/orders.py
@@ -130,4 +130,5 @@ class OrderLocaleForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['locale'].choices = [(a, a) for a in self.instance.event.settings.locales]
+        locale_names = dict(settings.LANGUAGES)
+        self.fields['locale'].choices = [(a, locale_names[a]) for a in self.instance.event.settings.locales]
diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html
index 9eaa5f82aa..674679fd18 100644
--- a/src/pretix/control/templates/pretixcontrol/order/index.html
+++ b/src/pretix/control/templates/pretixcontrol/order/index.html
@@ -71,15 +71,15 @@
                     <dl class="dl-horizontal">
                         <dt>{% trans "Order code" %}</dt>
                         <dd>{{ order.code }}</dd>
+                        <dt>{% trans "Order date" %}</dt>
+                        <dd>{{ order.datetime }}</dd>
                         <dt>{% trans "Order locale" %}</dt>
                         <dd>
-                            {{ order.locale }}
+                            {{ display_locale }}
                             <a href="{% url "control:event.order.locale" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default btn-xs">
                                 <span class="fa fa-edit"></span>
                             </a>
                         </dd>
-                        <dt>{% trans "Order date" %}</dt>
-                        <dd>{{ order.datetime }}</dd>
                         {% if order.status == "p" %}
                             <dt>{% trans "Payment date" %}</dt>
                             <dd>{{ order.payment_date }}</dd>
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index ffa62cbbe1..e2cfb59e12 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -1,5 +1,6 @@
 from datetime import timedelta
 
+from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.db.models import Q
@@ -152,6 +153,7 @@ class OrderDetail(OrderView):
         ctx['payment'] = self.payment_provider.order_control_render(self.request, self.object)
         ctx['invoices'] = list(self.order.invoices.all().select_related('event'))
         ctx['comment_form'] = CommentForm(initial={'comment': self.order.comment})
+        ctx['display_locale'] = dict(settings.LANGUAGES)[self.object.locale]
         return ctx
 
     def get_items(self):