Introduce observed_estimated_label (#1633)

vacanza · Jan 12, 2024 · ce947df · ce947df
1 parent 5cfd3d8
commit ce947df
Show file tree

Hide file tree

Showing 23 changed files with 576 additions and 477 deletions.
diff --git a/holidays/countries/azerbaijan.py b/holidays/countries/azerbaijan.py
@@ -30,10 +30,12 @@ class Azerbaijan(ObservedHolidayBase, InternationalHolidays, IslamicHolidays, St
 
     country = "AZ"
     default_language = "az"
-    # Estimated label.
+    # %s (estimated).
     estimated_label = tr("%s (təxmini)")
     # %s (observed).
     observed_label = tr("%s (müşahidə olunur)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (müşahidə olunur, təxmini)")
     supported_categories = (PUBLIC, WORKDAY)
     supported_languages = ("az", "en_US", "uk")
 

diff --git a/holidays/countries/brunei.py b/holidays/countries/brunei.py
@@ -67,8 +67,12 @@ class Brunei(
 
     country = "BN"
     default_language = "ms"
+    # %s (estimated).
     estimated_label = tr("%s (anggaran)")
+    # %s (observed).
     observed_label = tr("%s (diperhatikan)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (diperhatikan, anggaran)")
     supported_languages = ("en_US", "ms", "th")
 
     def __init__(self, *args, **kwargs):

diff --git a/holidays/countries/saudi_arabia.py b/holidays/countries/saudi_arabia.py
@@ -49,6 +49,8 @@ class SaudiArabia(ObservedHolidayBase, IslamicHolidays, StaticHolidays):
     estimated_label = tr("(تقدير) %s")
     # %s (observed).
     observed_label = tr("(ملاحظة) %s")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("(تقدير ملاحظة) %s")
     supported_languages = ("ar", "en_US")
 
     def __init__(self, *args, **kwargs):

diff --git a/holidays/countries/uzbekistan.py b/holidays/countries/uzbekistan.py
@@ -28,10 +28,12 @@ class Uzbekistan(ObservedHolidayBase, InternationalHolidays, IslamicHolidays, St
 
     country = "UZ"
     default_language = "uz"
-    # Estimated label.
+    # %s (estimated).
     estimated_label = tr("%s (taxminiy)")
-    # %s (Observed).
+    # %s (observed).
     observed_label = tr("%s (ko‘chirilgan)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (ko‘chirilgan, taxminiy)")
     supported_languages = ("en_US", "uk", "uz")
 
     def __init__(self, *args, **kwargs):

diff --git a/holidays/locale/ar/LC_MESSAGES/SA.po b/holidays/locale/ar/LC_MESSAGES/SA.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.30\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-08-04 20:02+0300\n"
 "PO-Revision-Date: 2023-08-04 20:05+0300\n"
 "Last-Translator: ~Jhellico <[email protected]>\n"
@@ -49,3 +49,8 @@ msgstr ""
 #. Founding Day
 msgid "يوم التأسيسي"
 msgstr ""
+
+#. %s (observed, estimated).
+#, c-format
+msgid "(تقدير ملاحظة) %s"
+msgstr ""
diff --git a/holidays/locale/az/LC_MESSAGES/AZ.po b/holidays/locale/az/LC_MESSAGES/AZ.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.39\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-11-15 20:42+0200\n"
 "PO-Revision-Date: 2023-11-15 20:47+0200\n"
 "Last-Translator: ~Jhellico <[email protected]>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Generated-By: Lingua 4.15.0\n"
 "X-Generator: Poedit 3.4\n"
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (təxmini)"
 msgstr ""
@@ -118,3 +118,8 @@ msgstr ""
 #, c-format
 msgid "İstirahət günü (%s ilə əvəz edilmişdir)"
 msgstr ""
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (müşahidə olunur, təxmini)"
+msgstr ""
diff --git a/holidays/locale/en_US/LC_MESSAGES/AZ.po b/holidays/locale/en_US/LC_MESSAGES/AZ.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.39\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-11-15 20:42+0200\n"
 "PO-Revision-Date: 2023-11-15 20:52+0200\n"
 "Last-Translator: ~Jhellico <[email protected]>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Generated-By: Lingua 4.15.0\n"
 "X-Generator: Poedit 3.4\n"
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (təxmini)"
 msgstr "%s (estimated)"
@@ -118,3 +118,8 @@ msgstr "%m/%d/%Y"
 #, c-format
 msgid "İstirahət günü (%s ilə əvəz edilmişdir)"
 msgstr "Day off (substituted from %s)"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (müşahidə olunur, təxmini)"
+msgstr "%s (observed, estimated)"
diff --git a/holidays/locale/en_US/LC_MESSAGES/BN.po b/holidays/locale/en_US/LC_MESSAGES/BN.po
@@ -19,10 +19,12 @@ msgstr ""
 msgid "Jubli Emas Sultan Hassanal Bolkiah"
 msgstr "Sultan Hassanal Bolkiah's Golden Jubilee"
 
+#. %s (estimated).
 #, c-format
 msgid "%s (anggaran)"
 msgstr "%s (estimated)"
 
+#. %s (observed).
 #, c-format
 msgid "%s (diperhatikan)"
 msgstr "%s (observed)"
@@ -78,3 +80,8 @@ msgstr "Islamic New Year"
 #. Birth of the Prophet
 msgid "Maulidur Rasul"
 msgstr "Birth of the Prophet"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (diperhatikan, anggaran)"
+msgstr "%s (observed, estimated)"
diff --git a/holidays/locale/en_US/LC_MESSAGES/SA.po b/holidays/locale/en_US/LC_MESSAGES/SA.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.30\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-08-04 20:02+0300\n"
 "PO-Revision-Date: 2023-08-04 20:03+0300\n"
 "Last-Translator: ~Jhellico <[email protected]>\n"
@@ -49,3 +49,8 @@ msgstr "National Day Holiday"
 #. Founding Day
 msgid "يوم التأسيسي"
 msgstr "Founding Day Holiday"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "(تقدير ملاحظة) %s"
+msgstr "%s (observed, estimated)"
diff --git a/holidays/locale/en_US/LC_MESSAGES/UZ.po b/holidays/locale/en_US/LC_MESSAGES/UZ.po
@@ -56,15 +56,15 @@ msgstr "Eid al-Fitr"
 msgid "Qurbon hayit"
 msgstr "Eid al-Adha"
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (taxminiy)"
 msgstr "%s (estimated)"
 
-#. %s (Observed).
+#. %s (observed).
 #, c-format
 msgid "%s (ko‘chirilgan)"
-msgstr "%s (Observed)"
+msgstr "%s (observed)"
 
 #. Date format (see strftime() Format Codes)
 msgid "%d/%m %Y"
@@ -78,3 +78,8 @@ msgstr "Day off (substituted from %s)"
 #. Additional day off by Presidential decree.
 msgid "Prezidentining farmoni bilan qo‘shimcha dam olish kuni"
 msgstr "Additional day off by Presidential decree"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (ko‘chirilgan, taxminiy)"
+msgstr "%s (observed, estimated)"
diff --git a/holidays/locale/ms/LC_MESSAGES/BN.po b/holidays/locale/ms/LC_MESSAGES/BN.po
@@ -19,10 +19,12 @@ msgstr ""
 msgid "Jubli Emas Sultan Hassanal Bolkiah"
 msgstr ""
 
+#. %s (estimated).
 #, c-format
 msgid "%s (anggaran)"
 msgstr ""
 
+#. %s (observed).
 #, c-format
 msgid "%s (diperhatikan)"
 msgstr ""
@@ -78,3 +80,8 @@ msgstr ""
 #. Birth of the Prophet
 msgid "Maulidur Rasul"
 msgstr ""
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (diperhatikan, anggaran)"
+msgstr ""
diff --git a/holidays/locale/th/LC_MESSAGES/BN.po b/holidays/locale/th/LC_MESSAGES/BN.po
@@ -19,10 +19,12 @@ msgstr ""
 msgid "Jubli Emas Sultan Hassanal Bolkiah"
 msgstr "พระราชพิธีกาญจนาภิเษกสมเด็จพระราชาธิบดีสุลต่านฮัสซานัล โบลเกียห์"
 
+#. %s (estimated).
 #, c-format
 msgid "%s (anggaran)"
 msgstr "%s (โดยประมาณ)"
 
+#. %s (observed).
 #, c-format
 msgid "%s (diperhatikan)"
 msgstr "ชดเชย%s"
@@ -78,3 +80,8 @@ msgstr "วันขึ้นปีใหม่อิสลาม"
 #. Birth of the Prophet
 msgid "Maulidur Rasul"
 msgstr "วันเมาลิดนบี"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (diperhatikan, anggaran)"
+msgstr "ชดเชย%s (โดยประมาณ)"
diff --git a/holidays/locale/uk/LC_MESSAGES/AZ.po b/holidays/locale/uk/LC_MESSAGES/AZ.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.39\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-11-15 20:42+0200\n"
 "PO-Revision-Date: 2023-11-15 20:55+0200\n"
 "Last-Translator: ~Jhellico <[email protected]>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Generated-By: Lingua 4.15.0\n"
 "X-Generator: Poedit 3.4\n"
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (təxmini)"
 msgstr "%s (приблизна дата)"
@@ -118,3 +118,8 @@ msgstr "%d.%m.%Y"
 #, c-format
 msgid "İstirahət günü (%s ilə əvəz edilmişdir)"
 msgstr "Вихідний день (перенесено з %s)"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (müşahidə olunur, təxmini)"
+msgstr "%s (вихідний, приблизна дата)"
diff --git a/holidays/locale/uk/LC_MESSAGES/UZ.po b/holidays/locale/uk/LC_MESSAGES/UZ.po
@@ -56,12 +56,12 @@ msgstr "Рамазан-байрам"
 msgid "Qurbon hayit"
 msgstr "Курбан-байрам"
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (taxminiy)"
 msgstr "%s (приблизна дата)"
 
-#. %s (Observed).
+#. %s (observed).
 #, c-format
 msgid "%s (ko‘chirilgan)"
 msgstr "%s (вихідний)"
@@ -78,3 +78,8 @@ msgstr "Вихідний день (перенесено з %s)"
 #. Additional day off by Presidential decree.
 msgid "Prezidentining farmoni bilan qo‘shimcha dam olish kuni"
 msgstr "Додатковий вихідний згідно указу Президента"
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (ko‘chirilgan, taxminiy)"
+msgstr "%s (вихідний, приблизна дата)"
diff --git a/holidays/locale/uz/LC_MESSAGES/UZ.po b/holidays/locale/uz/LC_MESSAGES/UZ.po
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Qurbon hayit"
 msgstr ""
 
-#. Estimated label.
+#. %s (estimated).
 #, c-format
 msgid "%s (taxminiy)"
 msgstr ""
 
-#. %s (Observed).
+#. %s (observed).
 #, c-format
 msgid "%s (ko‘chirilgan)"
 msgstr ""
@@ -78,3 +78,8 @@ msgstr ""
 #. Additional day off by Presidential decree.
 msgid "Prezidentining farmoni bilan qo‘shimcha dam olish kuni"
 msgstr ""
+
+#. %s (observed, estimated).
+#, c-format
+msgid "%s (ko‘chirilgan, taxminiy)"
+msgstr ""
diff --git a/holidays/observed_holiday_base.py b/holidays/observed_holiday_base.py
@@ -134,13 +134,28 @@ def _add_observed(
         if dt_observed == dt:
             return False, dt
 
-        observed_label = getattr(
-            self,
-            "observed_label_before" if dt_observed < dt else "observed_label",
-            self.observed_label,
+        estimated_label = self.tr(getattr(self, "estimated_label", ""))
+        observed_label = self.tr(
+            getattr(
+                self,
+                "observed_label_before" if dt_observed < dt else "observed_label",
+                self.observed_label,
+            )
         )
+
+        estimated_label_text = estimated_label.strip("%s ()")
+        # Use observed_estimated_label instead of observed_label for estimated dates.
         for name in (name,) if name else self.get_list(dt):
-            super()._add_holiday(self.tr(observed_label) % self.tr(name), dt_observed)
+            holiday_name = self.tr(name)
+            observed_estimated_label = None
+            if len(estimated_label_text) > 0 and estimated_label_text in holiday_name:
+                holiday_name = holiday_name.replace(f"({estimated_label_text})", "").strip()
+                observed_estimated_label = self.tr(getattr(self, "observed_estimated_label"))
+
+            super()._add_holiday(
+                (observed_estimated_label or observed_label) % holiday_name, dt_observed
+            )
+
         return True, dt_observed
 
     def _move_holiday(self, dt: date, rule: Optional[ObservedRule] = None) -> Tuple[bool, date]: