Merge pull request #121 from ekrist1/master

Added and corrected Norwegian holidays
kylekatarnls · Apr 5, 2024 · fc68c7b · fc68c7b
2 parents fe1b12f + eacec3e
commit fc68c7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Cmixin/HolidayNames/no.php b/src/Cmixin/HolidayNames/no.php
@@ -1,14 +1,17 @@
 <?php
 
 return [
+    '2nd-sunday-of-february'     => 'Morsdag',
+    '2nd-sunday-of-november'     => 'Farsdag',
+    '05-08'                      => 'Frigjøringsdagen 1945',
     'carnival'                   => 'Fastelavn',
     'constitution-day'           => '17. mai',
     'midsummar-eve'              => 'Sankthansaften',
     'first-sunday-of-advent'     => 'Første søndag i advent',
     'second-sunday-of-advent'    => 'Andre søndag i advent',
     'third-sunday-of-advent'     => 'Tredje søndag i advent',
     'fourth-sunday-of-advent'    => 'Fjerde søndag i advent',
-    'easter-49'                  => 'Fastelavn',
+    'easter-49'                  => 'Første pinsedag',
     '05-17'                      => '17. mai',
     '06-23'                      => 'Sankthansaften',
     'fourth-sunday-before-12-24' => 'Første søndag i advent',
@@ -26,6 +29,7 @@
     'easter-2'                   => 'Langfredag',
     'easter-1'                   => 'Påskeaften',
     'easter'                     => 'Første påskedag',
+    'easter-p1'                  => 'Andre påskedag',
     'easter-39'                  => 'Kristi himmelfartsdag',
     'easter-50'                  => 'Andre pinsedag',
     'fathers-day'                => 'Farsdag',

diff --git a/src/Cmixin/Holidays/no-national.php b/src/Cmixin/Holidays/no-national.php
@@ -3,16 +3,16 @@
 return [
     'new-year'                => '01-01',
     '2nd-sunday-of-february'  => '= second Sunday of February',
-    'easter-49'               => '= easter 49',
     'easter-7'                => '= easter -7',
     'easter-3'                => '= easter -3',
     'easter-2'                => '= easter -2',
-    'easter-p1'               => '= easter 1',
     'easter'                  => '= easter',
+    'easter-p1'               => '= easter 1',
     '05-01'                   => '05-01',
     '05-08'                   => '05-08',
     '05-17'                   => '05-17',
     'easter-39'               => '= easter 39',
+    'easter-49'               => '= easter 49',
     'easter-50'               => '= easter 50',
     '06-23'                   => '06-23',
     '2nd-sunday-of-november'  => '= second Sunday of November',