UI: manage localissation of date input fields

1 files changed, 27 insertions, 37 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index ce87685a2..4f37bfc2d 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -40,7 +40,7 @@ from ishtar_common.models import valid_id, Person, Town, \
     organization_type_pk_lazy
 
 from ishtar_common.wizards import MultiValueDict
-from bootstrap_datepicker.widgets import DatePicker
+from bootstrap_datepicker.widgets import DateField
 
 from archaeological_files.models import File
 import models
@@ -526,14 +526,10 @@ class OperationSelect(TableSelect):
     #                                      max_length=20)
     remains = forms.ChoiceField(label=_(u"Remains"), choices=[])
     periods = forms.ChoiceField(label=_(u"Periods"), choices=[])
-    start_before = forms.DateField(label=_(u"Started before"),
-                                   widget=DatePicker)
-    start_after = forms.DateField(label=_(u"Started after"),
-                                  widget=DatePicker)
-    end_before = forms.DateField(label=_(u"Ended before"),
-                                 widget=DatePicker)
-    end_after = forms.DateField(label=_(u"Ended after"),
-                                widget=DatePicker)
+    start_before = DateField(label=_(u"Started before"))
+    start_after = DateField(label=_(u"Started after"))
+    end_before = DateField(label=_(u"Ended before"))
+    end_after = DateField(label=_(u"Ended after"))
     relation_types = forms.MultipleChoiceField(
         label=_(u"Search within relations"), choices=[],
         widget=forms.CheckboxSelectMultiple)
@@ -564,16 +560,16 @@ class OperationSelect(TableSelect):
                          args=['0', 'user']),
             associated_model=Person),
         validators=[valid_id(Person)])
-    documentation_deadline_before = forms.DateField(
-        label=_(u"Documentation deadline before"), widget=DatePicker)
-    documentation_deadline_after = forms.DateField(
-        label=_(u"Documentation deadline after"), widget=DatePicker)
+    documentation_deadline_before = DateField(
+        label=_(u"Documentation deadline before"))
+    documentation_deadline_after = DateField(
+        label=_(u"Documentation deadline after"))
     documentation_received = forms.NullBooleanField(
         label=_(u"Documentation received"))
-    finds_deadline_before = forms.DateField(
-        label=_(u"Finds deadline before"), widget=DatePicker)
-    finds_deadline_after = forms.DateField(
-        label=_(u"Finds deadline after"), widget=DatePicker)
+    finds_deadline_before = DateField(
+        label=_(u"Finds deadline before"))
+    finds_deadline_after = DateField(
+        label=_(u"Finds deadline after"))
     finds_received = forms.NullBooleanField(
         label=_(u"Finds received"))
 
@@ -708,10 +704,8 @@ class DashboardForm(IshtarForm):
                                        required=False)
     operator = forms.ChoiceField(label=_("Operator"), choices=[],
                                  required=False)
-    after = forms.DateField(label=_(u"Date after"),
-                            widget=DatePicker, required=False)
-    before = forms.DateField(label=_(u"Date before"),
-                             widget=DatePicker, required=False)
+    after = DateField(label=_(u"Date after"), required=False)
+    before = DateField(label=_(u"Date before"), required=False)
     with_report = forms.BooleanField(label=_("With reports"), required=False)
     with_finds = forms.BooleanField(label=_("With finds"), required=False)
 
@@ -833,19 +827,15 @@ class OperationFormGeneral(CustomForm, ManageOldType):
         label=_(u"Total surface (m2)"),
         validators=[validators.MinValueValidator(0),
                     validators.MaxValueValidator(999999999)])
-    start_date = forms.DateField(
-        label=_(u"Start date"), required=False, widget=DatePicker)
-    excavation_end_date = forms.DateField(
-        label=_(u"Excavation end date"), required=False,
-        widget=DatePicker)
-    report_delivery_date = forms.DateField(
-        label=_(u"Report delivery date"), required=False,
-        widget=DatePicker)
+    start_date = DateField(label=_(u"Start date"), required=False)
+    excavation_end_date = DateField(label=_(u"Excavation end date"),
+                                    required=False)
+    report_delivery_date = DateField(label=_(u"Report delivery date"),
+                                     required=False)
     report_processing = forms.ChoiceField(label=_(u"Report processing"),
                                           choices=[], required=False)
     if settings.COUNTRY == 'fr':
-        cira_date = forms.DateField(label=u"Date avis CIRA", required=False,
-                                    widget=DatePicker)
+        cira_date = DateField(label=u"Date avis CIRA", required=False)
         negative_result = forms.NullBooleanField(
             required=False, label=u"Résultat considéré comme négatif")
         cira_rapporteur = forms.IntegerField(
@@ -860,14 +850,14 @@ class OperationFormGeneral(CustomForm, ManageOldType):
                     person_type_pk_lazy('head_scientist')]},
                 associated_model=Person, new=True),
             validators=[valid_id(Person)], required=False)
-    documentation_deadline = forms.DateField(
+    documentation_deadline = DateField(
         label=_(u"Deadline for submission of the documentation"),
-        required=False, widget=DatePicker)
+        required=False)
     documentation_received = forms.NullBooleanField(
         required=False, label=_(u"Documentation received"))
-    finds_deadline = forms.DateField(
+    finds_deadline = DateField(
         label=_(u"Deadline for submission of the finds"), required=False,
-        widget=DatePicker)
+    )
     finds_received = forms.NullBooleanField(
         required=False, label=_(u"Finds received"))
 
@@ -1422,8 +1412,8 @@ class AdministrativeActOpeForm(CustomForm, ManageOldType):
     #     validators=[valid_id(Person)], required=False)
     act_object = forms.CharField(label=_(u"Object"), max_length=300,
                                  widget=forms.Textarea, required=False)
-    signature_date = forms.DateField(
-        label=_(u"Signature date"), initial=get_now, widget=DatePicker)
+    signature_date = DateField(
+        label=_(u"Signature date"), initial=get_now)
     if settings.COUNTRY == 'fr':
         ref_sra = forms.CharField(label=u"Autre référence", max_length=15,
                                   required=False)