From e2cad73c0820d02ffbde7b4d3ca4a1e56e3cb2b5 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Fri, 6 Oct 2006 14:45:16 +0000
Subject: [PATCH] Calendar fixes

---
 docs/changelog/7.x.x.txt                |  4 ++++
 lib/WebGUI/Form/Date.pm                 |  3 ++-
 www/extras/calendar/lang/calendar-de.js | 14 +++++++-------
 www/extras/calendar/lang/calendar-it.js |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c96b29f8b..81273378d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,10 @@
  - fix: task editor in PM not actually receiving start/end date information at first
  - fix: Error Displaying Multiple TimeTracking Wobjects (ekennedy)
  - refactoring of PM JavaScript stuff
+ - fix: DHTML calendar bug & fix (maxscience)
+ - fix: Missing translation in calendar (Klaus)
+ - fixed a bug where the calendar would break if a language other than English has 
+   been selected (Martin Kamerbeek / Procolix)
 
 7.0.9
  - Removed the need for DateTime::Cron::Simple, which also added the ability
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index 42e1d2119..aacc36766 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -140,6 +140,7 @@ sub toHtml {
 	else {
 		$self->set("value",$self->session->datetime->epochToSet($self->get("value")));
 	}
+
 	my $language  = WebGUI::International->new($self->session)->getLanguage($self->session->user->profileField("language"),"languageAbbreviation");
 	unless ($language) {
 		$language = WebGUI::International->new($self->session)->getLanguage("English","languageAbbreviation");
@@ -148,7 +149,7 @@ sub toHtml {
         $self->session->style->setScript($self->session->url->extras('calendar/lang/calendar-'.$language.'.js'),{ type=>'text/javascript' });
         $self->session->style->setScript($self->session->url->extras('calendar/calendar-setup.js'),{ type=>'text/javascript' });
         $self->session->style->setLink($self->session->url->extras('calendar/calendar-win2k-1.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
-        my $mondayFirst = $self->session->user->profileField("firstDayOfWeek") ? "true" : "false";
+        my $mondayFirst = $self->session->user->profileField("firstDayOfWeek") ? "1" : "0";
         return $self->SUPER::toHtml. '<script type="text/javascript"> 
                         Calendar.setup({ 
                                 inputField : "'.$self->get('id').'", 
diff --git a/www/extras/calendar/lang/calendar-de.js b/www/extras/calendar/lang/calendar-de.js
index 4bc1137cc..f4c530afd 100644
--- a/www/extras/calendar/lang/calendar-de.js
+++ b/www/extras/calendar/lang/calendar-de.js
@@ -64,7 +64,7 @@ Calendar._SMN = new Array
  "Feb",
  "M\u00e4r",
  "Apr",
- "May",
+ "Mai",
  "Jun",
  "Jul",
  "Aug",
@@ -75,7 +75,7 @@ Calendar._SMN = new Array
 
 // tooltips
 Calendar._TT = {};
-Calendar._TT["INFO"] = "\u00DCber dieses Kalendarmodul";
+Calendar._TT["INFO"] = "\u00DCber dieses Kalendermodul";
 
 Calendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
@@ -90,15 +90,15 @@ Calendar._TT["ABOUT"] =
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
 "Zeit ausw\u00e4hlen:\n" +
 "- Klicken Sie auf die Teile der Uhrzeit, um diese zu erh\u00F6hen\n" +
-"- oder klicken Sie mit festgehaltener Shift-Taste um diese zu verringern\n" +
+"- oder klicken Sie mit festgehaltener Shift-Taste, um diese zu verringern\n" +
 "- oder klicken und festhalten f\u00fcr Schnellauswahl.";
 
 Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
 Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Festhalten f\u00fcr Schnellauswahl)";
 Calendar._TT["PREV_MONTH"] = "Voriger Monat (Festhalten f\u00fcr Schnellauswahl)";
 Calendar._TT["GO_TODAY"] = "Heute ausw\u00e4hlen";
-Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Festhalten f\u00fcr Schnellauswahl)";
-Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["NEXT_MONTH"] = "N\u00e4chster Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["NEXT_YEAR"] = "N\u00e4chstes Jahr (Festhalten f\u00fcr Schnellauswahl)";
 Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
 Calendar._TT["DRAG_TO_MOVE"] = "Zum Bewegen festhalten";
 Calendar._TT["PART_TODAY"] = " (Heute)";
@@ -114,11 +114,11 @@ Calendar._TT["WEEKEND"] = "0,6";
 
 Calendar._TT["CLOSE"] = "Schlie\u00dfen";
 Calendar._TT["TODAY"] = "Heute";
-Calendar._TT["TIME_PART"] = "(Shift-)Klick oder Festhalten und Ziehen um den Wert zu \u00e4ndern";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder festhalten und ziehen, um den Wert zu \u00e4ndern";
 
 // date formats
 Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
 Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
-Calendar._TT["WK"] = "wk";
+Calendar._TT["WK"] = "Wo";
 Calendar._TT["TIME"] = "Zeit:";
diff --git a/www/extras/calendar/lang/calendar-it.js b/www/extras/calendar/lang/calendar-it.js
index 7f84cde01..8ec0f9504 100644
--- a/www/extras/calendar/lang/calendar-it.js
+++ b/www/extras/calendar/lang/calendar-it.js
@@ -3,6 +3,7 @@
 // Calendar EN language
 // Author: Mihai Bazon, <mihai_bazon@yahoo.com>
 // Translator: Fabio Di Bernardini, <altraqua@email.it>
+// Fixed by: Massimiliano Picone, <max@applenewton.it>
 // Encoding: any
 // Distributed under the same terms as the calendar itself.
 
@@ -43,7 +44,7 @@ Calendar._SDN = new Array
  "Ven",
  "Sab",
  "Dom");
-
+ 
 // full month names
 Calendar._MN = new Array
 ("Gennaio",
@@ -53,7 +54,7 @@ Calendar._MN = new Array
  "Maggio",
  "Giugno",
  "Luglio",
- "Augosto",
+ "Agosto",
  "Settembre",
  "Ottobre",
  "Novembre",