diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
| commit | 51f788fd4e81186be2f7b7b4459d3d90a7b47bf2 (patch) | |
| tree | 232659156f76ff7664139d963dac8d8c68e1d43f /chimere/forms.py | |
| parent | 70811d699e68c075ed3cae543cbb8b695d386730 (diff) | |
| parent | 3aaae876d73a9c16d2961bea9ae2012ae0bc5b0e (diff) | |
| download | Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.tar.bz2 Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/tests.py
chimere/utils.py
Diffstat (limited to 'chimere/forms.py')
| -rw-r--r-- | chimere/forms.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 200d2f1..1d403c8 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -154,11 +154,11 @@ class ImporterAdminForm(forms.ModelForm): if self.cleaned_data.get('importer_type') == 'OSM' and \ not self.cleaned_data.get('filtr'): raise forms.ValidationError(_(u"For OSM import you must be "\ - u"provide a filter. Select an area and node/way filter.")) + u"provide a filter. Select an area and node/way filter.")) if self.cleaned_data.get('importer_type') == 'OSM' and \ not RE_XAPI.match(self.cleaned_data.get('filtr')): raise forms.ValidationError(_(u"For OSM import you must be "\ - u"provide a filter. Select an area and node/way filter.")) + u"provide a filter. Select an area and node/way filter.")) if self.cleaned_data.get('importer_type') == 'SHP' and \ not self.cleaned_data.get('zipped'): raise forms.ValidationError(_(u"Shapefiles must be provided in a "\ |