X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5d9c33d00933597e218b732e3bd0bcbb55c4f371..4fae06ea1b9fec1a45482ac043aa049ebce3f465:/src/cover/forms.py

diff --git a/src/cover/forms.py b/src/cover/forms.py
index 3be4e211..7a855940 100644
--- a/src/cover/forms.py
+++ b/src/cover/forms.py
@@ -5,7 +5,7 @@ from io import BytesIO
 
 from django import forms
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext
 from cover.models import Image
 from django.utils.safestring import mark_safe
 from PIL import Image as PILImage
@@ -36,7 +36,7 @@ class ImageAddForm(forms.ModelForm):
                 pass
             else:
                 raise forms.ValidationError(mark_safe(
-                    ugettext('Image <a href="%(url)s">already in repository</a>.')
+                    gettext('Image <a href="%(url)s">already in repository</a>.')
                     % {'url': img.get_absolute_url()}))
         return cl
 
@@ -46,16 +46,21 @@ class ImageAddForm(forms.ModelForm):
             same_source = Image.objects.filter(source_url=source_url)
             if same_source:
                 raise forms.ValidationError(mark_safe(
-                    ugettext('Image <a href="%(url)s">already in repository</a>.')
+                    gettext('Image <a href="%(url)s">already in repository</a>.')
                     % {'url': same_source.first().get_absolute_url()}))
         return source_url
 
+    clean_cut_top = lambda self: self.cleaned_data.get('cut_top') or 0
+    clean_cut_bottom = lambda self: self.cleaned_data.get('cut_bottom') or 0
+    clean_cut_left = lambda self: self.cleaned_data.get('cut_left') or 0
+    clean_cut_right = lambda self: self.cleaned_data.get('cut_right') or 0
+    
     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()
         download_url = cleaned_data.get('download_url', None)
         uploaded_file = cleaned_data.get('file', None)
         if not download_url and not uploaded_file:
-            raise forms.ValidationError(ugettext('No image specified'))
+            raise forms.ValidationError(gettext('No image specified'))
         if download_url:
             image_data = URLOpener().open(download_url).read()
             width, height = PILImage.open(BytesIO(image_data)).size
@@ -63,7 +68,7 @@ class ImageAddForm(forms.ModelForm):
             width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:
-            raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') %
+            raise forms.ValidationError(gettext('Image too small: %sx%s, minimal dimensions %sx%s') %
                                         (width, height, min_width, min_height))
         return cleaned_data
 
@@ -80,7 +85,7 @@ class ImageEditForm(forms.ModelForm):
         width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:
-            raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') %
+            raise forms.ValidationError(gettext('Image too small: %sx%s, minimal dimensions %sx%s') %
                                         (width, height, min_width, min_height))
 
 
@@ -97,7 +102,7 @@ class ReadonlyImageEditForm(ImageEditForm):
 
 
 class ImportForm(forms.Form):
-    source_url = forms.URLField(label=_('WikiCommons, MNW or Flickr URL'))
+    source_url = forms.URLField(label=_('WikiCommons, MNW, Flickr, RawPixel URL'))
 
     def clean_source_url(self):
         url = self.cleaned_data['source_url']