From 75340e4b74478d19a33d78224007af8524a59d7b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 28 Oct 2011 17:48:39 +0200
Subject: [PATCH] Fix: use i18n files for datepicker

---
 htdocs/core/js/datepicker.js                  | 17 --------
 htdocs/langs/.htaccess                        |  5 +++
 .../fr_FR/js/jquery.ui.datepicker-fr_FR.js    | 25 +++++++++++
 htdocs/main.inc.php                           | 43 +------------------
 4 files changed, 32 insertions(+), 58 deletions(-)
 delete mode 100644 htdocs/core/js/datepicker.js
 create mode 100644 htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js

diff --git a/htdocs/core/js/datepicker.js b/htdocs/core/js/datepicker.js
deleted file mode 100644
index cddfa386aa5..00000000000
--- a/htdocs/core/js/datepicker.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) 2011 Regis Houssin  <regis@dolibarr.fr>
-//
-// Script javascript that contains functions for datepicker default options
-//
-// \file       htdocs/core/js/datepicker.js
-// \brief      File that include javascript functions for datepicker default options
-
-
-$(document).ready(function() {
-	$.datepicker.setDefaults({
-		monthNames: tradMonths,
-		monthNamesShort: tradMonthsMin,
-		dayNames: tradDays,
-		dayNamesMin: tradDaysMin,
-		dateFormat: datePickerFormat
-	});
-});
\ No newline at end of file
diff --git a/htdocs/langs/.htaccess b/htdocs/langs/.htaccess
index 93169e4eb44..d87f1072807 100644
--- a/htdocs/langs/.htaccess
+++ b/htdocs/langs/.htaccess
@@ -1,2 +1,7 @@
 Order deny,allow
 Deny from all
+
+<FilesMatch "\.(js)$">
+Order deny,allow
+Allow from all
+</FilesMatch>
diff --git a/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js b/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
new file mode 100644
index 00000000000..7e793639f5f
--- /dev/null
+++ b/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
@@ -0,0 +1,25 @@
+/* French initialisation for the jQuery UI date picker plugin. */
+/* Written by Keith Wood (kbwood{at}iinet.com.au),
+              Stéphane Nahmani (sholby@sholby.net),
+              Stéphane Raimbault <stephane.raimbault@gmail.com> */
+jQuery(function($){
+	$.datepicker.regional['fr'] = {
+		closeText: 'Fermer',
+		prevText: 'Précédent',
+		nextText: 'Suivant',
+		currentText: 'Aujourd\'hui',
+		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+		monthNamesShort: ['Janv.','Févr.','Mars','Avril','Mai','Juin',
+		'Juil.','Août','Sept.','Oct.','Nov.','Déc.'],
+		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+		dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'],
+		dayNamesMin: ['D','L','M','M','J','V','S'],
+		weekHeader: 'Sem.',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fr']);
+});
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3e3238a0221..e50ed0a5cba 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1013,49 +1013,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		$langs->trans("December")
 		);
 		print 'var tradMonths = '.json_encode($tradMonths).';'."\n";
-
-		// Define tradMonthsMin javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
-		$tradMonthsMin=array($langs->trans("JanuaryMin"),
-		$langs->trans("FebruaryMin"),
-		$langs->trans("MarchMin"),
-		$langs->trans("AprilMin"),
-		$langs->trans("MayMin"),
-		$langs->trans("JuneMin"),
-		$langs->trans("JulyMin"),
-		$langs->trans("AugustMin"),
-		$langs->trans("SeptemberMin"),
-		$langs->trans("OctoberMin"),
-		$langs->trans("NovemberMin"),
-		$langs->trans("DecemberMin")
-		);
-		print 'var tradMonthsMin = '.json_encode($tradMonthsMin).';'."\n";
-
-		// Define tradDays javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
-		$tradDays=array($langs->trans("Monday"),
-		$langs->trans("Tuesday"),
-		$langs->trans("Wednesday"),
-		$langs->trans("Thursday"),
-		$langs->trans("Friday"),
-		$langs->trans("Saturday"),
-		$langs->trans("Sunday")
-		);
-		print 'var tradDays = '.json_encode($tradDays).';'."\n";
-
-		// Define tradDaysMin javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
-		$tradDaysMin=array($langs->trans("MondayMin"),
-		$langs->trans("TuesdayMin"),
-		$langs->trans("WednesdayMin"),
-		$langs->trans("ThursdayMin"),
-		$langs->trans("FridayMin"),
-		$langs->trans("SaturdayMin"),
-		$langs->trans("SundayMin")
-		);
-		print 'var tradDaysMin = '.json_encode($tradDaysMin).';'."\n";
-		print 'var datePickerFormat = \''.$langs->trans("FormatDateShortJQuery").'\';'."\n";
 		print '</script>'."\n";
 		
-		// Default datepicker options
-		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js"></script>'."\n";
+		// Add datepicker i18n for current language
+		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/langs/'.$langs->defaultlang.'/js/jquery.ui.datepicker-'.$langs->defaultlang.'.js"></script>'."\n";
 
 		if (! empty($head)) print $head."\n";
 		if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";