From 283956c6572ae4324fd980175d3c499095c80788 Mon Sep 17 00:00:00 2001 From: Harald Pfeiffer Date: Fri, 26 Oct 2018 11:46:19 +0200 Subject: updated readme and vacation file location --- 2018/vacation-2018 | 4 ++++ README.md | 10 +++++----- vacation-2018 | 4 ---- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 2018/vacation-2018 delete mode 100644 vacation-2018 diff --git a/2018/vacation-2018 b/2018/vacation-2018 new file mode 100644 index 0000000..f8d4ee5 --- /dev/null +++ b/2018/vacation-2018 @@ -0,0 +1,4 @@ +define holidays: + VAC: + 2018_01_01 = Vacation + 2018_01_04 = Vacation diff --git a/README.md b/README.md index 8a4aa38..baf62bf 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ holidata.net for Germany is nearly complete, but it lacks some states and has some formal issues. I have handed in this to the holdata.net devs, and as soon as they have fixed that I will switch to using the refresh script. -They contain following files: +They contain following files (example): -- **holidays.de-DE:** Holidays which apply to all of Germany -- **holidays.de-XX:** Holidays for German state XX (XX=ISO-3166-2 code for the +- **2018/de/holidays.de-DE:** Holidays which apply to all of Germany for 2018 +- **2018/de/holidays.de-XX:** Holidays for German state XX (XX=ISO-3166-2 code for the respective states). Said code will be displayed in the output. -- **vacation-2018:** Sample vacation file. As timewarrior only knows the +- **2018/vacation-2018:** Sample vacation file. As timewarrior only knows the holiday definition and this is pretty sufficient (holidays only are an auxiliary display anyway), we will mark them as "VAC" and are done with it. @@ -86,6 +86,7 @@ timewarrior users to identify their state. | ch-BL | Basel-Landschaft | | ch-BS | Basel-Stadt | | ch-BE | Bern | +| ch-CH | Pseudo: all of Switzerland | | ch-FR | Freiburg (Fribourg) | | ch-GE | Genf (Génève) | | ch-GL | Glarus | @@ -106,5 +107,4 @@ timewarrior users to identify their state. | ch-VS | Wallis (Vallese) | | ch-ZG | Zug | | ch-ZH | Zürich (Zurigo) | -| de-CH | Pseudo: all of Switzerland | diff --git a/vacation-2018 b/vacation-2018 deleted file mode 100644 index f8d4ee5..0000000 --- a/vacation-2018 +++ /dev/null @@ -1,4 +0,0 @@ -define holidays: - VAC: - 2018_01_01 = Vacation - 2018_01_04 = Vacation -- cgit v1.2.3