Merge branch 'spatie:main' into main

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to `holidays` will be documented in this file.
 
+## 1.8.0 - 2024-03-08
+
+### What's Changed
+
+* Adding holidays for Bahrain by @bo3bdo in https://github.com/spatie/holidays/pull/206
+* Add default locale by @Nielsvanpach in https://github.com/spatie/holidays/pull/208
+* Fix: Canada Victoria Day correction in test and calculation by @mercury64 in https://github.com/spatie/holidays/pull/211
+
+### New Contributors
+
+* @bo3bdo made their first contribution in https://github.com/spatie/holidays/pull/206
+* @mercury64 made their first contribution in https://github.com/spatie/holidays/pull/211
+
+**Full Changelog**: https://github.com/spatie/holidays/compare/1.7.0...1.8.0
+
 ## 1.7.0 - 2024-02-08
 
 ### What's Changed

lang/bahrain/ar/holidays.json

@@ -0,0 +1,16 @@
+{
+    "New Year\\'s Day": "رأس السنة الميلادية",
+    "Labour Day": "عيد العمال",
+    "Eid al-Fitr": "عيد الفطر المبارك",
+    "Eid al-Fitr Day 2": "عيد الفطر المبارك",
+    "Eid al-Fitr Day 3": "عيد الفطر المبارك",
+    "Eid al-Adha": "عيد الأضحى المبارك",
+    "Eid al-Adha Day 2": "عيد الأضحى المبارك",
+    "Eid al-Adha Day 3": "عيد الأضحى المبارك",
+    "Islamic New Year": "رأس السنة الهجرية",
+    "Birthday of the Prophet Muhammad": "المولد النبوي الشريف",
+    "Arafat Day": "يوم عرفة",
+    "National Day": "اليوم الوطني",
+    "National Day 2": "اليوم الوطني",
+    "Arafat Day 2": "يوم عرفة",
+}

src/Concerns/Observable.php

@@ -46,12 +46,11 @@ protected function observedChristmasDay(int $year): ?CarbonInterface
 
     protected function observedBoxingDay(int $year): ?CarbonInterface
     {
-        $christmasDay = (new CarbonImmutable($year.'-12-25'))->startOfDay();
-        $boxingDay = $christmasDay->addDay();
+        $boxingDay = (new CarbonImmutable($year.'-12-26'))->startOfDay();
 
-        return match ($christmasDay->dayName) {
-            'Friday' => $boxingDay->next('monday'),
-            'Saturday' => $boxingDay->next('tuesday'),
+        return match ($boxingDay->dayName) {
+            'Saturday' => $boxingDay->next('monday'),
+            'Sunday' => $boxingDay->next('tuesday'),
             default => null,
         };
     }

src/Concerns/Translatable.php

@@ -6,10 +6,15 @@
 
 trait Translatable
 {
-    protected function translate(string $country, string $name, ?string $locale = null): string
+    public function translate(string $country, string $name, ?string $locale = null): string
     {
         if ($locale === null) {
             return $name;
+
+        }
+
+        if ($locale === $this->defaultLocale()) {
+            return $name;
         }
 
         $countryName = strtolower($country);

src/Contracts/HasTranslations.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Spatie\Holidays\Contracts;
+
+interface HasTranslations
+{
+    public function defaultLocale(): string;
+
+    public function translate(string $country, string $name, ?string $locale = null): string;
+}

src/Countries/Albania.php

@@ -3,15 +3,24 @@
 namespace Spatie\Holidays\Countries;
 
 use Carbon\CarbonImmutable;
+use Spatie\Holidays\Concerns\Translatable;
+use Spatie\Holidays\Contracts\HasTranslations;
 use Spatie\Holidays\Exceptions\InvalidYear;
 
-class Albania extends Country
+class Albania extends Country implements HasTranslations
 {
+    use Translatable;
+
     public function countryCode(): string
     {
         return 'al';
     }
 
+    public function defaultLocale(): string
+    {
+        return 'al';
+    }
+
     protected function allHolidays(int $year): array
     {
         return array_merge([

src/Countries/Azerbaijan.php

@@ -3,14 +3,23 @@
 namespace Spatie\Holidays\Countries;
 
 use Carbon\CarbonImmutable;
+use Spatie\Holidays\Concerns\Translatable;
+use Spatie\Holidays\Contracts\HasTranslations;
 
-class Azerbaijan extends Country
+class Azerbaijan extends Country implements HasTranslations
 {
+    use Translatable;
+
     public function countryCode(): string
     {
         return 'az';
     }
 
+    public function defaultLocale(): string
+    {
+        return 'az';
+    }
+
     protected function allHolidays(int $year): array
     {
         return array_merge([
@@ -31,7 +40,6 @@ protected function allHolidays(int $year): array
     /** @return array<string, CarbonImmutable> */
     protected function variableHolidays(int $year): array
     {
-        // does not change according to the standard
         return [];
     }
 }