Bug 137219

Bengt,

Would you send us the changes please?
I don't think we have any Swedish KOrganizer developers so we have no idea what holidays might be wrong.

Created attachment 18502 [details]
New Swedish holiday file

SVN commit 604200 by winterz:

Swedish holiday fixes from Bengt Ahlgren.  Thank you.

BUGS: 137219


 M  +13 -7     holiday_se  


--- branches/KDE/3.5/kdepim/libkholidays/holidays/holiday_se #604199:604200
@@ -1,22 +1,28 @@
 :
-: Swedish holiday file. Copy to ~/.holiday for private changes or tip
-: wedberg@mednet.gu.se if things are missing.
+: Swedish holiday file.
 :
 weekend "Nyårsdagen" weekend on 1.1
 black "Trett.d.afton" black on 5.1
 weekend "Trett.d. Jul" weekend on 6.1
 black "Alla hjärtans dag" on 14.2
+black "Fettisdagen" on easter minus 47 days
+black "Askonsdagen" on easter minus 46 days
 blue "Sommartid" on last sunday in march
+black "Skärtorsdagen" black on easter minus 3
+weekend "Långfredagen" weekend on easter minus 2
 black "Påskafton" black on easter minus 1
 weekend "Påskdagen" weekend on easter
-weekend "Långfredagen" weekend on easter minus 2
 weekend "Annandag påsk" weekend on easter plus 1
-black "Pingstafton" black on easter plus 48 days 
-weekend "Pingstdagen" weekend on easter plus 49 days 
-weekend "Annandag Pingst" weekend on easter plus 50 days 
+black "Pingstafton" black on easter plus 48 days
+weekend "Pingstdagen" weekend on easter plus 49 days
+:Before 2005
+:weekend "Annandag Pingst" weekend on easter plus 50 days
+black "Annandag Pingst" black on easter plus 50 days
 weekend "Kristi Him.f." weekend on easter plus 39 days
 weekend "Första Maj" weekend on 1.5
-black "Nationaldagen" black on 6.6
+:Before 2005
+:black "Nationaldagen" black on 6.6
+weekend "Nationaldagen" weekend on 6.6
 black "Midsommarafton" black on friday before 26.6
 weekend "Midsommardagen" weekend on saturday before 27.6
 blue "Vintertid" on last sunday in october

Created attachment 18743 [details]
Additional patch to the holiday_se file

Didn't get it quite right after all - an additional patch attached!

Didn't get it quite right - additional patch attached!

SVN commit 609682 by winterz:

merge SVN commit 609681 by winterz:

apply patch for Swedish holidays from Bengt.

BUGS: 137219


 M  +4 -4      holiday_se  


--- branches/KDE/3.5/kdepim/libkholidays/holidays/holiday_se #609681:609682
@@ -27,11 +27,11 @@
 weekend "Midsommardagen" weekend on saturday before 27.6
 blue "Vintertid" on last sunday in october
 weekend "Alla helgons dag" weekend on first sunday in november minus 1
-black "1. Advent" on sunday before 23.12 minus 21 days
-black "2. Advent" on sunday before 23.12 minus 14 days
-black "3. Advent" on sunday before 23.12 minus 7 days
-black "4. Advent" on sunday before 23.12
+black "1. Advent" on sunday before 24.12 minus 21 days
+black "2. Advent" on sunday before 24.12 minus 14 days
+black "3. Advent" on sunday before 24.12 minus 7 days
 black "Julafton" black on 24.12
+black "4. Advent" on sunday before 24.12
 weekend "Juldagen" weekend on 25.12
 weekend "Annandag Jul" weekend on 26.12
 black "Nyårsafton" on 31.12

Am Freitag, 1. Dezember 2006 17:46 schrieb Allen Winter:
> SVN commit 609682 by winterz:
>
> merge SVN commit 609681 by winterz:
>
> apply patch for Swedish holidays from Bengt.


Thanks.

A quick grep through our holiday files indicates that the following files are 
also wrong with respect to the advent sundays (and to the last sunday before 
advent, which is called "Christkönigssonntag" (sunday of king Christ)):

-) holiday_bavarian: "Christkönig" on sunday before 23.12. minus 28 days
-) holiday_is:"1. í Aðventu" weekend on sunday before december 25 minus 21
-) holiday_is:"2. í Aðventu" weekend on sunday before december 25 minus 14
-) holiday_is:"3. í Aðventu" weekend on sunday before december 25 minus 7
-) holiday_is:"4. í Aðventu" weekend on sunday before december 25

Cheers,
Reinhold

-) holiday_bavarian: "Christkönig" on sunday before 23.12. minus 28 days 
                        should be 24.12.  ?
-) holiday_is:"1. í Aðventu" weekend on sunday before december 25 minus 21 
-) holiday_is:"2. í Aðventu" weekend on sunday before december 25 minus 14 
-) holiday_is:"3. í Aðventu" weekend on sunday before december 25 minus 7 
-) holiday_is:"4. í Aðventu" weekend on sunday before december 25 
          ^should be december 24  for all 4 above? 

Reinhold Kainhofer <reinhold@kainhofer.com> writes:

> A quick grep through our holiday files indicates that the following files are 
> also wrong with respect to the advent sundays (and to the last sunday before 
> advent, which is called "Christk