From ca4b15bc0b03b0d563eda340a968bf2e17cc9615 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 15 Dec 2010 16:13:27 -0500 Subject: [PATCH] Holidays - Added feature #575, including Danish holidays (thanks to Irfan Siddiqui). --- AUTHORS | 1 + ChangeLog | 3 +- Makefile.am | 2 +- doc/rc/holidays-DK.rc | 89 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 doc/rc/holidays-DK.rc diff --git a/AUTHORS b/AUTHORS index 44f3fc915..0ffc3b01f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,6 +33,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Alexander Schremmer Jostein Berntsen Andraž 'ruskie' Levstik + Irfan Siddiqui Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/ChangeLog b/ChangeLog index 2202195b9..fedd0a346 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,8 @@ + Added feature #546, which is a 'count' command that counts tasks, and is intended to help scripts that manipulate task output. + Added feature #567, which makes it possible to apply an offset to the first - month to be displayed in the calendar report (thanks to Michelle Crane) + month to be displayed in the calendar report (thanks to Michelle Crane). + + Added feature #575, including Danish holidays (thanks to Irfan Siddiqui). + Eliminated dependency on ncurses. + Fixed bug #515, which displayed an incorrect message after duplicating a non-existent task (thanks to Peter De Poorter). diff --git a/Makefile.am b/Makefile.am index f6c076175..1341200d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,4 +20,4 @@ i18ndir = $(docdir) nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE rcfiledir = $(docdir)/rc -dist_rcfile_DATA = doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-NL.rc doc/rc/holidays-NO.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme doc/rc/light-16.theme doc/rc/light-256.theme +dist_rcfile_DATA = doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-DK.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-NL.rc doc/rc/holidays-NO.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme doc/rc/light-16.theme doc/rc/light-256.theme diff --git a/doc/rc/holidays-DK.rc b/doc/rc/holidays-DK.rc new file mode 100644 index 000000000..d0544bd66 --- /dev/null +++ b/doc/rc/holidays-DK.rc @@ -0,0 +1,89 @@ +################################################################################ +# Sample calendar for Denmark +# +# taskwarrior - a command line task list manager. +# +# Copyright 2010, Irfan Siddiqui. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the +# +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, +# Boston, MA +# 02110-1301 +# USA +# +################################################################################ + +calendar.holidays=sparse + +# 2010 +holiday.juledag.name=Juledag +holiday.juledag.date=20101225 +holiday.andenjuledag.name=Anden juledag +holiday.andenjuledag.date=20101226 + +# 2011 +holiday.nytårsdag.name=Nytårsdag +holiday.nytårsdag.date=20110101 +holiday.palmesøndag.name=Palmesøndag +holiday.palmesøndag.date=20110417 +holiday.skærtorsdag.name=Skærtorsdag +holiday.skærtorsdag.date=20110421 +holiday.langfredag.name=Langfredag +holiday.langfredag.date=20110422 +holiday.påskedag.name=Påskedag +holiday.påskedag.date=20110424 +holiday.andenpåskedag.name=Anden påskedag +holiday.andenpåskedag.date=20110425 +holiday.storebededag.name=Store bededag +holiday.storebededag.date=20110520 +holiday.kristihimmelfartsdag.name=Kristi himmelfartsdag +holiday.kristihimmelfartsdag.date=20110602 +holiday.pinsedag.name=Pinsedag +holiday.pinsedag.date=20110612 +holiday.andenpinsedag.name=Anden pinsedag +holiday.andenpinsedag.date=20110613 + +#holiday.juledag.name=Juledag +#holiday.juledag.date=20111225 +#holiday.andenjuledag.name=Anden juledag +#holiday.andenjuledag.date=20111226 + +# 2012 +#holiday.nytårsdag.name=Nytårsdag +#holiday.nytårsdag.date=20120101 +#holiday.palmesøndag.name=Palmesøndag +#holiday.palmesøndag.date=20120401 +#holiday.skærtorsdag.name=Skærtorsdag +#holiday.skærtorsdag.date=20120405 +#holiday.langfredag.name=Langfredag +#holiday.langfredag.date=20120406 +#holiday.påskedag.name=Påskedag +#holiday.påskedag.date=20120408 +#holiday.andenpåskedag.name=Anden påskedag +#holiday.andenpåskedag.date=20120409 +#holiday.storebededag.name=Store bededag +#holiday.storebededag.date=20120504 +#holiday.kristihimmelfartsdag.name=Kristi himmelfartsdag +#holiday.kristihimmelfartsdag.date=20120517 +#holiday.pinsedag.name=Pinsedag +#holiday.pinsedag.date=20120527 +#holiday.andenpinsedag.name=Anden pinsedag +#holiday.andenpinsedag.date=20120528 +#holiday.juledag.name=Juledag +#holiday.juledag.date=20121225 +#holiday.andenjuledag.name=Anden juledag +#holiday.andenjuledag.date=20121226