X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/05f67adb27390c7a9cf214e83550d3bbca88c8f2..a980dc9ed36f367a04dfdc56e277375d9cca1bd1:/apps/cover/forms.py?ds=sidebyside diff --git a/apps/cover/forms.py b/apps/cover/forms.py index 754d697c..d726f1fa 100755 --- a/apps/cover/forms.py +++ b/apps/cover/forms.py @@ -6,6 +6,7 @@ import re from urllib2 import urlopen from django import forms +from django.utils.translation import ugettext_lazy as _ from cover.models import Image class ImageAddForm(forms.ModelForm): @@ -33,11 +34,11 @@ class ReadonlyImageEditForm(ImageEditForm): class FlickrForm(forms.Form): - source_url = forms.URLField() + source_url = forms.URLField(label=_('Flickr URL')) def clean_source_url(self): url = self.cleaned_data['source_url'] - m = re.match(r'(https?://)?(www.)?flickr.com/photos/(?P[^/]+)/(?P\d+)', url) + m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P[^/]+)/(?P\d+)/?', url) if not m: raise forms.ValidationError("It doesn't look like Flickr URL.") author_slug, img_id = m.group('author'), m.group('img')