From fe9eb9cacb480243a76114e7f15cc5d40322ed3a Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 27 Oct 2010 17:44:10 -0400 Subject: [PATCH] Holidays - Added Norwegian holidays (thanks to Jostein Berntsen). --- AUTHORS | 1 + ChangeLog | 4 +- NEWS | 2 +- doc/rc/holidays-NO.rc | 113 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 doc/rc/holidays-NO.rc diff --git a/AUTHORS b/AUTHORS index 4a9718225..a6c6bf793 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,6 +31,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Mick Koch Kathryn Andersen Alexander Schremmer + Jostein Berntsen Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/ChangeLog b/ChangeLog index cd7a8af86..243ef9fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,8 +50,8 @@ + The color.keyword.XXX color rule now applies to annotations too. + Importing the same YAML twice now generates an error. + Two new color themes (thanks to Kathryn Andersen). - + More localized holiday files for US, CA, SE, DE, FR, UK, ES and NL - (thanks to T. Charles Yun). + + More localized holiday files for US, CA, SE, DE, FR, UK, ES, NL and NO + (thanks to T. Charles Yun, Jostein Berntsen). + Added new 'diagnostics' command to help with bug submission, testing. + Fixed bug #427, preventing the task edit command to parse annotation dates with spaces. diff --git a/NEWS b/NEWS index 519b13934..7ca26bd40 100644 --- a/NEWS +++ b/NEWS @@ -23,7 +23,7 @@ New Features in taskwarrior 1.9.3 - Certain characters (#, $, @) are now supported for use in tags. - User-controlled color rule precedence. - Two new color themes. - - New holiday files for US, SE, DE, CA, FR, UK, ES and NL localizations. + - New holiday files for US, SE, DE, CA, FR, UK, ES, NL and NO localizations. - Task dependencies, and new 'blocked' and 'unblocked' reports for list those tasks. diff --git a/doc/rc/holidays-NO.rc b/doc/rc/holidays-NO.rc new file mode 100644 index 000000000..642831814 --- /dev/null +++ b/doc/rc/holidays-NO.rc @@ -0,0 +1,113 @@ +################################################################################ +# Sample calendar for Norway +# +# taskwarrior - a command line task list manager. +# +# Copyright 2010, Jostein Berntsen +# 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.julaften.name=Julaften +holiday.julaften.date=20101224 +holiday.juledag.name=Juledag +holiday.juledag.date=20101225 +holiday.juledag2.name=Juledag +holiday.juledag2.date=20101226 +holiday.nyttårsaften.name=Nyttårsaften +holiday.nyttårsaften.date=20101231 + +# 2011 +holiday.nyttårsdag.name=Nyttårsdag +holiday.nyttårsdag.date=20110101 +holiday.fastelavn.name=Fastelavn +holiday.fastelavn.date=20110306 +holiday.palmesøndag.name=Palmesøndag +holiday.palmesøndag.date=20110417 +holiday.skjærtorsdag.name=Skjærtorsdag +holiday.skjærtorsdag.date=20110421 +holiday.langfredag.name=Langfredag +holiday.langfredag.date=20110422 +holiday.påskedag.name=Påskedag +holiday.påskedag.date=20110424 +holiday.påskedag2.name=Påskedag +holiday.påskedag2.date=20110425 +holiday.offentlighøytidsdag.name=Offentlig Høytidsdag +holiday.offentlighøytidsdag.date=20110501 +holiday.frigjøringsdag.name=Frigjøringsdag 1945 +holiday.frigjøringsdag.date=20110508 +holiday.grunnlovsdag.name=Grunnlovsdag +holiday.grunnlovsdag.date=20110517 +holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag +holiday.KristiHimmelfartsdag.date=20110602 +holiday.pinsedag.name=Pinsedag +holiday.pinsedag.date=20110612 +holiday.pinsedag2.name=Pinsedag +holiday.pinsedag2.date=20110613 +#holiday.julaften.name=Julaften +#holiday.julaften.date=20111224 +#holiday.juledag.name=Juledag +#holiday.juledag.date=20111225 +#holiday.juledag2.name=Juledag +#holiday.juledag2.date=20111226 +#holiday.nyttårsaften.name=Nyttårsaften +#holiday.nyttårsaften.date=20111231 + +# 2012 +#holiday.nyttårsdag.name=Nyttårsdag +#holiday.nyttårsdag.date=20120101 +#holiday.fastelavn.name=Fastelavn +#holiday.fastelavn.date=20120219 +#holiday.palmesøndag.name=Palmesøndag +#holiday.palmesøndag.date=20120401 +#holiday.skjærtorsdag.name=Skjærtorsdag +#holiday.skjærtorsdag.date=20120405 +#holiday.langfredag.name=Langfredag +#holiday.langfredag.date=20120406 +#holiday.påskedag.name=Påskedag +#holiday.påskedag.date=20120408 +#holiday.påskedag2.name=Påskedag +#holiday.påskedag2.date=20120409 +#holiday.offentlighøytidsdag.name=Offentlig Høytidsdag +#holiday.offentlighøytidsdag.date=20120501 +#holiday.frigjøringsdag.name=Frigjøringsdag 1945 +#holiday.frigjøringsdag.date=20120508 +#holiday.grunnlovsdag.name=Grunnlovsdag +#holiday.grunnlovsdag.date=20120517 +#holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag +#holiday.KristiHimmelfartsdag.date=20120517 +#holiday.pinsedag.name=Pinsedag +#holiday.pinsedag.date=20120527 +#holiday.pinsedag2.name=Pinsedag +#holiday.pinsedag2.date=20120528 +#holiday.julaften.name=Julaften +#holiday.julaften.date=20121224 +#holiday.juledag.name=Juledag +#holiday.juledag.date=20121225 +#holiday.juledag2.name=Juledag +#holiday.juledag2.date=20121226 +#holiday.nyttårsaften.name=Nyttårsaften +#holiday.nyttårsaften.date=20121231 +