View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
Update of /cvsroot/dqsd/dqsd
In directory usw-pr-cvs1:/tmp/cvs-serv12457
Modified Files:
ChangeLog.txt calendar.js preferences.js strings.js
Added Files:
holidays.et.xml
Log Message:
* Added ability to change specify the first day of the week (from Harry-Anton Talvik)
* Added Estonian calendar - holidays.et.xml (from Harry-Anton Talvik)
--- NEW FILE: holidays.et.xml ---
<!--
This file contains a listing of public holidays in Estonia for the years 2002-2004.
TODO: Get parser to support special letters.
- Harry-Anton Talvik [[EMAIL PROTECTED]] (03/11/2002)
-->
<events>
<event name="Uus aasta" type="public_holiday">
<date day="1" month="1"/>
</event>
<event name="Iseseisvusp2ev. EV aastap2ev" type="public_holiday">
<date day="24" month="2"/>
</event>
<event name="Suur Reede" type="public_holiday">
<date day="18" month="4" year="2003"/>
</event>
<event name="Ylest6usmispyhade 1. pyha" type="public_holiday">
<date day="20" month="4" year="2003"/>
</event>
<event name="Kevadpyha" type="public_holiday">
<date day="1" month="5"/>
</event>
<event name="Nelipyhade 1. pyha" type="public_holiday">
<date day="8" month="6" year="2003"/>
</event>
<event name="V6idupyha" type="public_holiday">
<date day="23" month="6"/>
</event>
<event name="Jaanip2ev" type="public_holiday">
<date day="24" month="6"/>
</event>
<event name="Taasiseseisvumisp2ev" type="public_holiday">
<date day="20" month="8"/>
</event>
<event name="Esimene j6ulupyha" type="public_holiday">
<date day="25" month="12"/>
</event>
<event name="Teine j6ulupyha" type="public_holiday">
<date day="26" month="12"/>
</event>
<event name="Suur Reede" type="public_holiday">
<date day="9" month="4" year="2004"/>
</event>
<event name="Ylest6usmispyhade 1. pyha" type="public_holiday">
<date day="11" month="4" year="2004"/>
</event>
<event name="Nelipyhade 1. pyha" type="public_holiday">
<date day="30" month="5" year="2004"/>
</event>
</events>
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/dqsd/dqsd/ChangeLog.txt,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** ChangeLog.txt 1 Nov 2002 14:31:45 -0000 1.161
--- ChangeLog.txt 4 Nov 2002 04:08:28 -0000 1.162
***************
*** 6,9 ****
--- 6,11 ----
* Moved the Computer and Reference searches into menu subcategories.
* Added parseArgsEx and trimWhitespace functions for additional argument parsing
capabilities (from Brent Beardsley)
+ * Added ability to change specify the first day of the week (from Harry-Anton Talvik)
+ * Added Estonian calendar - holidays.et.xml (from Harry-Anton Talvik)
-- What's new for 3.1.4.4 beta (October 24, 2002)
Index: calendar.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/calendar.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** calendar.js 25 Oct 2002 12:14:22 -0000 1.10
--- calendar.js 4 Nov 2002 04:08:28 -0000 1.11
***************
*** 15,20 ****
* - configured the calendar to use the stylesheet
* - fixed the bug where "today" was not being highlighted if today is Sunday
! * $Revision$
! * $Date$
*
* TODO:
--- 15,20 ----
* - configured the calendar to use the stylesheet
* - fixed the bug where "today" was not being highlighted if today is Sunday
! * modified by Harry-Anton Talvik 03/11/2002
! * - configured the calender to use week start day
*
* TODO:
***************
*** 117,120 ****
--- 117,122 ----
var DAYS_OF_WEEK = 7; // "constant" for number of days in a week
var DAYS_OF_MONTH = 31; // "constant" for number of days in a month
+ var CAL_DAY_START = 1; // "constant" to indicate which date starts a month
+(usually people like it to be 1. day of the month)
+ var WEEK_START_DAY = weekStartDay; // "constant" to indicate a day which starts a
+week -- 1=Sun, 2=Mon, .. ; weekStartDay is declared in preferences.js
var Calendar = new Date(); //stores the date the user is looking at
***************
*** 184,188 ****
Today = new Date();
! var weekday = -1;
if (Today.getMonth() == Calendar.getMonth() && Today.getYear() ==
Calendar.getYear())
--- 186,190 ----
Today = new Date();
! var weekday = -1; // Just init weekday
if (Today.getMonth() == Calendar.getMonth() && Today.getYear() ==
Calendar.getYear())
***************
*** 191,195 ****
var cal; // Used for printing
! Calendar.setDate(1); // Start the calendar day at '1'
var TR_start = '<tr>';
--- 193,197 ----
var cal; // Used for printing
! Calendar.setDate(CAL_DAY_START); // Start the calendar day at '1', '2', ..
var TR_start = '<tr>';
***************
*** 280,284 ****
{
cal += day_start;
! cal += getDayName(index+7+1);
cal += day_end;
}
--- 282,286 ----
{
cal += day_start;
! cal += getDayName(DAYS_OF_WEEK + ((index + WEEK_START_DAY - 1) % DAYS_OF_WEEK) +
1);
cal += day_end;
}
***************
*** 288,292 ****
//fill spaces until first day in the month
var whichmonth = -1;
! var filldays = Calendar.getDay();
Calendar.setDate(Calendar.getDate() - filldays);
--- 290,295 ----
//fill spaces until first day in the month
var whichmonth = -1;
! var filldays = Calendar.getDay() - (WEEK_START_DAY - 1);
! if (filldays < 0) filldays += DAYS_OF_WEEK;
Calendar.setDate(Calendar.getDate() - filldays);
***************
*** 296,306 ****
{
var month_day = Calendar.getDate();
! if (month_day == 1) whichmonth += 1;
week_day = Calendar.getDay();
// start new row if we hit a new week
! if (week_day == 0) cal += TR_end + TR_start;
!
var ent = null;
var lent = null;
--- 299,308 ----
{
var month_day = Calendar.getDate();
! if (month_day == CAL_DAY_START) whichmonth += 1;
week_day = Calendar.getDay();
// start new row if we hit a new week
! if (week_day == WEEK_START_DAY - 1) cal += TR_end + TR_start;
var ent = null;
var lent = null;
Index: preferences.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/preferences.js,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** preferences.js 25 Oct 2002 12:14:22 -0000 1.49
--- preferences.js 4 Nov 2002 04:08:28 -0000 1.50
***************
*** 169,172 ****
--- 169,185 ----
+ /* Calendar start day for a week.
+ * 1 - Sunday
+ * 2 - Monday
+ * 3 - Tuesday
+ * 4 - Wednesday
+ * 5 - Thursday
+ * 6 - Friday
+ * 7 - Saturday
+ * default is 1
+ */
+ weekStartDay = 1;
+
+
/* Default calendar. clicking on a calendar day will spawn the defined online
calendar.
* Valid calendars include:
***************
*** 191,194 ****
--- 204,208 ----
* holidays.nl.NL.xml - Netherlands (Dutch language)
* holidays.nl.EN.xml - Netherlands (English language)
+ * holidays.et.xml - Estonia
*/
eventsfileurl="holidays.us.xml";
Index: strings.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/strings.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** strings.js 6 Sep 2002 16:48:38 -0000 1.7
--- strings.js 4 Nov 2002 04:08:28 -0000 1.8
***************
*** 24,28 ****
it: Array('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio',
'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre', 'Gen', 'Feb', 'Mar', 'Apr',
'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'),
is:
Array('Jan�ar','Febr�ar','Mars','Apr�l','Ma�','J�n�','J�l�','�g�st','September','Okt�ber','N�vember','Desember','jan.','feb.','mar.','apr.','ma�','j�n.','j�l.','�g.','sep.','okt.','n�v.','des.'),
! fi:
Array('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes�kuu','Hein�kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulu','Tammi','Helmi','Maalis','Huhti','Touko','Kes�','Hein�','Elo','Syys','Loka','Marras','Joulu')
};
--- 24,29 ----
it: Array('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio',
'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre', 'Gen', 'Feb', 'Mar', 'Apr',
'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'),
is:
Array('Jan�ar','Febr�ar','Mars','Apr�l','Ma�','J�n�','J�l�','�g�st','September','Okt�ber','N�vember','Desember','jan.','feb.','mar.','apr.','ma�','j�n.','j�l.','�g.','sep.','okt.','n�v.','des.'),
! fi:
Array('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes�kuu','Hein�kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulu','Tammi','Helmi','Maalis','Huhti','Touko','Kes�','Hein�','Elo','Syys','Loka','Marras','Joulu'),
! et: Array('Jaanuar', 'Veebruar', 'M�rts', 'Aprill', 'Mai', 'Juuni', 'Juuli',
'August', 'September', 'Oktoober', 'November', 'Detsember', 'Jaan', 'Veebr', 'M�rts',
'Apr', 'Mai', 'Juuni', 'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets')
};
***************
*** 39,44 ****
it: Array('Domenica', 'Luned�', 'Marted�', 'Mercoled�', 'Gioved�', 'Venerd�',
'Sabato', 'Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'),
is:
Array('sunnudagur','m�nudagur','�ri�judagur','mi�vikudagur','fimmtudagur','f�studagur','laugardagur','sun','m�n','�ri','mi�','fim','f�s','lau'),
! fi: Array('Sunnuntai', 'Maanantai', 'Tiistai', 'Keskiviikko', 'Torstai',
'Perjantai', 'Lauantai', 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La')
! };
--- 40,46 ----
it: Array('Domenica', 'Luned�', 'Marted�', 'Mercoled�', 'Gioved�', 'Venerd�',
'Sabato', 'Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'),
is:
Array('sunnudagur','m�nudagur','�ri�judagur','mi�vikudagur','fimmtudagur','f�studagur','laugardagur','sun','m�n','�ri','mi�','fim','f�s','lau'),
! fi: Array('Sunnuntai', 'Maanantai', 'Tiistai', 'Keskiviikko', 'Torstai',
'Perjantai', 'Lauantai', 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La'),
! et: Array('P�hap�ev', 'Esmasp�ev', 'Teisip�ev', 'Kolmap�ev', 'Neljap�ev', 'Reede',
'Laup�ev', 'P', 'E', 'T', 'K', 'N', 'R', 'L')
! };
***************
*** 54,58 ****
pt: "Pesquisa R�pida",
is: "Hra�leit",
! fi: "Pikahaku"
};
--- 56,61 ----
pt: "Pesquisa R�pida",
is: "Hra�leit",
! fi: "Pikahaku",
! et: "Kiirotsing"
};
***************
*** 68,72 ****
pt: "Digite ? para ajuda",
is: "? gefur hj�lp",
! fi: "Kirjoita ? saadaksesi apua"
};
--- 71,76 ----
pt: "Digite ? para ajuda",
is: "? gefur hj�lp",
! fi: "Kirjoita ? saadaksesi apua",
! et: "Abi saamiseks sisesta ?"
};
***************
*** 74,78 ****
{
en: "Help / About...",
! fi: "Apua / Tietoja..."
};
--- 78,83 ----
{
en: "Help / About...",
! fi: "Apua / Tietoja...",
! et: "Abi / Info..."
};
***************
*** 87,91 ****
dk: "S�g",
is: "Leit",
! fi: "Haku"
};
--- 92,97 ----
dk: "S�g",
is: "Leit",
! fi: "Haku",
! et: "Otsing"
};
***************
*** 99,103 ****
dk: "N�ste m�ned",
is: "N�sti m�nu�ur",
! fi: "Seuraava kuukausi"
};
--- 105,110 ----
dk: "N�ste m�ned",
is: "N�sti m�nu�ur",
! fi: "Seuraava kuukausi",
! et: "J�rgmine kuu"
};
***************
*** 111,115 ****
dk: "Forrige m�ned",
is: "Fyrri m�nu�ur",
! fi: "Edellinen kuukausi"
};
--- 118,123 ----
dk: "Forrige m�ned",
is: "Fyrri m�nu�ur",
! fi: "Edellinen kuukausi",
! et: "Eelmine kuu"
};
***************
*** 123,127 ****
dk: "N�ste �r",
is: "N�sta �r",
! fi: "Seuraava vuosi"
};
--- 131,136 ----
dk: "N�ste �r",
is: "N�sta �r",
! fi: "Seuraava vuosi",
! et: "J�rgmine aasta"
};
***************
*** 135,139 ****
dk: "Forrige �r",
is: "Fyrra �r",
! fi: "Edellinen vuosi"
};
--- 144,149 ----
dk: "Forrige �r",
is: "Fyrra �r",
! fi: "Edellinen vuosi",
! et: "Eelmine aasta"
};
***************
*** 147,151 ****
dk: "G� til i dag",
is: "Fara � daginn � dag",
! fi: "Siirry t�h�n p�iv��n"
};
--- 157,162 ----
dk: "G� til i dag",
is: "Fara � daginn � dag",
! fi: "Siirry t�h�n p�iv��n",
! et: "T�nasele p�evale"
};
-------------------------------------------------------
This SF.net email is sponsored by: ApacheCon, November 18-21 in
Las Vegas (supported by COMDEX), the only Apache event to be
fully supported by the ASF. http://www.apachecon.com
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/