CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-08 15:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #300 - Feature/remove flag as language (#542)

Browse Source 
* 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
This commit is contained in:
Michele Fattoruso
2017-07-06 02:13:57 -05:00
committed by Raphael Michel
parent 7b22adb72e
commit 5932558ca2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/context.py
View File

@@ -1,5 +1,6 @@
from django.conf import settings from django.conf import settings
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.utils.translation import get_language_info
from i18nfield.strings import LazyI18nString from i18nfield.strings import LazyI18nString
from pretix.base.settings import GlobalSettingsObject 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['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_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:]
ctx['event'] = request.event ctx['event'] = request.event
ctx['languages'] = [get_language_info(code) for code in request.event.settings.locales]
if hasattr(request, 'organizer'): if hasattr(request, 'organizer'):
ctx['organizer_logo'] = request.organizer.settings.get('organizer_logo_image', as_type=str, default='')[7:] ctx['organizer_logo'] = request.organizer.settings.get('organizer_logo_image', as_type=str, default='')[7:]

8
src/pretix/presale/templates/pretixpresale/event/base.html
View File

@@ -37,10 +37,10 @@
<div class="pull-right loginbox"> <div class="pull-right loginbox">
{% if request.event.settings.locales|length > 1 %} {% if request.event.settings.locales|length > 1 %}
<div class="locales"> <div class="locales">
{% for l in request.event.settings.locales %} {% for l in languages %}
<a href="{% url "presale:locale.set" %}?locale={{ l }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" <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 %}">
class="{% if l == request.LANGUAGE_CODE %}active{% endif %}" {{ l.name_local }}
><img src="{% static "pretixbase/img/flags/"|add:l|add:".png" %}"/></a> </a>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}