fix

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

diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py
index c994149..dfa8522 100644 (file)
--- 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
 #
 import codecs
 import csv


@@ -8,7 +8,6 @@ from inspect import getargspec
 from io import BytesIO
 import json
 import os
 from io import BytesIO
 import json
 import os

-import pytz

 import re
 
 from django.conf import settings
 import re
 
 from django.conf import settings


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

-from django.utils.translation import gettext as _
-
-
-tz = pytz.timezone(settings.TIME_ZONE)
-
-
-def localtime_to_utc(localtime):
-    return timezone.utc.normalize(
-        tz.localize(localtime)
-    )

 
 
 def utc_for_js(dt):
 
 
 def utc_for_js(dt):


@@ -120,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,
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(
         '[WolneLektury] ' + subject,

-        message + "\n\n-- \n" + _('Message sent automatically. Please do not reply.'),
+        message + "\n\n-- \nWiadomość wysłana automatycznie. Prosimy nie odpowiadać.",

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


@@ -202,8 +190,8 @@ def clear_cached_renders(bound_method):
 class YesNoFilter(admin.SimpleListFilter):
     def lookups(self, request, model_admin):
         return (
 class YesNoFilter(admin.SimpleListFilter):
     def lookups(self, request, model_admin):
         return (

-            ('yes', _('Yes')),
-            ('no', _('No')),
+            ('yes', 'Tak'),
+            ('no', 'Nie'),

         )
 
     def queryset(self, request, queryset):
         )
 
     def queryset(self, request, queryset):


@@ -211,3 +199,7 @@ class YesNoFilter(admin.SimpleListFilter):
             return queryset.filter(self.q)
         elif self.value() == 'no':
             return queryset.exclude(self.q)
             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'