From 5932558ca29b752aaf5e3634d4f66adbe2d6a037 Mon Sep 17 00:00:00 2001
From: Michele Fattoruso <michele.fattoruso@gmail.com>
Date: Thu, 6 Jul 2017 02:13:57 -0500
Subject: [PATCH] Fix #300 - Feature/remove flag as language (#542)

* don't use flags to indicate languages #300

* cleaned code

* removed the filter and moved the logic to context.py

* cleaned code

* show the text in the local language

* cleaned code

* changed loop for list comprehension

* fix indentation

* ordered import
---
 src/pretix/presale/context.py                             | 2 ++
 .../presale/templates/pretixpresale/event/base.html       | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py
index 8f5b2bd89e..17383f52bf 100644
--- a/src/pretix/presale/context.py
+++ b/src/pretix/presale/context.py
@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.core.files.storage import default_storage
+from django.utils.translation import get_language_info
 from i18nfield.strings import LazyI18nString
 
 from pretix.base.settings import GlobalSettingsObject
@@ -53,6 +54,7 @@ def contextprocessor(request):
             ctx['css_file'] = default_storage.url(request.event.settings.presale_css_file)
         ctx['event_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:]
         ctx['event'] = request.event
+        ctx['languages'] = [get_language_info(code) for code in request.event.settings.locales]
 
     if hasattr(request, 'organizer'):
         ctx['organizer_logo'] = request.organizer.settings.get('organizer_logo_image', as_type=str, default='')[7:]
diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html
index 513dca1b50..f55f5134b5 100644
--- a/src/pretix/presale/templates/pretixpresale/event/base.html
+++ b/src/pretix/presale/templates/pretixpresale/event/base.html
@@ -37,10 +37,10 @@
         <div class="pull-right loginbox">
             {% if request.event.settings.locales|length > 1 %}
                 <div class="locales">
-                    {% for l in request.event.settings.locales %}
-                        <a href="{% url "presale:locale.set" %}?locale={{ l }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}"
-                            class="{% if l == request.LANGUAGE_CODE %}active{% endif %}"
-                            ><img src="{% static "pretixbase/img/flags/"|add:l|add:".png" %}"/></a>
+                    {% for l in languages %}
+                        <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}">
+                            {{ l.name_local }}
+                        </a>
                     {% endfor %}
                 </div>
             {% endif %}