Refactor - clean

1 files changed, 57 insertions, 57 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 9d2c14691..0108a8375 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -64,34 +64,34 @@ class FileSelect(DocumentItemSelect):
     internal_reference = forms.CharField(max_length=200,
                                          label=_("Other reference"))
     towns = get_town_field()
-    parcel = forms.CharField(label=_(u"Parcel"))
+    parcel = forms.CharField(label=_("Parcel"))
     if settings.ISHTAR_DPTS:
         towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
-    name = forms.CharField(label=_(u"File name"), max_length=200)
+            label=_("Department"), choices=[])
+    name = forms.CharField(label=_("File name"), max_length=200)
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
-    end_date = forms.NullBooleanField(label=_(u"Is active?"))
+    end_date = forms.NullBooleanField(label=_("Is active?"))
     saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
     permit_type = forms.ChoiceField(label=_("Permit type"), choices=[])
     permit_reference = forms.CharField(max_length=200,
                                        label=_("Permit reference"))
-    comment = forms.CharField(label=_(u"Comment"), max_length=500)
+    comment = forms.CharField(label=_("Comment"), max_length=500)
     in_charge = forms.IntegerField(
-        label=_(u"In charge"),
+        label=_("In charge"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=[person_type_pk_lazy('sra_agent')]),
             associated_model=Person),
         validators=[valid_id(Person)])
     general_contractor = forms.IntegerField(
-        label=_(u"General contractor"),
+        label=_("General contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=[person_type_pk_lazy('general_contractor')]),
             associated_model=Person),
         validators=[valid_id(Person)])
     general_contractor__attached_to = forms.IntegerField(
-        label=_(u"Organization of general contractor"),
+        label=_("Organization of general contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-organization',
                          args=[organization_type_pks_lazy([
@@ -99,14 +99,14 @@ class FileSelect(DocumentItemSelect):
             associated_model=Organization),
         validators=[valid_id(Organization)])
     history_creator = forms.IntegerField(
-        label=_(u"Created by"),
+        label=_("Created by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
             associated_model=Person),
         validators=[valid_id(Person)])
     history_modifier = forms.IntegerField(
-        label=_(u"Modified by"),
+        label=_("Modified by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
@@ -155,8 +155,8 @@ class FileFormMultiSelection(LockForm, MultiSearchForm):
         validators=[valid_ids(models.File)])
 
 
-DATE_SOURCE = (('creation', _(u"Creation date")),
-               ("reception", _(u"Reception date")))
+DATE_SOURCE = (('creation', _("Creation date")),
+               ("reception", _("Reception date")))
 
 
 class DashboardForm(IshtarForm):
@@ -171,9 +171,9 @@ class DashboardForm(IshtarForm):
     saisine_type = forms.ChoiceField(
         label=_("Saisine type"), choices=[], required=False)
     after = forms.DateField(
-        label=_(u"Date after"), widget=DatePicker, required=False)
+        label=_("Date after"), widget=DatePicker, required=False)
     before = forms.DateField(
-        label=_(u"Date before"), widget=DatePicker, required=False)
+        label=_("Date before"), widget=DatePicker, required=False)
 
     def __init__(self, *args, **kwargs):
         if 'prefix' not in kwargs:
@@ -230,9 +230,9 @@ class FileFormGeneral(ManageOldType):
     numeric_reference = forms.IntegerField(
         label=_("Numeric reference"), widget=forms.HiddenInput, required=False)
     internal_reference = forms.CharField(
-        label=_(u"Other reference"), max_length=60, required=False)
-    name = forms.CharField(label=_(u"Name"), required=False, max_length=100)
-    creation_date = forms.DateField(label=_(u"Creation date"),
+        label=_("Other reference"), max_length=60, required=False)
+    name = forms.CharField(label=_("Name"), required=False, max_length=100)
+    creation_date = forms.DateField(label=_("Creation date"),
                                     initial=get_now, widget=DatePicker)
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
     related_file = forms.IntegerField(
@@ -240,11 +240,11 @@ class FileFormGeneral(ManageOldType):
         widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'),
                                           associated_model=models.File),
         validators=[valid_id(models.File)])
-    comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea,
+    comment = forms.CharField(label=_("Comment"), widget=forms.Textarea,
                               required=False)
     total_surface = forms.FloatField(
         required=False, widget=widgets.AreaWidget,
-        label=_(u"Total surface (m2)"),
+        label=_("Total surface (m2)"),
         validators=[validators.MinValueValidator(0),
                     validators.MaxValueValidator(999999999)])
     address = forms.CharField(label=_("Main address"), widget=forms.Textarea)
@@ -262,16 +262,16 @@ class FileFormGeneral(ManageOldType):
                   .exclude(internal_reference='').order_by('-pk')
         if q.count() and 'internal_reference' in self.fields:
             lbl = self.fields['internal_reference'].label
-            lbl += _(u"<br/>(last recorded: %s)") % (
+            lbl += _("<br/>(last recorded: %s)") % (
                 q.all()[0].internal_reference)
             self.fields['internal_reference'].label = mark_safe(lbl)
 
 
 class FileFormGeneralRO(FileFormGeneral):
     year = forms.IntegerField(
-        label=_(u"Year"), widget=forms.TextInput(attrs={'readonly': True}))
+        label=_("Year"), widget=forms.TextInput(attrs={'readonly': True}))
     numeric_reference = forms.IntegerField(
-        label=_(u"Numeric reference"), widget=forms.TextInput())
+        label=_("Numeric reference"), widget=forms.TextInput())
     id = forms.IntegerField(' ', widget=forms.HiddenInput, required=False)
 
     def clean(self):
@@ -284,13 +284,13 @@ class FileFormGeneralRO(FileFormGeneral):
                        .exclude(pk=pk)
         if numeric_reference and q.count():
             raise forms.ValidationError(
-                _(u"Another file with this numeric id exists."))
+                _("Another file with this numeric id exists."))
         return cleaned_data
 
 
 ParcelFormset = formset_factory(ParcelForm, can_delete=True,
                                 formset=ParcelFormSet)
-ParcelFormset.form_label = _(u"Parcels")
+ParcelFormset.form_label = _("Parcels")
 ParcelFormset.form_admin_name = _("Archaeological file - 020 - Parcel")
 ParcelFormset.form_slug = "file-020-parcels"
 
@@ -325,20 +325,20 @@ class FileFormPreventive(ManageOldType, forms.Form):
                     ]},
             associated_model=Person, new=True),
         validators=[valid_id(Person)])
-    permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False,
+    permit_type = forms.ChoiceField(label=_("Permit type"), required=False,
                                     choices=[])
     permit_reference = forms.CharField(
-        label=_(u"Permit reference"), required=False,
+        label=_("Permit reference"), required=False,
         validators=[validators.MaxLengthValidator(60)])
     total_developed_surface = forms.FloatField(
-        widget=widgets.AreaWidget, label=_(u"Total developed surface (m2)"),
+        widget=widgets.AreaWidget, label=_("Total developed surface (m2)"),
         required=False, validators=[validators.MinValueValidator(0),
                                     validators.MaxValueValidator(999999999)])
     if settings.COUNTRY == 'fr':
-        saisine_type = forms.ChoiceField(label=_(u"Saisine type"),
+        saisine_type = forms.ChoiceField(label=_("Saisine type"),
                                          choices=[])
     reception_date = forms.DateField(
-        label=_(u"Reception date"), initial=get_now, widget=DatePicker)
+        label=_("Reception date"), initial=get_now, widget=DatePicker)
 
     def __init__(self, *args, **kwargs):
         super(FileFormPreventive, self).__init__(*args, **kwargs)
@@ -393,19 +393,19 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form):
         validators=[valid_id(Organization)], required=False,
     )
     if settings.COUNTRY == 'fr':
-        cira_advised = forms.NullBooleanField(label=u"Passage en CIRA",
+        cira_advised = forms.NullBooleanField(label="Passage en CIRA",
                                               required=False)
     research_comment = forms.CharField(
-        label=_(u"Comment"), widget=forms.Textarea, required=False)
+        label=_("Comment"), widget=forms.Textarea, required=False)
     if settings.COUNTRY == 'fr':
         mh_register = forms.NullBooleanField(
-            label=u"Sur Monument Historique classé", required=False)
+            label="Sur Monument Historique classé", required=False)
         mh_listing = forms.NullBooleanField(
-            label=u"Sur Monument Historique inscrit", required=False)
+            label="Sur Monument Historique inscrit", required=False)
     classified_area = forms.NullBooleanField(
-        label=_(u"Classified area"), required=False)
+        label=_("Classified area"), required=False)
     protected_area = forms.NullBooleanField(
-        label=_(u"Protected area"), required=False)
+        label=_("Protected area"), required=False)
 
     def __init__(self, *args, **kwargs):
         super(FileFormResearch, self).__init__(*args, **kwargs)
@@ -420,34 +420,34 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form):
 
 class FinalFileClosingForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to close this archaeological file?")
+    confirm_end_msg = _("Would you like to close this archaeological file?")
 
 
 class FinalFileDeleteForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to delete this archaeological file ?")
+    confirm_end_msg = _("Would you like to delete this archaeological file ?")
 
 
 class AdministrativeActFileModifySelect(TableSelect):
     _model = AdministrativeAct
 
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-operations', 'administrativeact',
             'administrativeactfile',
         ))
     year = forms.IntegerField(label=_("Year"))
     index = forms.IntegerField(label=_("Index"))
     if settings.COUNTRY == 'fr':
-        ref_sra = forms.CharField(label=u"Référence SRA",
+        ref_sra = forms.CharField(label="Référence SRA",
                                   max_length=15)
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
-    act_object = forms.CharField(label=_(u"Object (full text search)"),
+    act_object = forms.CharField(label=_("Object (full text search)"),
                                  max_length=300)
     operation__towns = get_town_field()
     if settings.ISHTAR_DPTS:
         operation__towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
+            label=_("Department"), choices=[])
 
     def __init__(self, *args, **kwargs):
         super(AdministrativeActFileModifySelect, self).__init__(*args,
@@ -467,33 +467,33 @@ class AdministrativeActFileSelect(TableSelect):
     _model = AdministrativeAct
 
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-operations', 'administrativeact',
             'administrativeactfile',
         ))
     year = forms.IntegerField(label=_("Year"))
     index = forms.IntegerField(label=_("Index"))
     if settings.COUNTRY == 'fr':
-        ref_sra = forms.CharField(label=u"Autre référence",
+        ref_sra = forms.CharField(label="Autre référence",
                                   max_length=15)
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
-    indexed = forms.NullBooleanField(label=_(u"Indexed?"))
+    indexed = forms.NullBooleanField(label=_("Indexed?"))
     associated_file__towns = get_town_field()
-    parcel = forms.CharField(label=_(u"Parcel"))
+    parcel = forms.CharField(label=_("Parcel"))
     if settings.ISHTAR_DPTS:
         associated_file__towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
-    act_object = forms.CharField(label=_(u"Object"),
+            label=_("Department"), choices=[])
+    act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
     signature_date_before = forms.DateField(
-        label=_(u"Signature date before"), widget=DatePicker)
+        label=_("Signature date before"), widget=DatePicker)
     signature_date_after = forms.DateField(
-        label=_(u"Signature date after"), widget=DatePicker)
+        label=_("Signature date after"), widget=DatePicker)
     associated_file__name = forms.CharField(
-        label=_(u"File name"), max_length=200)
+        label=_("File name"), max_length=200)
     associated_file__general_contractor = forms.IntegerField(
-        label=_(u"General contractor"),
+        label=_("General contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -501,7 +501,7 @@ class AdministrativeActFileSelect(TableSelect):
                 associated_model=Person),
         validators=[valid_id(Person)])
     associated_file__general_contractor__attached_to = forms.IntegerField(
-        label=_(u"Organization of general contractor"),
+        label=_("Organization of general contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-organization',
@@ -514,7 +514,7 @@ class AdministrativeActFileSelect(TableSelect):
     associated_file__internal_reference = forms.CharField(
         max_length=200, label=_("File other reference"))
     associated_file__in_charge = forms.IntegerField(
-        label=_(u"File in charge"),
+        label=_("File in charge"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -524,7 +524,7 @@ class AdministrativeActFileSelect(TableSelect):
     associated_file__permit_reference = forms.CharField(
         max_length=200, label=_("File permit reference"))
     history_creator = forms.IntegerField(
-        label=_(u"Created by"),
+        label=_("Created by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -532,7 +532,7 @@ class AdministrativeActFileSelect(TableSelect):
             associated_model=Person),
         validators=[valid_id(Person)])
     history_modifier = forms.IntegerField(
-        label=_(u"Modified by"),
+        label=_("Modified by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
@@ -576,9 +576,9 @@ class AdministrativeActFileModifyFormSelection(
 
 
 class AdministrativeActFileForm(AdministrativeActForm):
-    form_admin_name = _(u"Archaeological file - Administrative act - General")
+    form_admin_name = _("Archaeological file - Administrative act - General")
     form_slug = "file-adminact-general"
-    act_type = forms.ChoiceField(label=_(u"Act type"), choices=[])
+    act_type = forms.ChoiceField(label=_("Act type"), choices=[])
 
     TYPES = [
         FieldType('act_type', ActType,