summaryrefslogtreecommitdiff
path: root/chimere/forms.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/forms.py')
-rw-r--r--chimere/forms.py80
1 files changed, 40 insertions, 40 deletions
diff --git a/chimere/forms.py b/chimere/forms.py
index 11fafc9..748f815 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -107,7 +107,7 @@ def notifyByEmail(subject, body, user_list, sender=None):
if not settings.EMAIL_HOST or not user_list:
return
if settings.PROJECT_NAME:
- subject = u'[%s] %s' % (settings.PROJECT_NAME, subject)
+ subject = '[%s] %s' % (settings.PROJECT_NAME, subject)
headers = {}
if sender:
headers['Reply-To'] = sender
@@ -121,16 +121,16 @@ def notifyByEmail(subject, body, user_list, sender=None):
def notifySubmission(absolute_uri, geo_object):
- category = u" - ".join([str(cat)
- for cat in geo_object.categories.all()])
- subject = u'%s %s' % (_(u"New submission for"), category)
- message = _(u'The new item "%s" has been submited in the category: ') % \
+ category = " - ".join([str(cat)
+ for cat in geo_object.categories.all()])
+ subject = '%s %s' % (_("New submission for"), category)
+ message = _('The new item "%s" has been submited in the category: ') % \
geo_object.name + category
- message += "\n\n" + _(u"To valid, precise or unvalid this item: ")
+ message += "\n\n" + _("To valid, precise or unvalid this item: ")
named_url = 'admin:chimere_%s_change' % \
geo_object.__class__.__name__.lower()
message += absolute_uri + reverse(named_url, args=(geo_object.pk,))
- message += u"\n\n--\nChimère"
+ message += "\n\n--\nChimère"
user_list = getStaffEmails() + getRelevantModeratorEmails(geo_object)
user_list = list(set(user_list))
@@ -171,17 +171,17 @@ class OSMForm(forms.Form):
OSM export form
"""
username = forms.CharField(label=_("OSM user"))
- password = forms.CharField(label=_(u"Password"),
+ password = forms.CharField(label=_("Password"),
widget=forms.PasswordInput(render_value=False))
# API URL are hardcoded: the day the API change Chimère will need
# adaptations not only on this portion...
api = forms.ChoiceField(
- label=_(u"API"),
+ label=_("API"),
choices=(('', '--'),
('api06.dev.openstreetmap.org',
- _(u"Test API - %s") % 'api06.dev.openstreetmap.org'),
+ _("Test API - %s") % 'api06.dev.openstreetmap.org'),
('api.openstreetmap.org/api',
- _(u"Main API - %s") % 'api.openstreetmap.org/api'),
+ _("Main API - %s") % 'api.openstreetmap.org/api'),
))
@@ -220,27 +220,27 @@ 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 provide a filter. Select an "
- u"area and node/way filter."))
+ _("For OSM import you must be 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 provide a filter. Select an "
- u"area and node/way filter."))
+ _("For OSM import you must be 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 "
- u"zipped archive."))
+ raise forms.ValidationError(_("Shapefiles must be provided in a "
+ "zipped archive."))
if self.cleaned_data.get('importer_type') not in ('XSLT', 'XXLT') and \
self.cleaned_data.get('source') and \
self.cleaned_data.get('source_file'):
- raise forms.ValidationError(_(u"You have to set \"source\" or "
- u"\"source file\" but not both."))
+ raise forms.ValidationError(_("You have to set \"source\" or "
+ "\"source file\" but not both."))
if not self.cleaned_data.get('source') and \
not self.cleaned_data.get('source_file') and \
self.cleaned_data.get('importer_type') != 'OSM':
- raise forms.ValidationError(_(u"You have to set \"source\" or "
- u"\"source file\"."))
+ raise forms.ValidationError(_("You have to set \"source\" or "
+ "\"source file\"."))
return self.cleaned_data
@@ -294,7 +294,7 @@ class MarkerAdminFormBase(forms.ModelForm):
Main form for marker
"""
is_admin = True
- name = forms.CharField(label=_(u"Name"), required=True)
+ name = forms.CharField(label=_("Name"), required=True)
description = forms.CharField(widget=TextareaAdminWidget, required=False)
_PROPERTY_FILTERS = {}
@@ -357,12 +357,12 @@ class MarkerAdminFormBase(forms.ModelForm):
choices = list(self.fields['categories'].choices)
if type(choices[0][1]) in (list, tuple):
# hierarchical choices
- self.fields['categories'].label = u"{} / {}".format(
+ self.fields['categories'].label = "{} / {}".format(
choices[0][0], choices[0][1][0][1])
self.fields['categories'].initial = \
[self.fields['categories'].choices[0][1][0][0]]
else:
- self.fields['categories'].label = u"{}".format(
+ self.fields['categories'].label = "{}".format(
choices[0][1])
self.fields['categories'].initial = \
[self.fields['categories'].choices[0][0]]
@@ -389,11 +389,11 @@ class MarkerAdminFormBase(forms.ModelForm):
start_date = self.cleaned_data.get('start_date')
end_date = self.cleaned_data.get('end_date')
if end_date and not start_date:
- msg = _(u"End date has been set with no start date")
+ msg = _("End date has been set with no start date")
self._errors["end_date"] = self.error_class([msg])
del self.cleaned_data['end_date']
if end_date and start_date and start_date > end_date:
- msg = _(u"End date can't be before start date")
+ msg = _("End date can't be before start date")
self._errors["end_date"] = self.error_class([msg])
raise forms.ValidationError(msg)
for pm in self.pms:
@@ -404,7 +404,7 @@ class MarkerAdminFormBase(forms.ModelForm):
[submited_cat for submited_cat in
self.cleaned_data['categories']
if submited_cat in pm_cats]:
- msg = _(u"This field is mandatory for the selected categories")
+ msg = _("This field is mandatory for the selected categories")
self._errors[pm.getNamedId()] = self.error_class([msg])
# raise forms.ValidationError()
return self.cleaned_data
@@ -448,7 +448,7 @@ class MarkerForm(MarkerBaseForm):
Form for the edit page
"""
is_admin = False
- ref_pk = forms.IntegerField(label=u" ", widget=forms.HiddenInput(),
+ ref_pk = forms.IntegerField(label=" ", widget=forms.HiddenInput(),
required=False)
description = forms.CharField(widget=TextareaWidget, required=False)
keywords = forms.CharField(widget=TextareaWidget, max_length=200,
@@ -467,7 +467,7 @@ class RouteAdminForm(forms.ModelForm):
Main form for route
"""
is_admin = True
- name = forms.CharField(label=_(u"Name"), required=True)
+ name = forms.CharField(label=_("Name"), required=True)
class Meta:
model = Route
@@ -601,7 +601,7 @@ class PolygonForm(PolygonAdminForm):
class BaseFileForm(forms.ModelForm):
- id = forms.IntegerField(label=u"", widget=forms.HiddenInput(),
+ id = forms.IntegerField(label="", widget=forms.HiddenInput(),
required=False)
def __init__(self, *args, **kwargs):
@@ -702,19 +702,19 @@ PictureFileFormSet = formset_factory(PictureFileForm, can_delete=True)
class FileForm(forms.Form):
- raw_file = forms.FileField(label=_(u"File"))
+ raw_file = forms.FileField(label=_("File"))
def clean_raw_file(self):
data = self.cleaned_data['raw_file']
if '.' not in data.name or \
data.name.split('.')[-1].lower() not in ('kml', 'gpx'):
- raise forms.ValidationError(_(u"Bad file format: this must be a "
- u"GPX or KML file"))
+ raise forms.ValidationError(_("Bad file format: this must be a "
+ "GPX or KML file"))
return data
class FullFileForm(FileForm):
- name = forms.CharField(label=_(u"Name"), max_length=150)
+ name = forms.CharField(label=_("Name"), max_length=150)
def __init__(self, *args, **kwargs):
super(FullFileForm, self).__init__(*args, **kwargs)
@@ -767,15 +767,15 @@ class AreaAdminForm(forms.ModelForm):
and not self.cleaned_data.get('lower_right_lat') \
and not self.cleaned_data.get('lower_right_lon') \
and not self.cleaned_data.get('area'):
- msg = _(u"No area selected.")
+ msg = _("No area selected.")
raise forms.ValidationError(msg)
if self.cleaned_data.get('order'):
q = Area.objects.filter(order=self.cleaned_data.get('order'))
if self.instance:
q = q.exclude(pk=self.instance.pk)
if q.count():
- msg = _(u"The area \"%s\" has the same order, you need to"
- u" choose another one.") % str(q.all()[0])
+ msg = _("The area \"%s\" has the same order, you need to"
+ " choose another one.") % str(q.all()[0])
raise forms.ValidationError(msg)
return self.cleaned_data
@@ -828,9 +828,9 @@ class RoutingForm(forms.Form):
transport = forms.ChoiceField(label='', widget=ButtonSelectWidget,
choices=CHIMERE_ROUTING_TRANSPORT,
initial=ROUTING_INIT)
- start = forms.CharField(label=_(u"Start"), widget=NominatimWidget)
- end = forms.CharField(label=_(u"Finish"), widget=NominatimWidget)
- speed = forms.ChoiceField(label=_(u"Speed"), choices=[],
+ start = forms.CharField(label=_("Start"), widget=NominatimWidget)
+ end = forms.CharField(label=_("Finish"), widget=NominatimWidget)
+ speed = forms.ChoiceField(label=_("Speed"), choices=[],
required=False, widget=forms.RadioSelect)
def __init__(self, *args, **kwargs):
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 07:31:02 +0000