Fix localization in datepicker - admin

resources/www/common/js/components/common.js

@@ -1,4 +1,5 @@
 var p4 = p4 || {};
+var datepickerLang = [];
 
 var commonModule = (function ($, p4) {
     $(document).ready(function () {
@@ -13,7 +14,7 @@ var commonModule = (function ($, p4) {
 
         var locale = $.cookie('locale');
 
-        var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : 'en';
+        var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : $('html').attr('lang');
 
         if (jq_date == 'en') {
             jq_date = 'en-GB';
@@ -21,6 +22,7 @@ var commonModule = (function ($, p4) {
 
         $.datepicker.setDefaults({showMonthAfterYear: false});
         $.datepicker.setDefaults($.datepicker.regional[jq_date]);
+        datepickerLang = $.datepicker.regional[jq_date];
 
         var cache = $('#mainMenu .helpcontextmenu');
         $('.context-menu-item', cache).hover(function () {

templates/web/admin/editusers_timelimit.html.twig

@@ -37,41 +37,45 @@
 </form>
 
 <script type="text/javascript">
-datePicker();
+    $(document).ready(function () {
-function datePicker()
+        $.datepicker.setDefaults(datepickerLang);
-{
+        datePicker();
-  var dates = $('.dmin, .dmax');
+    });
-  $('.dmin').datepicker({
+
-    defaultDate: -10,
+    function datePicker()
-    changeMonth: true,
+    {
-    changeYear: true,
+      var dates = $('.dmin, .dmax');
-    dateFormat:'yy-mm-dd',
+      $('.dmin').datepicker({
-    numberOfMonths: 3,
+        defaultDate: -10,
-    onSelect: function(selectedDate, instance) {
+        changeMonth: true,
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+        changeYear: true,
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+        dateFormat:'yy-mm-dd',
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      $('.dmax').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      {% if datas.limited_to %}
+        var instance = $('.dmin').data("datepicker");
+        $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+      {% endif %}
+      {% if datas.limited_from %}
+        var instance = $('.dmax').data("datepicker");
+        $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+      {% endif %}
     }
-  });
-  $('.dmax').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
-    }
-  });
-  {% if datas.limited_to %}
-    var instance = $('.dmin').data("datepicker");
-    $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
-  {% endif %}
-  {% if datas.limited_from %}
-    var instance = $('.dmax').data("datepicker");
-    $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
-  {% endif %}
-}
 </script>

templates/web/admin/editusers_timelimit_sbas.html.twig

@@ -33,45 +33,48 @@
 </form>
 
 <script type="text/javascript">
-datePicker();
+    $(document).ready(function () {
-function datePicker()
+        $.datepicker.setDefaults(datepickerLang);
-{
+        datePicker();
-  var dates = $('.dmin, .dmax');
+    });
-  $('.dmin').datepicker({
+    function datePicker()
-    defaultDate: -10,
+    {
-    changeMonth: true,
+      var dates = $('.dmin, .dmax');
-    changeYear: true,
+      $('.dmin').datepicker({
-    dateFormat:'yy-mm-dd',
+        defaultDate: -10,
-    numberOfMonths: 3,
+        changeMonth: true,
-    onSelect: function(selectedDate, instance) {
+        changeYear: true,
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+        dateFormat:'yy-mm-dd',
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+        numberOfMonths: 3,
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      $('.dmax').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      {% if datas.limited_to %}
+        var instance = $('.dmin').data("ui-datepicker");
+        if (instance) {
+            $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+        }
+      {% endif %}
+      {% if datas.limited_from %}
+        var instance = $('.dmax').data("ui-datepicker");
+        if (instance) {
+            $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+        }
+      {% endif %}
     }
-  });
-  $('.dmax').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
-    }
-  });
-  {% if datas.limited_to %}
-    var instance = $('.dmin').data("ui-datepicker");
-    if (instance) {
-        $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
-    }
-  {% endif %}
-  {% if datas.limited_from %}
-    var instance = $('.dmax').data("ui-datepicker");
-    if (instance) {
-        $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
-    }
-  {% endif %}
-}
 </script>