diff --git a/package.json b/package.json index 7f1aad1059..9266d3b01b 100644 --- a/package.json +++ b/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" } } diff --git a/resources/www/common/js/components/common.js b/resources/www/common/js/components/common.js index 272011e0b5..5f5db50428 100644 --- a/resources/www/common/js/components/common.js +++ b/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 () { diff --git a/templates/web/admin/editusers_timelimit.html.twig b/templates/web/admin/editusers_timelimit.html.twig index b57f04556e..12009c600d 100644 --- a/templates/web/admin/editusers_timelimit.html.twig +++ b/templates/web/admin/editusers_timelimit.html.twig @@ -37,41 +37,45 @@ diff --git a/templates/web/admin/editusers_timelimit_sbas.html.twig b/templates/web/admin/editusers_timelimit_sbas.html.twig index dc53730c44..8c795acba1 100644 --- a/templates/web/admin/editusers_timelimit_sbas.html.twig +++ b/templates/web/admin/editusers_timelimit_sbas.html.twig @@ -33,45 +33,48 @@