From a0cad9ec8f606609cbc5f8a65afa4aabea6e417b Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Mon, 14 Aug 2017 10:26:52 +0400
Subject: [PATCH 1/3] Fix localization in datepicker - admin

---
 resources/www/common/js/components/common.js  |  4 +-
 .../web/admin/editusers_timelimit.html.twig   | 76 +++++++++--------
 .../admin/editusers_timelimit_sbas.html.twig  | 83 ++++++++++---------
 3 files changed, 86 insertions(+), 77 deletions(-)

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

From 427a6018bfa24b618988906158934ad55cc0b3f8 Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Fri, 25 Aug 2017 12:00:02 +0400
Subject: [PATCH 2/3] update dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fdbf9591b8..7f1aad1059 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "phraseanet",
   "version": "4.0.0",
   "devDependencies": {
-    "bower": "~1.3",
+    "bower": "^1.6.5",
     "bower-files": "^3.11.3",
     "browser-sync": "^2.10.0",
     "del": "^2.1.0",
@@ -16,7 +16,7 @@
     "gulp-install": "^0.6.0",
     "gulp-qunit": "^1.2.1",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^2.1.0",
+    "gulp-sass": "^3.1.0",
     "gulp-uglify": "^1.4.2",
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",

From b6e8e73dd7da4834e9b464b2de7985df7f4a4a87 Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Fri, 1 Sep 2017 10:01:29 +0400
Subject: [PATCH 3/3] update version phraseanet-production-client

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
   }
 }