137219 2006-11-12 00:25:31 +0000 holiday_se in libkholidays incorrect 2006-12-01 18:33:21 +0000 1 1 2 Applications korganizer general unspecified FreeBSD Ports FreeBSD RESOLVED FIXED NOR normal --- 1 bahlgren pim-bugs-null 0 oldest_to_newest 486019 0 bahlgren 2006-11-12 00:25:31 +0000 Version: (using KDE KDE 3.5.2) Installed from: FreeBSD Ports OS: FreeBSD The Swedish holiday file has some errors and is out of date due to some recent changes. 486021 1 winter 2006-11-12 00:29:12 +0000 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. 486022 2 18502 bahlgren 2006-11-12 00:29:54 +0000 Created attachment 18502 New Swedish holiday file 486024 3 winter 2006-11-12 00:38:01 +0000 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 490925 4 18743 bahlgren 2006-12-01 17:28:58 +0000 Created attachment 18743 Additional patch to the holiday_se file Didn't get it quite right after all - an additional patch attached! 490926 5 bahlgren 2006-12-01 17:29:56 +0000 Didn't get it quite right - additional patch attached! 490929 6 winter 2006-12-01 17:46:16 +0000 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 490934 7 reinhold 2006-12-01 18:16:34 +0000 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 490935 8 winter 2006-12-01 18:30:37 +0000 -) 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? 490936 9 bengta 2006-12-01 18:33:21 +0000 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 18502 2006-11-12 00:29:54 +0000 2006-11-12 00:29:54 +0000 New Swedish holiday file holiday_se text/plain 1501 bahlgren Ogo6IFN3ZWRpc2ggaG9saWRheSBmaWxlLgo6CndlZWtlbmQgIk55w6Vyc2RhZ2VuIiB3ZWVrZW5k IG9uIDEuMQpibGFjayAiVHJldHQuZC5hZnRvbiIgYmxhY2sgb24gNS4xCndlZWtlbmQgIlRyZXR0 LmQuIEp1bCIgd2Vla2VuZCBvbiA2LjEKYmxhY2sgIkFsbGEgaGrDpHJ0YW5zIGRhZyIgb24gMTQu MgpibGFjayAiRmV0dGlzZGFnZW4iIG9uIGVhc3RlciBtaW51cyA0NyBkYXlzCmJsYWNrICJBc2tv bnNkYWdlbiIgb24gZWFzdGVyIG1pbnVzIDQ2IGRheXMKYmx1ZSAiU29tbWFydGlkIiBvbiBsYXN0 IHN1bmRheSBpbiBtYXJjaApibGFjayAiU2vDpHJ0b3JzZGFnZW4iIGJsYWNrIG9uIGVhc3RlciBt aW51cyAzCndlZWtlbmQgIkzDpW5nZnJlZGFnZW4iIHdlZWtlbmQgb24gZWFzdGVyIG1pbnVzIDIK YmxhY2sgIlDDpXNrYWZ0b24iIGJsYWNrIG9uIGVhc3RlciBtaW51cyAxCndlZWtlbmQgIlDDpXNr ZGFnZW4iIHdlZWtlbmQgb24gZWFzdGVyCndlZWtlbmQgIkFubmFuZGFnIHDDpXNrIiB3ZWVrZW5k IG9uIGVhc3RlciBwbHVzIDEKYmxhY2sgIlBpbmdzdGFmdG9uIiBibGFjayBvbiBlYXN0ZXIgcGx1 cyA0OCBkYXlzCndlZWtlbmQgIlBpbmdzdGRhZ2VuIiB3ZWVrZW5kIG9uIGVhc3RlciBwbHVzIDQ5 IGRheXMKOkJlZm9yZSAyMDA1Cjp3ZWVrZW5kICJBbm5hbmRhZyBQaW5nc3QiIHdlZWtlbmQgb24g ZWFzdGVyIHBsdXMgNTAgZGF5cwpibGFjayAiQW5uYW5kYWcgUGluZ3N0IiBibGFjayBvbiBlYXN0 ZXIgcGx1cyA1MCBkYXlzCndlZWtlbmQgIktyaXN0aSBIaW0uZi4iIHdlZWtlbmQgb24gZWFzdGVy IHBsdXMgMzkgZGF5cwp3ZWVrZW5kICJGw7Zyc3RhIE1haiIgd2Vla2VuZCBvbiAxLjUKOkJlZm9y ZSAyMDA1CjpibGFjayAiTmF0aW9uYWxkYWdlbiIgYmxhY2sgb24gNi42CndlZWtlbmQgIk5hdGlv bmFsZGFnZW4iIHdlZWtlbmQgb24gNi42CmJsYWNrICJNaWRzb21tYXJhZnRvbiIgYmxhY2sgb24g ZnJpZGF5IGJlZm9yZSAyNi42CndlZWtlbmQgIk1pZHNvbW1hcmRhZ2VuIiB3ZWVrZW5kIG9uIHNh dHVyZGF5IGJlZm9yZSAyNy42CmJsdWUgIlZpbnRlcnRpZCIgb24gbGFzdCBzdW5kYXkgaW4gb2N0 b2Jlcgp3ZWVrZW5kICJBbGxhIGhlbGdvbnMgZGFnIiB3ZWVrZW5kIG9uIGZpcnN0IHN1bmRheSBp biBub3ZlbWJlciBtaW51cyAxCmJsYWNrICIxLiBBZHZlbnQiIG9uIHN1bmRheSBiZWZvcmUgMjMu MTIgbWludXMgMjEgZGF5cwpibGFjayAiMi4gQWR2ZW50IiBvbiBzdW5kYXkgYmVmb3JlIDIzLjEy IG1pbnVzIDE0IGRheXMKYmxhY2sgIjMuIEFkdmVudCIgb24gc3VuZGF5IGJlZm9yZSAyMy4xMiBt aW51cyA3IGRheXMKYmxhY2sgIjQuIEFkdmVudCIgb24gc3VuZGF5IGJlZm9yZSAyMy4xMgpibGFj ayAiSnVsYWZ0b24iIGJsYWNrIG9uIDI0LjEyCndlZWtlbmQgIkp1bGRhZ2VuIiB3ZWVrZW5kIG9u IDI1LjEyCndlZWtlbmQgIkFubmFuZGFnIEp1bCIgd2Vla2VuZCBvbiAyNi4xMgpibGFjayAiTnnD pXJzYWZ0b24iIG9uIDMxLjEyCg== 18743 2006-12-01 17:28:58 +0000 2006-12-01 17:28:58 +0000 Additional patch to the holiday_se file holiday_se.patch text/plain 827 bahlgren LS0tIGhvbGlkYXlfc2UJMjAwNi8xMi8wMSAxNjoyMTo0MgkxLjMKKysrIGhvbGlkYXlfc2UJMjAw Ni8xMi8wMSAxNjoyMjoyNApAQCAtMjcsMTEgKzI3LDExIEBACiB3ZWVrZW5kICJNaWRzb21tYXJk YWdlbiIgd2Vla2VuZCBvbiBzYXR1cmRheSBiZWZvcmUgMjcuNgogYmx1ZSAiVmludGVydGlkIiBv biBsYXN0IHN1bmRheSBpbiBvY3RvYmVyCiB3ZWVrZW5kICJBbGxhIGhlbGdvbnMgZGFnIiB3ZWVr ZW5kIG9uIGZpcnN0IHN1bmRheSBpbiBub3ZlbWJlciBtaW51cyAxCi1ibGFjayAiMS4gQWR2ZW50 IiBvbiBzdW5kYXkgYmVmb3JlIDIzLjEyIG1pbnVzIDIxIGRheXMKLWJsYWNrICIyLiBBZHZlbnQi IG9uIHN1bmRheSBiZWZvcmUgMjMuMTIgbWludXMgMTQgZGF5cwotYmxhY2sgIjMuIEFkdmVudCIg b24gc3VuZGF5IGJlZm9yZSAyMy4xMiBtaW51cyA3IGRheXMKLWJsYWNrICI0LiBBZHZlbnQiIG9u IHN1bmRheSBiZWZvcmUgMjMuMTIKK2JsYWNrICIxLiBBZHZlbnQiIG9uIHN1bmRheSBiZWZvcmUg MjQuMTIgbWludXMgMjEgZGF5cworYmxhY2sgIjIuIEFkdmVudCIgb24gc3VuZGF5IGJlZm9yZSAy NC4xMiBtaW51cyAxNCBkYXlzCitibGFjayAiMy4gQWR2ZW50IiBvbiBzdW5kYXkgYmVmb3JlIDI0 LjEyIG1pbnVzIDcgZGF5cwogYmxhY2sgIkp1bGFmdG9uIiBibGFjayBvbiAyNC4xMgorYmxhY2sg IjQuIEFkdmVudCIgb24gc3VuZGF5IGJlZm9yZSAyNC4xMgogd2Vla2VuZCAiSnVsZGFnZW4iIHdl ZWtlbmQgb24gMjUuMTIKIHdlZWtlbmQgIkFubmFuZGFnIEp1bCIgd2Vla2VuZCBvbiAyNi4xMgog YmxhY2sgIk55w6Vyc2FmdG9uIiBvbiAzMS4xMgo=