Fixing datetimepicker to work with more date formats

Luan
1 parent 00ddd60e
Showing 3 changed files with 18 additions and 7 deletions Show diff stats
src/colab/custom_settings.py
src/search/views.py
src/templates/search/search.html
@@ -13,6 +13,11 @@ LANGUAGES = (
     ('pt-br', gettext('Portuguese')),
 )
+DJANGO_DATE_FORMAT_TO_JS = {
+    'pt-br': ('pt-BR', 'dd/MM/yyyy'),
+    'en': ('en', 'MM/dd/yyyy'),
+}
+
 LANGUAGE_CODE = 'pt-br'
 # ORDERING_DATA receives the options to order for as it's keys and a dict as
@@ -8,6 +8,11 @@ from haystack.views import SearchView
 class ColabSearchView(SearchView):
     def extra_context(self, *args, **kwargs):
+
+        use_language, date_format = settings.DJANGO_DATE_FORMAT_TO_JS.get(
+            self.request.LANGUAGE_CODE
+        )
+
         types = {
             'wiki': {
                 'name': _(u'Wiki'),
@@ -111,5 +116,7 @@ class ColabSearchView(SearchView):
         return dict(
             filters=types.get(type_chosen),
             type_chosen=type_chosen,
-            order_data=settings.ORDERING_DATA
+            order_data=settings.ORDERING_DATA,
+            date_format=date_format,
+            use_language=use_language,
         )
@@ -3,15 +3,14 @@
 {% block head_js %}
 <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-{% if LANGUAGE_CODE == "pt-br" %}
-  <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.pt-BR.js"></script>
-{% endif %}
+<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script>
 <script type="text/javascript">
   $(function () {
     $('#datepicker_since, #datepicker_until').datetimepicker({
       pickTime: false,
-      {% if LANGUAGE_CODE == "pt-br" %}language: 'pt-BR'{% endif %}
+      language: '{{ use_language }}',
+      format: '{{ date_format }}',
     });
   });
 </script>
@@ -124,7 +123,7 @@
         <div class="form-group">
           <label for="since">{% trans "Since" %}</label>
             <div class="input-group date" id="datepicker_since">
-              <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" {% if LANGUAGE_CODE == 'pt-br' %}data-format="dd/MM/yyyy"{% endif %} />
+              <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
               <span class="input-group-addon">
                 <span class="glyphicon glyphicon-calendar"></span>
               </span>
@@ -133,7 +132,7 @@
         <div class="form-group">
           <label for="until">{% trans "Until" %}</label>
             <div class="input-group date" id="datepicker_until">
-              <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" {% if LANGUAGE_CODE == 'pt-br' %}data-format="dd/MM/yyyy"{% endif %} />
+              <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
               <span class="input-group-addon">
                 <span class="glyphicon glyphicon-calendar"></span>
               </span>