Refactoring - typo

1 files changed, 257 insertions, 257 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index be4465537..dad663624 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -104,7 +104,7 @@ class RecordFormSelection(CustomForm, forms.Form):
     base_models = ['get_first_base_find']
     associated_models = {'get_first_base_find__context_record': ContextRecord}
     get_first_base_find__context_record = forms.IntegerField(
-        label=_(u"Context record"),
+        label=_("Context record"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-contextrecord'),
             associated_model=ContextRecord),
@@ -164,17 +164,17 @@ class BasicFindForm(CustomForm, ManageOldType):
         'clutter_height', 'dimensions_comment', 'checked_type', 'check_date'
     ]
     HEADERS = {}
-    HEADERS['label'] = FormHeader(_(u"Identification"))
+    HEADERS['label'] = FormHeader(_("Identification"))
 
     label = forms.CharField(
-        label=_(u"Free ID"),
+        label=_("Free ID"),
         validators=[validators.MaxLengthValidator(60)])
-    denomination = forms.CharField(label=_(u"Denomination"), required=False)
+    denomination = forms.CharField(label=_("Denomination"), required=False)
     previous_id = forms.CharField(label=_("Previous ID"), required=False)
-    museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
-    laboratory_id = forms.CharField(label=_(u"Laboratory ID"), required=False)
-    seal_number = forms.CharField(label=_(u"Seal number"), required=False)
-    mark = forms.CharField(label=_(u"Mark"), required=False)
+    museum_id = forms.CharField(label=_("Museum ID"), required=False)
+    laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False)
+    seal_number = forms.CharField(label=_("Seal number"), required=False)
+    mark = forms.CharField(label=_("Mark"), required=False)
     #collection = forms.IntegerField(
     #    label=_("Collection (warehouse)"),
     #    widget=widgets.JQueryAutoComplete(
@@ -182,80 +182,80 @@ class BasicFindForm(CustomForm, ManageOldType):
     #        associated_model=Warehouse, new=True),
     #    validators=[valid_id(Warehouse)], required=False)
 
-    HEADERS['description'] = FormHeader(_(u"Description"))
-    description = forms.CharField(label=_(u"Description"),
+    HEADERS['description'] = FormHeader(_("Description"))
+    description = forms.CharField(label=_("Description"),
                                   widget=forms.Textarea, required=False)
     public_description = forms.CharField(
         label=_("Public description"), widget=forms.Textarea, required=False)
-    is_complete = forms.NullBooleanField(label=_(u"Is complete?"),
+    is_complete = forms.NullBooleanField(label=_("Is complete?"),
                                          required=False)
     material_type = widgets.Select2MultipleField(
-        label=_(u"Material types"), required=False
+        label=_("Material types"), required=False
     )
     material_type_quality = forms.ChoiceField(
-        label=_(u"Material type quality"), required=False, choices=[])
+        label=_("Material type quality"), required=False, choices=[])
     material_comment = forms.CharField(
-        label=_(u"Comment on the material"), required=False,
+        label=_("Comment on the material"), required=False,
         widget=forms.Textarea)
     object_type = widgets.Select2MultipleField(
-        label=_(u"Object types"), required=False,
+        label=_("Object types"), required=False,
     )
     object_type_quality = forms.ChoiceField(
-        label=_(u"Object type quality"), required=False, choices=[])
-    find_number = forms.IntegerField(label=_(u"Find number"), required=False)
+        label=_("Object type quality"), required=False, choices=[])
+    find_number = forms.IntegerField(label=_("Find number"), required=False)
     min_number_of_individuals = forms.IntegerField(
-        label=_(u"Minimum number of individuals (MNI)"), required=False)
+        label=_("Minimum number of individuals (MNI)"), required=False)
 
-    decoration = forms.CharField(label=_(u"Decoration"), widget=forms.Textarea,
+    decoration = forms.CharField(label=_("Decoration"), widget=forms.Textarea,
                                  required=False)
-    inscription = forms.CharField(label=_(u"Inscription"),
+    inscription = forms.CharField(label=_("Inscription"),
                                   widget=forms.Textarea, required=False)
     manufacturing_place = forms.CharField(
-        label=_(u"Manufacturing place"), required=False)
+        label=_("Manufacturing place"), required=False)
     communicabilitie = widgets.Select2MultipleField(
-        label=_(u"Communicability"), required=False
+        label=_("Communicability"), required=False
     )
-    comment = forms.CharField(label=_(u"Comment"), required=False,
+    comment = forms.CharField(label=_("Comment"), required=False,
                               widget=forms.Textarea)
     cultural_attribution = widgets.Select2MultipleField(
         label=_("Cultural attribution"), required=False,
     )
     dating_comment = forms.CharField(
-        label=_(u"Comment on dating"), required=False, widget=forms.Textarea)
+        label=_("Comment on dating"), required=False, widget=forms.Textarea)
 
-    HEADERS['length'] = FormHeader(_(u"Dimensions"))
-    length = FloatField(label=_(u"Length (cm)"),
+    HEADERS['length'] = FormHeader(_("Dimensions"))
+    length = FloatField(label=_("Length (cm)"),
                         widget=widgets.CentimeterMeterWidget, required=False)
-    width = FloatField(label=_(u"Width (cm)"), required=False,
+    width = FloatField(label=_("Width (cm)"), required=False,
                        widget=widgets.CentimeterMeterWidget)
-    height = FloatField(label=_(u"Height (cm)"),
+    height = FloatField(label=_("Height (cm)"),
                         widget=widgets.CentimeterMeterWidget, required=False)
-    thickness = FloatField(label=_(u"Thickness (cm)"),
+    thickness = FloatField(label=_("Thickness (cm)"),
                            widget=widgets.CentimeterMeterWidget, required=False)
-    diameter = FloatField(label=_(u"Diameter (cm)"),
+    diameter = FloatField(label=_("Diameter (cm)"),
                           widget=widgets.CentimeterMeterWidget, required=False)
     circumference = FloatField(
-        label=_(u"Circumference (cm)"), widget=widgets.CentimeterMeterWidget,
+        label=_("Circumference (cm)"), widget=widgets.CentimeterMeterWidget,
         required=False)
-    volume = FloatField(label=_(u"Volume (l)"), required=False)
-    weight = FloatField(label=_(u"Weight (g)"),
+    volume = FloatField(label=_("Volume (l)"), required=False)
+    weight = FloatField(label=_("Weight (g)"),
                         widget=widgets.GramKilogramWidget, required=False)
     clutter_long_side = FloatField(
-        label=_(u"Clutter long side (cm)"),
+        label=_("Clutter long side (cm)"),
         widget=widgets.CentimeterMeterWidget, required=False)
     clutter_short_side = FloatField(
-        label=_(u"Clutter short side (cm)"),
+        label=_("Clutter short side (cm)"),
         widget=widgets.CentimeterMeterWidget, required=False)
     clutter_height = FloatField(
-        label=_(u"Clutter height (cm)"),
+        label=_("Clutter height (cm)"),
         widget=widgets.CentimeterMeterWidget, required=False)
     dimensions_comment = forms.CharField(
-        label=_(u"Dimensions comment"), required=False, widget=forms.Textarea)
+        label=_("Dimensions comment"), required=False, widget=forms.Textarea)
 
-    HEADERS['checked_type'] = FormHeader(_(u"Sheet"))
-    checked_type = forms.ChoiceField(label=_(u"Check"), required=False)
+    HEADERS['checked_type'] = FormHeader(_("Sheet"))
+    checked_type = forms.ChoiceField(label=_("Check"), required=False)
     check_date = forms.DateField(
-        initial=get_now, label=_(u"Check date"), widget=DatePicker)
+        initial=get_now, label=_("Check date"), widget=DatePicker)
 
     TYPES = [
         FieldType('material_type', models.MaterialType, is_multiple=True,
@@ -286,7 +286,7 @@ class BasicFindForm(CustomForm, ManageOldType):
                 clutter_short_side > clutter_long_side:
             raise forms.ValidationError(
                 str(_(
-                    u"Clutter: short side cannot be bigger than the long side."
+                    "Clutter: short side cannot be bigger than the long side."
                 ))
             )
         return self.cleaned_data
@@ -329,32 +329,32 @@ class FindForm(BasicFindForm):
 
     HEADERS = BasicFindForm.HEADERS.copy()
     get_first_base_find__excavation_id = forms.CharField(
-        label=_(u"Excavation ID"), required=False)
+        label=_("Excavation ID"), required=False)
 
     get_first_base_find__discovery_date = forms.DateField(
-        label=_(u"Discovery date (exact or TPQ)"), widget=DatePicker,
+        label=_("Discovery date (exact or TPQ)"), widget=DatePicker,
         required=False)
     get_first_base_find__discovery_date_taq = forms.DateField(
-        label=_(u"Discovery date (TAQ)"), widget=DatePicker, required=False)
+        label=_("Discovery date (TAQ)"), widget=DatePicker, required=False)
     get_first_base_find__batch = forms.ChoiceField(
-        label=_(u"Batch/object"), choices=[],
+        label=_("Batch/object"), choices=[],
         required=False)
 
-    HEADERS['get_first_base_find__x'] = FormHeader(_(u"Coordinates"))
-    get_first_base_find__x = forms.FloatField(label=_(u"X"), required=False)
+    HEADERS['get_first_base_find__x'] = FormHeader(_("Coordinates"))
+    get_first_base_find__x = forms.FloatField(label=_("X"), required=False)
     get_first_base_find__estimated_error_x = \
-        forms.FloatField(label=_(u"Estimated error for X"), required=False)
-    get_first_base_find__y = forms.FloatField(label=_(u"Y"), required=False)
+        forms.FloatField(label=_("Estimated error for X"), required=False)
+    get_first_base_find__y = forms.FloatField(label=_("Y"), required=False)
     get_first_base_find__estimated_error_y = \
-        forms.FloatField(label=_(u"Estimated error for Y"), required=False)
-    get_first_base_find__z = forms.FloatField(label=_(u"Z"), required=False)
+        forms.FloatField(label=_("Estimated error for Y"), required=False)
+    get_first_base_find__z = forms.FloatField(label=_("Z"), required=False)
     get_first_base_find__estimated_error_z = \
-        forms.FloatField(label=_(u"Estimated error for Z"), required=False)
+        forms.FloatField(label=_("Estimated error for Z"), required=False)
     get_first_base_find__spatial_reference_system = \
-        forms.ChoiceField(label=_(u"Spatial Reference System"), required=False,
+        forms.ChoiceField(label=_("Spatial Reference System"), required=False,
                           choices=[])
     get_first_base_find__topographic_localisation = forms.CharField(
-        label=_(u"Point of topographic reference"),
+        label=_("Point of topographic reference"),
         required=False, max_length=120
     )
 
@@ -385,9 +385,9 @@ class FindForm(BasicFindForm):
         if taq and not tpq:
             raise forms.ValidationError(
                 str(_(
-                    u"Discovery date: if a TAQ date is provided a TPQ date has "
-                    u"to be informed. If you have a precise date fill only the "
-                    u"TPQ - discovery date field."))
+                    "Discovery date: if a TAQ date is provided a TPQ date has "
+                    "to be informed. If you have a precise date fill only the "
+                    "TPQ - discovery date field."))
             )
         elif tpq and taq and taq < tpq:
             raise forms.ValidationError(
@@ -406,8 +406,8 @@ class FindForm(BasicFindForm):
                 srs = None
         if x and y and not srs:
             raise forms.ValidationError(
-                _(u"You should at least provide X, Y and the spatial "
-                  u"reference system used."))
+                _("You should at least provide X, Y and the spatial "
+                  "reference system used."))
         if x and y and srs:
             try:
                 convert_coordinates_to_point(
@@ -429,7 +429,7 @@ class SimpleFindForm(BasicFindForm):
 class ResultingFindForm(CustomForm, ManageOldType):
     file_upload = True
     form_label = _("Resulting find")
-    form_admin_name = _(u"Treatment n-1 - 030 - Resulting find")
+    form_admin_name = _("Treatment n-1 - 030 - Resulting find")
     form_slug = "treatmentn1-030-resulting-find"
 
     associated_models = {
@@ -441,72 +441,72 @@ class ResultingFindForm(CustomForm, ManageOldType):
         'resulting_checked_type': models.CheckedType,
     }
     HEADERS = {}
-    HEADERS['resulting_label'] = FormHeader(_(u"Identification"))
+    HEADERS['resulting_label'] = FormHeader(_("Identification"))
 
     resulting_label = forms.CharField(
-        label=_(u"Free ID"),
+        label=_("Free ID"),
         validators=[validators.MaxLengthValidator(60)])
-    resulting_denomination = forms.CharField(label=_(u"Denomination"),
+    resulting_denomination = forms.CharField(label=_("Denomination"),
                                              required=False)
 
-    HEADERS['resulting_description'] = FormHeader(_(u"Description"))
+    HEADERS['resulting_description'] = FormHeader(_("Description"))
     resulting_description = forms.CharField(
-        label=_(u"Description"), widget=forms.Textarea, required=False)
+        label=_("Description"), widget=forms.Textarea, required=False)
     resulting_is_complete = forms.NullBooleanField(
-        label=_(u"Is complete?"), required=False)
+        label=_("Is complete?"), required=False)
     resulting_material_type = widgets.Select2MultipleField(
-        label=_(u"Material types"), required=False
+        label=_("Material types"), required=False
     )
     resulting_material_type_quality = forms.ChoiceField(
-        label=_(u"Material type quality"), required=False, choices=[])
+        label=_("Material type quality"), required=False, choices=[])
     resulting_object_type = widgets.Select2MultipleField(
-        label=_(u"Object types"), required=False,
+        label=_("Object types"), required=False,
     )
     resulting_object_type_quality = forms.ChoiceField(
-        label=_(u"Object type quality"), required=False, choices=[])
+        label=_("Object type quality"), required=False, choices=[])
     resulting_find_number = forms.IntegerField(
-        label=_(u"Find number"), required=False)
+        label=_("Find number"), required=False)
     resulting_min_number_of_individuals = forms.IntegerField(
-        label=_(u"Minimum number of individuals (MNI)"), required=False)
+        label=_("Minimum number of individuals (MNI)"), required=False)
 
     resulting_decoration = forms.CharField(
-        label=_(u"Decoration"), widget=forms.Textarea, required=False)
+        label=_("Decoration"), widget=forms.Textarea, required=False)
     resulting_inscription = forms.CharField(
-        label=_(u"Inscription"), widget=forms.Textarea, required=False)
+        label=_("Inscription"), widget=forms.Textarea, required=False)
     resulting_manufacturing_place = forms.CharField(
-        label=_(u"Manufacturing place"), required=False)
+        label=_("Manufacturing place"), required=False)
     resulting_communicabilitie = widgets.Select2MultipleField(
-        label=_(u"Communicability"), required=False
+        label=_("Communicability"), required=False
     )
-    resulting_comment = forms.CharField(label=_(u"Comment"), required=False,
+    resulting_comment = forms.CharField(label=_("Comment"), required=False,
                                         widget=forms.Textarea)
     resulting_dating_comment = forms.CharField(
-        label=_(u"Comment on dating"), required=False, widget=forms.Textarea)
-
-    HEADERS['resulting_length'] = FormHeader(_(u"Dimensions"))
-    resulting_length = FloatField(label=_(u"Length (cm)"), required=False)
-    resulting_width = FloatField(label=_(u"Width (cm)"), required=False)
-    resulting_height = FloatField(label=_(u"Height (cm)"), required=False)
-    resulting_diameter = FloatField(label=_(u"Diameter (cm)"), required=False)
-    resulting_circumference = FloatField(label=_(u"Circumference (cm)"),
+        label=_("Comment on dating"), required=False, widget=forms.Textarea)
+
+    HEADERS['resulting_length'] = FormHeader(_("Dimensions"))
+    resulting_length = FloatField(label=_("Length (cm)"), required=False)
+    resulting_width = FloatField(label=_("Width (cm)"), required=False)
+    resulting_height = FloatField(label=_("Height (cm)"), required=False)
+    resulting_diameter = FloatField(label=_("Diameter (cm)"), required=False)
+    resulting_circumference = FloatField(label=_("Circumference (cm)"),
                                          required=False)
-    resulting_thickness = FloatField(label=_(u"Thickness (cm)"), required=False)
-    resulting_volume = FloatField(label=_(u"Volume (l)"), required=False)
-    resulting_weight = FloatField(label=_(u"Weight (g)"), required=False)
+    resulting_thickness = FloatField(label=_("Thickness (cm)"), required=False)
+    resulting_volume = FloatField(label=_("Volume (l)"), required=False)
+    resulting_weight = FloatField(label=_("Weight (g)"), required=False)
     resulting_clutter_long_side = FloatField(
-        label=_(u"Clutter long side (cm)"), required=False)
+        label=_("Clutter long side (cm)"), required=False)
     resulting_clutter_short_side = FloatField(
-        label=_(u"Clutter short side (cm)"), required=False)
+        label=_("Clutter short side (cm)"), required=False)
     resulting_clutter_height = FloatField(
-        label=_(u"Clutter height (cm)"), required=False)
+        label=_("Clutter height (cm)"), required=False)
     resulting_dimensions_comment = forms.CharField(
-        label=_(u"Dimensions comment"), required=False, widget=forms.Textarea)
+        label=_("Dimensions comment"), required=False, widget=forms.Textarea)
 
-    HEADERS['resulting_checked_type'] = FormHeader(_(u"Sheet"))
-    resulting_checked_type = forms.ChoiceField(label=_(u"Check"),
+    HEADERS['resulting_checked_type'] = FormHeader(_("Sheet"))
+    resulting_checked_type = forms.ChoiceField(label=_("Check"),
                                                required=False)
     resulting_check_date = forms.DateField(
-        initial=get_now, label=_(u"Check date"), widget=DatePicker)
+        initial=get_now, label=_("Check date"), widget=DatePicker)
 
     TYPES = [
         FieldType('resulting_material_type', models.MaterialType,
@@ -526,26 +526,26 @@ class ResultingFindForm(CustomForm, ManageOldType):
 
 class ResultingFindsForm(CustomForm, ManageOldType):
     form_label = _("Resulting finds")
-    form_admin_name = _(u"Treatment 1-n - 030 - Resulting finds")
+    form_admin_name = _("Treatment 1-n - 030 - Resulting finds")
     form_slug = "treatment1n-030-resulting-finds"
     associated_models = {}
 
     resultings_number = forms.IntegerField(
-        label=_(u"Number of resulting finds"),
+        label=_("Number of resulting finds"),
         min_value=1
     )
     resultings_label = forms.CharField(
-        label=_(u"Prefix label for resulting finds"),
+        label=_("Prefix label for resulting finds"),
         validators=[validators.MaxLengthValidator(200)],
         help_text=_(
             'E.g.: with a prefix "item-", each resulting item will be named '
             '"item-1", "item-2", "item-3"')
     )
     resultings_start_number = forms.IntegerField(
-        label=_(u"Numbering starting from"), initial=1, min_value=0
+        label=_("Numbering starting from"), initial=1, min_value=0
     )
     resultings_basket_name = forms.CharField(
-        label=_(u"Name of the new basket containing the resulting items"),
+        label=_("Name of the new basket containing the resulting items"),
         max_length=200
     )
 
@@ -563,13 +563,13 @@ class ResultingFindsForm(CustomForm, ManageOldType):
         q = models.FindBasket.objects.filter(
             user=self.user, label=self.cleaned_data['resultings_basket_name'])
         if q.count():
-            raise forms.ValidationError(_(u"A basket with this label already "
-                                          u"exists."))
+            raise forms.ValidationError(_("A basket with this label already "
+                                          "exists."))
         return self.cleaned_data
 
 
 class QAFindFormMulti(QAForm):
-    form_admin_name = _(u"Find - Quick action - Modify")
+    form_admin_name = _("Find - Quick action - Modify")
     form_slug = "find-quickaction-modify"
     base_models = ['get_first_base_find', 'qa_object_types',
                    'qa_material_types', 'qa_communicabilities',
@@ -614,17 +614,17 @@ class QAFindFormMulti(QAForm):
         validators=[valid_id(ContextRecord)], required=False)
 
     qa_label = forms.CharField(
-        label=_(u"Free ID"),
+        label=_("Free ID"),
         validators=[validators.MaxLengthValidator(60)], required=False)
-    qa_denomination = forms.CharField(label=_(u"Denomination"), required=False)
+    qa_denomination = forms.CharField(label=_("Denomination"), required=False)
     qa_previous_id = forms.CharField(label=_("Previous ID"), required=False)
     qa_get_first_base_find__excavation_id = forms.CharField(
-        label=_(u"Excavation ID"), required=False)
-    qa_museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
-    qa_laboratory_id = forms.CharField(label=_(u"Laboratory ID"),
+        label=_("Excavation ID"), required=False)
+    qa_museum_id = forms.CharField(label=_("Museum ID"), required=False)
+    qa_laboratory_id = forms.CharField(label=_("Laboratory ID"),
                                        required=False)
-    qa_seal_number = forms.CharField(label=_(u"Seal number"), required=False)
-    qa_mark = forms.CharField(label=_(u"Mark"), required=False)
+    qa_seal_number = forms.CharField(label=_("Seal number"), required=False)
+    qa_mark = forms.CharField(label=_("Mark"), required=False)
     #qa_collection = forms.IntegerField(
     #    label=_("Collection"),
     #    widget=widgets.JQueryAutoComplete(
@@ -633,42 +633,42 @@ class QAFindFormMulti(QAForm):
     #    validators=[valid_id(Warehouse)], required=False)
 
     qa_description = forms.CharField(
-        label=_(u"Description"), widget=forms.Textarea, required=False)
+        label=_("Description"), widget=forms.Textarea, required=False)
     qa_material_types = widgets.Select2MultipleField(
-        label=_(u"Material types"), required=False
+        label=_("Material types"), required=False
     )
     qa_object_types = widgets.Select2MultipleField(
-        label=_(u"Object types"), required=False,
+        label=_("Object types"), required=False,
     )
     qa_manufacturing_place = forms.CharField(
-        label=_(u"Manufacturing place"), required=False)
+        label=_("Manufacturing place"), required=False)
     qa_communicabilities = widgets.Select2MultipleField(
-        label=_(u"Communicability"), required=False
+        label=_("Communicability"), required=False
     )
     qa_alterations = widgets.Select2MultipleField(
-        label=_(u"Alteration"), required=False
+        label=_("Alteration"), required=False
     )
     qa_alteration_causes = widgets.Select2MultipleField(
-        label=_(u"Alteration cause"), required=False
+        label=_("Alteration cause"), required=False
     )
     qa_conservatory_state = forms.ChoiceField(label=_("Conservatory state"),
                                               required=False, choices=[])
     qa_treatment_emergency = forms.ChoiceField(label=_("Treatment emergency"),
                                                choices=[], required=False)
     qa_comment = forms.CharField(
-        label=_(u"Comment"), required=False,
+        label=_("Comment"), required=False,
         widget=forms.Textarea)
 
-    qa_checked_type = forms.ChoiceField(label=_(u"Check"), required=False)
+    qa_checked_type = forms.ChoiceField(label=_("Check"), required=False)
     qa_check_date = forms.DateField(
-        label=_(u"Check date"), widget=DatePicker, required=False)
+        label=_("Check date"), widget=DatePicker, required=False)
     qa_appraisal_date = forms.DateField(
         label=_("Appraisal date"), widget=DatePicker, required=False)
 
     qa_period = widgets.Select2MultipleField(
         label=_("Period"), choices=[], required=False)
     qa_dating_comment = forms.CharField(
-        label=_(u"Comment on dating"), required=False,
+        label=_("Comment on dating"), required=False,
         widget=forms.Textarea)
 
     TYPES = [
@@ -722,7 +722,7 @@ class QAFindFormMulti(QAForm):
 
 class QAFindFormSingle(QAFindFormMulti):
     MULTI = False
-    form_admin_name = _(u"Find - Quick action - Modify single")
+    form_admin_name = _("Find - Quick action - Modify single")
     form_slug = "find-quickaction-modifysingle"
 
     def __init__(self, *args, **kwargs):
@@ -759,7 +759,7 @@ class QAFindBasketForm(IshtarForm):
         if self.cleaned_data['qa_bf_create_or_update'] == 'update':
             if not self.cleaned_data['qa_bf_basket']:
                 raise forms.ValidationError(
-                    _(u"On update, you have to select a basket."))
+                    _("On update, you have to select a basket."))
             q = Q(user=self.user) | Q(shared_write_with__pk=self.user.pk)
             q = models.FindBasket.objects.filter(q).filter(
                 pk=self.cleaned_data['qa_bf_basket'])
@@ -769,11 +769,11 @@ class QAFindBasketForm(IshtarForm):
             return self.cleaned_data
         label = self.cleaned_data['qa_bf_label'].strip()
         if not label:
-            raise forms.ValidationError(_(u"A label is required."))
+            raise forms.ValidationError(_("A label is required."))
         if models.FindBasket.objects.filter(user=self.user,
                                             label=label).count():
-            raise forms.ValidationError(_(u"A basket with this label already "
-                                          u"exists."))
+            raise forms.ValidationError(_("A basket with this label already "
+                                          "exists."))
         return self.cleaned_data
 
     def save(self, items):
@@ -826,16 +826,16 @@ class QAFindbasketDuplicateForm(IshtarForm):
         self.basket = kwargs.pop('items')[0]
         super(QAFindbasketDuplicateForm, self).__init__(*args, **kwargs)
         self.fields['label'].initial = self.basket.label + str(
-            _(u" - duplicate"))
+            _(" - duplicate"))
 
     def clean(self):
         label = self.cleaned_data['label'].strip()
         if not label:
-            raise forms.ValidationError(_(u"A label is required."))
+            raise forms.ValidationError(_("A label is required."))
         if models.FindBasket.objects.filter(user=self.user,
                                             label=label).count():
-            raise forms.ValidationError(_(u"A basket with this label already "
-                                          u"exists."))
+            raise forms.ValidationError(_("A basket with this label already "
+                                          "exists."))
         return self.cleaned_data
 
     def save(self):
@@ -845,7 +845,7 @@ class QAFindbasketDuplicateForm(IshtarForm):
 
 class PreservationForm(CustomForm, ManageOldType):
     form_label = _("Preservation")
-    form_admin_name = _(u"Find - 030 - Preservation")
+    form_admin_name = _("Find - 030 - Preservation")
     form_slug = "find-030-preservation"
     base_models = ['alteration', 'alteration_cause',
                    'preservation_to_consider', 'integritie', 'remarkabilitie']
@@ -859,30 +859,30 @@ class PreservationForm(CustomForm, ManageOldType):
         'integritie': models.IntegrityType,
     }
     integritie = forms.MultipleChoiceField(
-        label=_(u"Integrity / interest"), choices=[],
+        label=_("Integrity / interest"), choices=[],
         widget=widgets.Select2Multiple, required=False)
     remarkabilitie = forms.MultipleChoiceField(
-        label=_(u"Remarkability"), choices=[],
+        label=_("Remarkability"), choices=[],
         widget=widgets.Select2Multiple, required=False)
-    conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"),
+    conservatory_state = forms.ChoiceField(label=_("Conservatory state"),
                                            choices=[], required=False)
     alteration = forms.MultipleChoiceField(
-        label=_(u"Alteration"), choices=[],
+        label=_("Alteration"), choices=[],
         widget=widgets.Select2Multiple, required=False)
     alteration_cause = forms.MultipleChoiceField(
-        label=_(u"Alteration cause"), choices=[],
+        label=_("Alteration cause"), choices=[],
         widget=widgets.Select2Multiple, required=False)
     preservation_to_consider = forms.MultipleChoiceField(
         label=_("Recommended treatments"), choices=[],
         widget=widgets.Select2Multiple, required=False)
     treatment_emergency = forms.ChoiceField(label=_("Treatment emergency"),
                                             choices=[], required=False)
-    estimated_value = FloatField(label=_(u"Estimated value"), required=False)
-    insurance_value = FloatField(label=_(u"Insurance value"), required=False)
+    estimated_value = FloatField(label=_("Estimated value"), required=False)
+    insurance_value = FloatField(label=_("Insurance value"), required=False)
     appraisal_date = forms.DateField(
-        label=_(u"Appraisal date"), widget=DatePicker, required=False)
+        label=_("Appraisal date"), widget=DatePicker, required=False)
     conservatory_comment = forms.CharField(
-        label=_(u"Conservatory comment"), required=False,
+        label=_("Conservatory comment"), required=False,
         widget=forms.Textarea)
 
     TYPES = [
@@ -914,9 +914,9 @@ class DateForm(ManageOldType, forms.Form):
                          'quality': DatingQuality,
                          'period': Period}
     period = forms.ChoiceField(label=_("Period"), choices=[])
-    start_date = forms.IntegerField(label=_(u"Start date"),
+    start_date = forms.IntegerField(label=_("Start date"),
                                     required=False)
-    end_date = forms.IntegerField(label=_(u"End date"), required=False)
+    end_date = forms.IntegerField(label=_("End date"), required=False)
     quality = forms.ChoiceField(label=_("Quality"), required=False,
                                 choices=[])
     dating_type = forms.ChoiceField(label=_("Dating type"),
@@ -933,7 +933,7 @@ class DateForm(ManageOldType, forms.Form):
 DatingFormSet = formset_factory(DateForm, can_delete=True,
                                 formset=FormSet)
 DatingFormSet.form_label = _("Dating")
-DatingFormSet.form_admin_name = _(u"Find - 040 - Dating")
+DatingFormSet.form_admin_name = _("Find - 040 - Dating")
 DatingFormSet.form_slug = "find-040-dating"
 
 
@@ -985,37 +985,37 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
     ]
 
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-finds', 'find'
         ))
-    label = forms.CharField(label=_(u"Free ID"))
-    denomination = forms.CharField(label=_(u"Denomination"))
-    previous_id = forms.CharField(label=_(u"Previous ID"))
-    base_finds__excavation_id = forms.CharField(label=_(u"Excavation ID"))
-    seal_number = forms.CharField(label=_(u"Seal number"))
-    museum_id = forms.CharField(label=_(u"Museum ID"))
-    laboratory_id = forms.CharField(label=_(u"Laboratory ID"))
-    mark = forms.CharField(label=_(u"Mark"))
+    label = forms.CharField(label=_("Free ID"))
+    denomination = forms.CharField(label=_("Denomination"))
+    previous_id = forms.CharField(label=_("Previous ID"))
+    base_finds__excavation_id = forms.CharField(label=_("Excavation ID"))
+    seal_number = forms.CharField(label=_("Seal number"))
+    museum_id = forms.CharField(label=_("Museum ID"))
+    laboratory_id = forms.CharField(label=_("Laboratory ID"))
+    mark = forms.CharField(label=_("Mark"))
 
     base_finds__cache_short_id = forms.CharField(
-        label=_(u"Base find - Short ID"))
+        label=_("Base find - Short ID"))
     base_finds__cache_complete_id = forms.CharField(
-        label=_(u"Base find - Complete ID"))
+        label=_("Base find - Complete ID"))
     base_finds__context_record__town = get_town_field()
     base_finds__context_record__operation__year = forms.IntegerField(
-        label=_(u"Year"))
+        label=_("Year"))
     base_finds__context_record__operation__operation_code = forms.IntegerField(
-        label=_(u"Operation's number (index by year)"))
+        label=_("Operation's number (index by year)"))
     base_finds__context_record__operation__code_patriarche = \
         forms.IntegerField(
-            label=_(u"Code PATRIARCHE"),
+            label=_("Code PATRIARCHE"),
             widget=OAWidget
         )
     base_finds__context_record__operation__operation_type = forms.ChoiceField(
-        label=_(u"Operation type"), choices=[]
+        label=_("Operation type"), choices=[]
     )
     base_finds__context_record__town__areas = forms.ChoiceField(
-        label=_(u"Areas"), choices=[]
+        label=_("Areas"), choices=[]
     )
     archaeological_sites = forms.IntegerField(
         label=_("Archaeological site (attached to the operation)"),
@@ -1024,7 +1024,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             associated_model=ArchaeologicalSite),
         validators=[valid_id(ArchaeologicalSite)])
     archaeological_sites_name = forms.CharField(
-        label=_(u"Archaeological site name (attached to the operation)")
+        label=_("Archaeological site name (attached to the operation)")
     )
     archaeological_sites_context_record = forms.IntegerField(
         label=_("Archaeological site (attached to the context record)"),
@@ -1033,7 +1033,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             associated_model=ArchaeologicalSite),
         validators=[valid_id(ArchaeologicalSite)])
     archaeological_sites_context_record_name = forms.CharField(
-        label=_(u"Archaeological site name (attached to the context record)")
+        label=_("Archaeological site name (attached to the context record)")
     )
     base_finds__context_record = forms.IntegerField(
         label=_("Context record"),
@@ -1042,40 +1042,40 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             associated_model=ContextRecord),
         validators=[valid_id(ContextRecord)])
     ope_relation_types = forms.ChoiceField(
-        label=_(u"Search within related operations"), choices=[])
+        label=_("Search within related operations"), choices=[])
     cr_relation_types = forms.ChoiceField(
-        label=_(u"Search within related context records"), choices=[])
+        label=_("Search within related context records"), choices=[])
 
     basket = forms.IntegerField(
-        label=_(u"Basket"),
+        label=_("Basket"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-findbasket'),
             associated_model=models.FindBasket),
         validators=[valid_id(models.FindBasket)])
 
-    description = forms.CharField(label=_(u"Description"))
+    description = forms.CharField(label=_("Description"))
     base_finds__discovery_date__after = forms.DateField(
-        label=_(u"Discovery date after"), widget=DatePicker
+        label=_("Discovery date after"), widget=DatePicker
     )
     base_finds__discovery_date__before = forms.DateField(
-        label=_(u"Discovery date before"), widget=DatePicker
+        label=_("Discovery date before"), widget=DatePicker
     )
     base_finds__discovery_date_tpq__after = forms.DateField(
-        label=_(u"Discovery date (exact or TPQ) after"), widget=DatePicker
+        label=_("Discovery date (exact or TPQ) after"), widget=DatePicker
     )
     base_finds__discovery_date_tpq__before = forms.DateField(
-        label=_(u"Discovery date (exact or TPQ) before"), widget=DatePicker
+        label=_("Discovery date (exact or TPQ) before"), widget=DatePicker
     )
     base_finds__discovery_date_taq__after = forms.DateField(
-        label=_(u"Discovery date (TAQ) after"), widget=DatePicker
+        label=_("Discovery date (TAQ) after"), widget=DatePicker
     )
     base_finds__discovery_date_taq__before = forms.DateField(
-        label=_(u"Discovery date (TAQ) before"), widget=DatePicker
+        label=_("Discovery date (TAQ) before"), widget=DatePicker
     )
-    base_finds__batch = forms.ChoiceField(label=_(u"Batch/object"), choices=[])
-    is_complete = forms.NullBooleanField(label=_(u"Is complete?"))
+    base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[])
+    is_complete = forms.NullBooleanField(label=_("Is complete?"))
     material_types = forms.IntegerField(
-        label=_(u"Material type"),
+        label=_("Material type"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-materialtype'),
             associated_model=models.MaterialType),
@@ -1084,113 +1084,113 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
                                               choices=[])
     material_comment = forms.CharField(label=_("Comment on the material"))
     object_types = forms.IntegerField(
-        label=_(u"Object type"),
+        label=_("Object type"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-objecttype'),
             associated_model=models.ObjectType),
     )
     object_type_quality = forms.ChoiceField(
-        label=_(u"Object type quality"), choices=[])
+        label=_("Object type quality"), choices=[])
 
-    find_number = forms.IntegerField(label=_(u"Find number"))
+    find_number = forms.IntegerField(label=_("Find number"))
     min_number_of_individuals = forms.IntegerField(
-        label=_(u"Minimum number of individuals (MNI)"))
+        label=_("Minimum number of individuals (MNI)"))
 
-    manufacturing_place = forms.CharField(label=_(u"Manufacturing place"))
-    decoration = forms.CharField(label=_(u"Decoration"))
-    inscription = forms.CharField(label=_(u"Inscription"))
+    manufacturing_place = forms.CharField(label=_("Manufacturing place"))
+    decoration = forms.CharField(label=_("Decoration"))
+    inscription = forms.CharField(label=_("Inscription"))
 
-    communicabilities = forms.ChoiceField(label=_(u"Communicability"))
-    comment = forms.CharField(label=_(u"Comment"))
+    communicabilities = forms.ChoiceField(label=_("Communicability"))
+    comment = forms.CharField(label=_("Comment"))
 
     cultural_attributions = forms.ChoiceField(
         label=_("Cultural attribution"), choices=[], required=False)
-    dating_comment = forms.CharField(label=_(u"Comment on dating"))
+    dating_comment = forms.CharField(label=_("Comment on dating"))
 
-    length__higher = FloatField(label=_(u"Length - higher than (cm)"),
+    length__higher = FloatField(label=_("Length - higher than (cm)"),
                                 widget=widgets.CentimeterMeterWidget)
-    length__lower = FloatField(label=_(u"Length - lower than (cm)"),
+    length__lower = FloatField(label=_("Length - lower than (cm)"),
                                widget=widgets.CentimeterMeterWidget)
     width__lower = FloatField(
-        label=_(u"Width - lower than (cm)"),
+        label=_("Width - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     width__higher = FloatField(
-        label=_(u"Width - higher than (cm)"),
+        label=_("Width - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     height__lower = FloatField(
-        label=_(u"Height - lower than (cm)"),
+        label=_("Height - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     height__higher = FloatField(
-        label=_(u"Height - higher than (cm)"),
+        label=_("Height - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     thickness__lower = FloatField(
-        label=_(u"Thickness - lower than (cm)"),
+        label=_("Thickness - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     thickness__higher = FloatField(
-        label=_(u"Thickness - higher than (cm)"),
+        label=_("Thickness - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     diameter__lower = FloatField(
-        label=_(u"Diameter - lower than (cm)"),
+        label=_("Diameter - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     diameter__higher = FloatField(
-        label=_(u"Diameter - higher than (cm)"),
+        label=_("Diameter - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     circumference__lower = FloatField(
-        label=_(u"Circumference - lower than (cm)"),
+        label=_("Circumference - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     circumference__higher = FloatField(
-        label=_(u"Circumference - higher than (cm)"),
+        label=_("Circumference - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
-    volume__lower = FloatField(label=_(u"Volume - lower than (l)"))
-    volume__higher = FloatField(label=_(u"Volume - higher than (l)"))
+    volume__lower = FloatField(label=_("Volume - lower than (l)"))
+    volume__higher = FloatField(label=_("Volume - higher than (l)"))
     weight__lower = FloatField(
-        label=_(u"Weight - lower than (g)"),
+        label=_("Weight - lower than (g)"),
         widget=widgets.GramKilogramWidget)
     weight__higher = FloatField(
-        label=_(u"Weight - higher than (g)"),
+        label=_("Weight - higher than (g)"),
         widget=widgets.GramKilogramWidget)
     clutter_long_side__lower = FloatField(
-        label=_(u"Clutter long side - lower than (cm)"),
+        label=_("Clutter long side - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     clutter_long_side__higher = FloatField(
-        label=_(u"Clutter long side - higher than (cm)"),
+        label=_("Clutter long side - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     clutter_short_side__lower = FloatField(
-        label=_(u"Clutter short side - lower than (cm)"),
+        label=_("Clutter short side - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     clutter_short_side__higher = FloatField(
-        label=_(u"Clutter short side - higher than (cm)"),
+        label=_("Clutter short side - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     clutter_height__lower = FloatField(
-        label=_(u"Clutter height - lower than (cm)"),
+        label=_("Clutter height - lower than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     clutter_height__higher = FloatField(
-        label=_(u"Clutter height - higher than (cm)"),
+        label=_("Clutter height - higher than (cm)"),
         widget=widgets.CentimeterMeterWidget)
     dimensions_comment = forms.CharField(
-        label=_(u"Dimensions comment"))
+        label=_("Dimensions comment"))
 
     base_finds__topographic_localisation = forms.CharField(
-        label=_(u"Point of topographic reference"),
+        label=_("Point of topographic reference"),
     )
     checked_type = forms.ChoiceField(label=_("Check"))
     check_date__after = forms.DateField(
-        label=_(u"Check date after"), widget=DatePicker
+        label=_("Check date after"), widget=DatePicker
     )
     check_date__before = forms.DateField(
-        label=_(u"Check date before"), widget=DatePicker
+        label=_("Check date before"), widget=DatePicker
     )
-    integrities = forms.ChoiceField(label=_(u"Integrity / interest"),
+    integrities = forms.ChoiceField(label=_("Integrity / interest"),
                                     choices=[])
-    remarkabilities = forms.ChoiceField(label=_(u"Remarkability"),
+    remarkabilities = forms.ChoiceField(label=_("Remarkability"),
                                         choices=[])
-    conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"),
+    conservatory_state = forms.ChoiceField(label=_("Conservatory state"),
                                            choices=[])
     conservatory_comment = forms.CharField(label=_("Conservatory comment"))
     alterations = forms.ChoiceField(
-        label=_(u"Alteration"), choices=[])
+        label=_("Alteration"), choices=[])
     alteration_causes = forms.ChoiceField(
-        label=_(u"Alteration cause"), choices=[])
+        label=_("Alteration cause"), choices=[])
     preservation_to_considers = forms.ChoiceField(
         choices=[], label=_("Recommended treatments"))
     treatment_emergency = forms.ChoiceField(
@@ -1198,19 +1198,19 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
     )
 
     estimated_value__higher = FloatField(
-        label=_(u"Estimated value - higher than"))
+        label=_("Estimated value - higher than"))
     estimated_value__lower = FloatField(
-        label=_(u"Estimated value - lower than"))
+        label=_("Estimated value - lower than"))
     insurance_value__higher = FloatField(
-        label=_(u"Insurance value - higher than"))
+        label=_("Insurance value - higher than"))
     insurance_value__lower = FloatField(
-        label=_(u"Insurance value - lower than"))
+        label=_("Insurance value - lower than"))
     appraisal_date__after = forms.DateField(
-        label=_(u"Appraisal date after"), widget=DatePicker)
+        label=_("Appraisal date after"), widget=DatePicker)
     appraisal_date__before = forms.DateField(
-        label=_(u"Appraisal date before"), widget=DatePicker)
+        label=_("Appraisal date before"), widget=DatePicker)
 
-    loan = forms.NullBooleanField(label=_(u"Loan?"))
+    loan = forms.NullBooleanField(label=_("Loan?"))
     treatments_file_end_date = forms.DateField(
         label=_("Treatment file end date before"), widget=DatePicker
     )
@@ -1293,9 +1293,9 @@ class FindSelectWarehouseModule(FindSelect):
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
     container_ref__index = forms.IntegerField(
-        label=_(u"Reference container ID"))
+        label=_("Reference container ID"))
     container_ref__reference = forms.CharField(
-        label=_(u"Reference container ref."))
+        label=_("Reference container ref."))
     """
     container = forms.IntegerField(
         label=_("Current container"),
@@ -1311,13 +1311,13 @@ class FindSelectWarehouseModule(FindSelect):
         validators=[valid_id(Warehouse)])
     """
     container__responsible = forms.IntegerField(
-        label=_(u"Current container - Warehouse (responsible)"),
+        label=_("Current container - Warehouse (responsible)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container__index = forms.IntegerField(label=_(u"Current container ID"))
-    container__reference = forms.CharField(label=_(u"Current container ref."))
+    container__index = forms.IntegerField(label=_("Current container ID"))
+    container__reference = forms.CharField(label=_("Current container ref."))
     """
 
 
@@ -1410,9 +1410,9 @@ class MultipleFindFormSelectionWarehouseModule(MultipleFindFormSelection):
 
 
 class FindMultipleFormSelection(forms.Form):
-    form_label = _(u"Upstream finds")
+    form_label = _("Upstream finds")
     associated_models = {'finds': models.Find}
-    associated_labels = {'finds': _(u"Finds")}
+    associated_labels = {'finds': _("Finds")}
     # using FindSelectWarehouseModule because this form is only used with
     # the warehouse module activated
     finds = forms.CharField(
@@ -1425,8 +1425,8 @@ class FindMultipleFormSelection(forms.Form):
 
     def clean(self):
         if 'finds' not in self.cleaned_data or not self.cleaned_data['finds']:
-            raise forms.ValidationError(_(u"You should at least select one "
-                                          u"archaeological find."))
+            raise forms.ValidationError(_("You should at least select one "
+                                          "archaeological find."))
         return self.cleaned_data
 
 
@@ -1528,17 +1528,17 @@ def check_treatment(form_name, type_key, type_list=[], not_type_list=[]):
 
 
 class ResultFindForm(ManageOldType, forms.Form):
-    form_label = _(u"Resulting find")
+    form_label = _("Resulting find")
     associated_models = {'material_type': models.MaterialType}
     label = forms.CharField(
-        label=_(u"Free ID"),
+        label=_("Free ID"),
         validators=[validators.MaxLengthValidator(60)])
-    description = forms.CharField(label=_(u"Precise description"),
+    description = forms.CharField(label=_("Precise description"),
                                   widget=forms.Textarea)
-    material_type = forms.ChoiceField(label=_(u"Material type"), choices=[])
-    volume = forms.IntegerField(label=_(u"Volume (l)"))
-    weight = forms.IntegerField(label=_(u"Weight (g)"))
-    find_number = forms.IntegerField(label=_(u"Find number"))
+    material_type = forms.ChoiceField(label=_("Material type"), choices=[])
+    volume = forms.IntegerField(label=_("Volume (l)"))
+    weight = forms.IntegerField(label=_("Weight (g)"))
+    find_number = forms.IntegerField(label=_("Find number"))
 
     TYPES = [
         FieldType('material_type', models.MaterialType)
@@ -1547,16 +1547,16 @@ class ResultFindForm(ManageOldType, forms.Form):
 
 ResultFindFormSet = formset_factory(ResultFindForm, can_delete=True,
                                     formset=FormSet)
-ResultFindFormSet.form_label = _(u"Resulting finds")
+ResultFindFormSet.form_label = _("Resulting finds")
 
 
 class FindDeletionForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to delete this find?")
+    confirm_end_msg = _("Would you like to delete this find?")
 
 
 class UpstreamFindFormSelection(MultiSearchForm, FindFormSelection):
-    form_label = _(u"Upstream finds")
+    form_label = _("Upstream finds")
     current_model = models.Find
     pk_key = 'resulting_pk'
     associated_models = {"resulting_pk": models.Find}
@@ -1587,14 +1587,14 @@ class SingleUpstreamFindFormSelection(UpstreamFindFormSelection):
 class FindBasketSelect(CustomForm, TableSelect):
     _model = models.FindBasket
 
-    form_admin_name = _(u"Find basket - 001 - Search")
+    form_admin_name = _("Find basket - 001 - Search")
     form_slug = "findbasket-001-search"
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-finds', 'findbasket'
         ))
 
-    label = forms.CharField(label=_(u"Denomination"))
+    label = forms.CharField(label=_("Denomination"))
 
 
 class FindBasketFormSelection(CustomFormSearch):
@@ -1628,24 +1628,24 @@ class FindBasketForWriteFormSelection(CustomFormSearch):
 
 
 class FindBasketForm(IshtarForm):
-    form_label = _(u"Find basket")
+    form_label = _("Find basket")
     associated_models = {"shared_with": IshtarUser,
                          "shared_write_with": IshtarUser}
     label = forms.CharField(
-        label=_(u"Label"),
+        label=_("Label"),
         validators=[validators.MaxLengthValidator(1000)])
     slug = forms.SlugField(label=_("Slug"), required=False)
     public = forms.BooleanField(label=_("Is public"), required=False)
-    comment = forms.CharField(label=_(u"Comment"),
+    comment = forms.CharField(label=_("Comment"),
                               widget=forms.Textarea, required=False)
     shared_with = widgets.Select2MultipleField(
         model=IshtarUser, remote=True,
-        label=_(u"Shared (read) with"),
+        label=_("Shared (read) with"),
         required=False, long_widget=True
     )
     shared_write_with = widgets.Select2MultipleField(
         model=IshtarUser, remote=True,
-        label=_(u"Shared (read/edit) with"),
+        label=_("Shared (read/edit) with"),
         required=False, long_widget=True
     )
 
@@ -1674,12 +1674,12 @@ class FindBasketForm(IshtarForm):
 class NewFindBasketForm(forms.ModelForm, IshtarForm):
     shared_with = widgets.Select2MultipleField(
         model=IshtarUser, remote=True,
-        label=_(u"Shared (read) with"),
+        label=_("Shared (read) with"),
         required=False, long_widget=True
     )
     shared_write_with = widgets.Select2MultipleField(
         model=IshtarUser, remote=True,
-        label=_(u"Shared (read/edit) with"),
+        label=_("Shared (read/edit) with"),
         required=False, long_widget=True
     )
 
@@ -1702,8 +1702,8 @@ class NewFindBasketForm(forms.ModelForm, IshtarForm):
         q = models.FindBasket.objects.filter(user=self.user,
                                              label=self.cleaned_data['label'])
         if q.count():
-            raise forms.ValidationError(_(u"Another basket already exists with "
-                                          u"this name."))
+            raise forms.ValidationError(_("Another basket already exists with "
+                                          "this name."))
         slug = self.cleaned_data.get('slug', None)
         if slug and slug.strip() and models.FindBasket.objects.filter(
                 slug=slug.strip()).count():
@@ -1717,12 +1717,12 @@ class NewFindBasketForm(forms.ModelForm, IshtarForm):
 
 
 class SelectFindBasketForm(IshtarForm):
-    form_label = _(u"Basket")
+    form_label = _("Basket")
     associated_models = {'basket': models.FindBasket}
     need_user_for_initialization = True
 
     basket = forms.IntegerField(
-        label=_(u"Basket"),
+        label=_("Basket"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-findbasket'),
             associated_model=models.FindBasket),
@@ -1738,12 +1738,12 @@ class SelectFindBasketForm(IshtarForm):
 
 
 class SelectFindBasketWriteForm(IshtarForm):
-    form_label = _(u"Basket")
+    form_label = _("Basket")
     associated_models = {'basket': models.FindBasket}
     need_user_for_initialization = True
 
     basket = forms.IntegerField(
-        label=_(u"Basket"),
+        label=_("Basket"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-findbasket-write'),
             associated_model=models.FindBasket),