Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339

PHRAS-1516 Port PHRAS-1339

package.json

@@ -35,6 +35,6 @@
   },
   "dependencies": {
     "alchemy-embed-medias": "^0.4.4",
-    "phraseanet-production-client": "~0.19.24"
+    "phraseanet-production-client": "~0.32.2"
   }
 }

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,7 +37,11 @@
 </form>
 
 <script type="text/javascript">
+    $(document).ready(function () {
+        $.datepicker.setDefaults(datepickerLang);
         datePicker();
+    });
+
     function datePicker()
     {
       var dates = $('.dmin, .dmax');

templates/web/admin/editusers_timelimit_sbas.html.twig

@@ -33,7 +33,10 @@
 </form>
 
 <script type="text/javascript">
+    $(document).ready(function () {
+        $.datepicker.setDefaults(datepickerLang);
         datePicker();
+    });
     function datePicker()
     {
       var dates = $('.dmin, .dmax');