X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6d42bc478e3d1bd90eb294464748c21e4de0fc63..HEAD:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index b0b972657..dfa8522f8 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # import codecs import csv @@ -8,28 +8,17 @@ 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) - ) def utc_for_js(dt): @@ -119,7 +108,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-- \nWiadomość wysłana automatycznie. Prosimy nie odpowiadać.", 'no-reply@wolnelektury.pl', recipient_list, **kwargs) @@ -159,17 +148,6 @@ def re_escape(s): return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", s) -BOT_BITS = ['bot', 'slurp', 'spider', 'facebook', 'crawler', 'parser', 'http'] - - -def is_crawler(request): - user_agent = request.META.get('HTTP_USER_AGENT') - if not user_agent: - return True - user_agent = user_agent.lower() - return any(bot_bit in user_agent for bot_bit in BOT_BITS) - - def get_cached_render_key(instance, property_name, language=None): if language is None: language = get_language() @@ -207,3 +185,21 @@ def clear_cached_renders(bound_method): lc ) ) + + +class YesNoFilter(admin.SimpleListFilter): + def lookups(self, request, model_admin): + return ( + ('yes', 'Tak'), + ('no', 'Nie'), + ) + + 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'