diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py index 99073aac8..0cf22310e 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 9eaa5f82a..674679fd1 100644 --- a/src/pretix/control/templates/pretixcontrol/order/index.html +++ b/src/pretix/control/templates/pretixcontrol/order/index.html @@ -71,15 +71,15 @@
{% trans "Order code" %}
{{ order.code }}
+
{% trans "Order date" %}
+
{{ order.datetime }}
{% trans "Order locale" %}
- {{ order.locale }} + {{ display_locale }}
-
{% trans "Order date" %}
-
{{ order.datetime }}
{% if order.status == "p" %}
{% trans "Payment date" %}
{{ order.payment_date }}
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index ffa62cbbe..e2cfb59e1 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):