From 833091674c24f07b2934245caebec72760507de9 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Mon, 14 Oct 2013 11:34:04 +0200
Subject: [PATCH] // Adding translations and PHP date format for datepicker

---
 .../themes/default/js/date-range-picker.js    | 24 ++++++++++++-------
 .../template/helpers/calendar/calendar.tpl    | 13 ++++++++--
 classes/helper/HelperCalendar.php             |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js
index a289bade4..e2faae88f 100644
--- a/admin-dev/themes/default/js/date-range-picker.js
+++ b/admin-dev/themes/default/js/date-range-picker.js
@@ -24,7 +24,11 @@
 	// Picker object
 	var Datepicker = function(element, options){
 		this.element = $(element);
-		this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy');
+
+		if (typeof options.dates != 'undefined')
+			DPGlobal.dates = options.dates;
+
+		this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'Y-m-d');
 		this.picker = $(DPGlobal.template).appendTo(this.element).show()
 		.on({
 			click: $.proxy(this.click, this),
@@ -283,7 +287,7 @@
 								$(".start-selected").removeClass("start-selected");
 								target.addClass("start-selected");
 								start = target.data("val");
-								$("#date-start").val(start);
+								$("#date-start").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d')));
 								if(!switched) {click = 1;} else {click = 2;}
 								if(!switched){
 									$("#date-end").val(null).focus().addClass("input-selected");
@@ -296,7 +300,7 @@
 								$(".end-selected").removeClass("end-selected");
 								target.addClass("end-selected");
 								end = target.data("val");
-								$("#date-end").val(end);
+								$("#date-end").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d')));
 								click = 2;
 								$("#date-end").removeClass("input-selected").addClass("input-complete");
 								//this.range();
@@ -353,14 +357,14 @@
 				//switch
 				if (start && over < start ){
 					end = start;
-					$("#date-end").val(start).removeClass("input-selected");
+					$("#date-end").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
 					$("#date-start").val(null).focus().addClass("input-selected");
 					$("#datepicker .start-selected").removeClass("start-selected").addClass("end-selected");
 					start = null;
 					switched = true;
 				} else if (end && over > end ){
 					start = end;
-					$("#date-start").val(end).removeClass("input-selected");
+					$("#date-start").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
 					$("#date-end").val(null).focus().addClass("input-selected");
 					$("#datepicker .end-selected").removeClass("end-selected").addClass("start-selected");
 					end = null;
@@ -485,10 +489,12 @@
 							date.setMonth(val - 1);
 							break;
 						case 'yy':
+						case 'y':
 							year = 2000 + val;
 							date.setFullYear(2000 + val);
 							break;
 						case 'yyyy':
+						case 'Y':
 							year = val;
 							date.setFullYear(val);
 							break;
@@ -503,10 +509,12 @@
 				d: date.getDate(),
 				m: date.getMonth() + 1,
 				yy: date.getFullYear().toString().substring(2),
-				yyyy: date.getFullYear()
+				y: date.getFullYear().toString().substring(2),
+				yyyy: date.getFullYear(),
+				Y: date.getFullYear()
 			};
-			val.dd = (val.d < 10 ? '0' : '') + val.d;
-			val.mm = (val.m < 10 ? '0' : '') + val.m;
+			val.d = (val.d < 10 ? '0' : '') + val.d;
+			val.m = (val.m < 10 ? '0' : '') + val.m;
 			var date = [];
 			for (var i=0, cnt = format.parts.length; i < cnt; i++) {
 				date.push(val[format.parts[i]]);
diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
index cff63d12e..f3cac5449 100644
--- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
@@ -68,8 +68,17 @@
 </div>
 <script type="text/javascript">
 	$(function() {
-		$('.datepicker1').datepicker();
-		$('.datepicker2').datepicker();
+		var translated_dates = {
+			days: ["{l s='Sunday'}", "{l s='Monday'}", "{l s='Tuesday'}", "{l s='Wednesday'}", "{l s='Thursday'}", "{l s='Friday'}", "{l s='Saturday'}", "{l s='Sunday'}"],
+			daysShort: ["{l s='Sun'}", "{l s='Mon'}", "{l s='Tue'}", "{l s='Wed'}", "{l s='Thu'}", "{l s='Fri'}", "{l s='Sat'}", "{l s='Sun'}"],
+			daysMin: ["{l s='Su'}", "{l s='Mo'}", "{l s='Tu'}", "{l s='We'}", "{l s='Th'}", "{l s='Fr'}", "{l s='Sa'}", "{l s='Su'}"],
+			months: ["{l s='January'}", "{l s='February'}", "{l s='March'}", "{l s='April'}", "{l s='May'}", "{l s='June'}", "{l s='July'}", "{l s='August'}", "{l s='September'}", "{l s='October'}", "{l s='November'}", "{l s='December'}"],
+			monthsShort: ["{l s='Jan'}", "{l s='Feb'}", "{l s='Mar'}", "{l s='Apr'}", "{l s='May'}", "{l s='Jun'}", "{l s='Jul'}", "{l s='Aug'}", "{l s='Sep'}", "{l s='Oct'}", "{l s='Nov'}", "{l s='Dec'}"]
+		}
+	{literal}
+		$('.datepicker1').datepicker({"dates": translated_dates, "weekStart": 1});
+		$('.datepicker2').datepicker({"dates": translated_dates, "weekStart": 1});
+	{/literal}
 		$("#date-start").focus().addClass("input-selected");
 	});
 </script>
\ No newline at end of file
diff --git a/classes/helper/HelperCalendar.php b/classes/helper/HelperCalendar.php
index b410aaba7..60f489496 100644
--- a/classes/helper/HelperCalendar.php
+++ b/classes/helper/HelperCalendar.php
@@ -26,7 +26,7 @@
 
 class HelperCalendarCore extends Helper
 {
-	const DEFAULT_DATE_FORMAT = 'dd-mm-yyyy';
+	const DEFAULT_DATE_FORMAT = 'Y-m-d';
 
 	private $_actions;
 	private $_compare_date_from;