X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/51e143456755a74d038bf0250a999aed6d41b45e..d10c63f27d1494a04d57a6c805d093089526430a:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index 15319a11a..33bf42cc0 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -8,28 +8,18 @@ from inspect import getargspec from io import BytesIO import json import os -import pytz import re from django.conf import settings +from django.contrib import admin from django.core.cache import cache from django.core.mail import send_mail from django.http import HttpResponse from django.template.loader import render_to_string -from django.utils import timezone from django.utils.translation import get_language from django.conf import settings from django.utils.safestring import mark_safe -from django.utils.translation import ugettext - - -tz = pytz.timezone(settings.TIME_ZONE) - - -def localtime_to_utc(localtime): - return timezone.utc.normalize( - tz.localize(localtime) - ) +from django.utils.translation import gettext as _ def utc_for_js(dt): @@ -119,7 +109,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N def send_noreply_mail(subject, message, recipient_list, **kwargs): send_mail( '[WolneLektury] ' + subject, - message + "\n\n-- \n" + ugettext('Message sent automatically. Please do not reply.'), + message + "\n\n-- \n" + _('Message sent automatically. Please do not reply.'), 'no-reply@wolnelektury.pl', recipient_list, **kwargs) @@ -196,3 +186,21 @@ def clear_cached_renders(bound_method): lc ) ) + + +class YesNoFilter(admin.SimpleListFilter): + def lookups(self, request, model_admin): + return ( + ('yes', _('Yes')), + ('no', _('No')), + ) + + def queryset(self, request, queryset): + if self.value() == 'yes': + return queryset.filter(self.q) + elif self.value() == 'no': + return queryset.exclude(self.q) + + +def is_ajax(request): + return request.headers.get('x-requested-with') == 'XMLHttpRequest'