Minor Django version bump.

[wolnelektury.git] / src / wolnelektury / utils.py

diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py
index c9b1a18..c994149 100644 (file)
--- a/src/wolnelektury/utils.py
+++ b/src/wolnelektury/utils.py
@@ -12,6 +12,7 @@ import pytz
 import re
 
 from django.conf import settings
 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.core.cache import cache
 from django.core.mail import send_mail
 from django.http import HttpResponse


@@ -20,7 +21,7 @@ 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 get_language
 from django.conf import settings
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext
+from django.utils.translation import gettext as _

 
 
 tz = pytz.timezone(settings.TIME_ZONE)
 
 
 tz = pytz.timezone(settings.TIME_ZONE)


@@ -118,8 +119,8 @@ def ajax(login_required=False, method=None, template=None, permission_required=N
 
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(
 
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(

-        u'[WolneLektury] ' + subject,
-        message + u"\n\n-- \n" + ugettext(u'Message sent automatically. Please do not reply.'),
+        '[WolneLektury] ' + subject,
+        message + "\n\n-- \n" + _('Message sent automatically. Please do not reply.'),

         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 
         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 


@@ -159,17 +160,6 @@ def re_escape(s):
     return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", 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()
 def get_cached_render_key(instance, property_name, language=None):
     if language is None:
         language = get_language()


@@ -207,3 +197,17 @@ def clear_cached_renders(bound_method):
                 lc
             )
         )
                 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)