From d437309900fac58f721364f7ac9bd0d7cf7f8277 Mon Sep 17 00:00:00 2001
From: Inorien <Inorien@live.com>
Date: Thu, 2 Jan 2025 10:24:44 +0900
Subject: [PATCH] consistency with Holidays.dm and dates.dm

---
 .../en-US/holiday/greet/holiday-greet.ftl     |  63 ++---
 Resources/Prototypes/holidays.yml             | 243 +++---------------
 2 files changed, 49 insertions(+), 257 deletions(-)

diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
index 2080f42c6348..26821bc99643 100644
--- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
+++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
@@ -1,84 +1,51 @@
 ## Generic Congrats
 
-holiday-greet = Have a happy {$holidayName}!
+holiday-greet = Happy {$holidayName} Everybody!
 
 ## Holiday Names
 
-holiday-name-new-year = New Year
-holiday-name-mister-lizard = Mister Lizard's Birthday
-holiday-name-chinese-new-year = Chinese New Year
+holiday-name-new-year = New Year's Day
 holiday-name-groundhog-day = Groundhog Day
 holiday-name-valentines-day = Valentine's Day
-holiday-name-birthday13 = Birthday of Space Station 13
 holiday-name-random-kindness = Random Acts of Kindness Day
-holiday-name-leap-day = Leap Day
-holiday-name-miku-day = Hatsune Miku Day
 holiday-name-pi-day = Pi Day
 holiday-name-st-patricks-day = St. Patrick's Day
 holiday-name-easter = Easter
-holiday-name-april-fool-day = April Fools Day
+holiday-name-april-fool-day = April Fool's Day
 holiday-name-autism-awareness-day = Autism Awareness Day
-holiday-name-cosmonautics-day = Cosmonautics Day
 holiday-name-four-twenty = Four-Twenty
-holiday-name-tea-day = National Tea Day
 holiday-name-earth-day = Earth Day
-holiday-name-anzac-day = Anzac Day
-holiday-name-birthday14 = Birthday of Space Station 14
 holiday-name-labor-day = Labor Day
 holiday-name-firefighter-day = Firefighter's Day
-holiday-name-mothers-day = Mother's Day
+holiday-name-vg-birthday = /vg/station Anniversary
 holiday-name-owl-and-pussycat-day = Owl and Pussycat Day
-holiday-name-towel-day = Towel Day
-holiday-name-mommi-day = MoMMI Day
-holiday-name-garbage-day = Garbage Day
+holiday-name-world-bee-day = World Bee Day
+holiday-name-international-clown-day = International Clown Day
 holiday-name-international-picnic-day = International Picnic Day
-holiday-name-fathers-day = Father's Day
 holiday-name-summer-solstice = Summer Solstice
-holiday-name-stonewall-riots-anniversary = Stonewall Riots Anniversary
 holiday-name-doctor-day = Doctor's Day
 holiday-name-ufo-day = UFO Day
-holiday-name-us-independence-day = US Independence Day
 holiday-name-writers-day = Writer's Day
-holiday-name-bastille-day = Bastille Day
 holiday-name-friendship-day = Friendship Day
 holiday-name-beer-day = Beer Day
 holiday-name-talk-like-a-pirate-day = Talk-Like-a-Pirate Day
-holiday-name-programmers-day = Programmers' Day
-holiday-name-bisexual-pride-day = Bisexual Pride Day
 holiday-name-stupid-questions-day = Stupid-Questions Day
 holiday-name-animals-day = Animal's Day
 holiday-name-smiling-day = Smiling Day
-holiday-name-lesbian-day = Lesbian Day
-holiday-name-canadian-thanksgiving = Thanksgiving in Canada
-holiday-name-spirit-day = Spirit Day
+holiday-name-boss-day = Boss' Day
+holiday-name-space-asshole = St. Space Asshole's Day
 holiday-name-halloween = Halloween
 holiday-name-vegan-day = Vegan Day
-holiday-name-armistice-day = Armistice Day
 holiday-name-kindness-day = Kindness Day
-holiday-name-life-day = Life Day
-holiday-name-flowers-day = Flower's Day
-holiday-name-transgender-remembrance-day = Transgender Day of Remembrance
-holiday-name-saying-hello-day = Saying Hello Day
-holiday-name-thanksgiving = Thanksgiving in the United States
-holiday-name-sinterklaas = Sinterklaas
+holiday-name-flowers-day = Flowers Day
+holiday-name-saying-hello-day = Saying-'Hello' Day
+holiday-name-sinterklaas = Sinterklaasfeest
 holiday-name-human-rights-day = Human-Rights Day
 holiday-name-monkey-day = Monkey Day
-holiday-name-mayan-doomsday = Mayan Doomsday Anniversary
+holiday-name-mayan-doomsday = End of the World
+holiday-name-orgasm-day = Orgasming Day
+holiday-name-christmas-eve = Christmas Eve
 holiday-name-christmas = Christmas
-holiday-name-festive-season = Festive Season
 holiday-name-boxing-day = Boxing Day
+holiday-name-new-years-eve = New Year's Eve
 holiday-name-friday-thirteenth = Friday the 13th
-holiday-name-national-coming-out-day = National Coming Out Day
-holiday-name-pride-month = Pride Month
-
-## Custom congrats
-
-holiday-custom-cosmonautics-day = On this day over 600 years ago, Comrade Yuri Gagarin first ventured into space!
-holiday-custom-mothers-day = Happy Mother's Day in most of the Americas, Asia, and Oceania!
-holiday-custom-bastille-day = Do you hear the people sing?
-holiday-custom-friendship-day = Have a magical Friendship Day!
-holiday-custom-talk-like-a-pirate-day = Ye be talkin' like a pirate today or else ye'r walkin' tha plank, matey!
-holiday-custom-halloween = Have a spooky Halloween!
-holiday-custom-kindness-day = Go do some random acts of kindness for a stranger!
-holiday-custom-christmas = Have a merry Christmas!
-holiday-custom-festive-season = Have a nice festive season!
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index fae9c13adbda..a219f2afae60 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -1,23 +1,9 @@
 - type: holiday
   id: NewYear
   name: holiday-name-new-year
-  beginDay: 30
-  beginMonth: December
-  endDay: 2
-  endMonth: January
-
-- type: holiday
-  id: MisterLizard
-  name: holiday-name-mister-lizard
-  beginDay: 15
+  beginDay: 1
   beginMonth: January
 
-- type: holiday
-  id: ChineseNewYear
-  name: holiday-name-chinese-new-year
-  shouldCelebrate:
-    !type:ChineseNewYear {}
-
 - type: holiday
   id: GroundhogDay
   name: holiday-name-groundhog-day
@@ -27,14 +13,7 @@
 - type: holiday
   id: ValentinesDay
   name: holiday-name-valentines-day
-  beginDay: 13
-  endDay: 15
-  beginMonth: February
-
-- type: holiday
-  id: Birthday13
-  name: holiday-name-birthday13
-  beginDay: 16
+  beginDay: 14
   beginMonth: February
 
 - type: holiday
@@ -43,18 +22,6 @@
   beginDay: 17
   beginMonth: February
 
-- type: holiday
-  id: LeapDay
-  name: holiday-name-leap-day
-  beginDay: 29
-  beginMonth: February
-
-- type: holiday
-  id: MikuDay
-  name: holiday-name-miku-day
-  beginDay: 9
-  beginMonth: March
-
 - type: holiday
   id: PiDay
   name: holiday-name-pi-day
@@ -85,45 +52,18 @@
   beginDay: 2
   beginMonth: April
 
-- type: holiday
-  id: CosmonauticsDay
-  name: holiday-name-cosmonautics-day
-  beginDay: 12
-  beginMonth: April
-  greet:
-    !type:Custom
-    text: holiday-custom-cosmonautics-day
-
 - type: holiday
   id: FourTwenty
   name: holiday-name-four-twenty
   beginDay: 20
   beginMonth: April
 
-- type: holiday
-  id: TeaDay
-  name: holiday-name-tea-day
-  beginDay: 21
-  beginMonth: April
-
 - type: holiday
   id: EarthDay
   name: holiday-name-earth-day
   beginDay: 22
   beginMonth: April
 
-- type: holiday
-  id: AnzacDay
-  name: holiday-name-anzac-day
-  beginDay: 25
-  beginMonth: April
-
-- type: holiday
-  id: Birthday14
-  name: holiday-name-birthday14
-  beginDay: 26
-  beginMonth: April
-
 - type: holiday
   id: LaborDay
   name: holiday-name-labor-day
@@ -137,16 +77,10 @@
   beginMonth: May
 
 - type: holiday
-  id: MothersDay
-  name: holiday-name-mothers-day
+  id: VgBirthday
+  name: holiday-name-vg-birthday
+  beginDay: 9
   beginMonth: May
-  shouldCelebrate:
-    !type:WeekdayInMonth
-    weekday: Sunday
-    occurrence: 2
-  greet:
-    !type:Custom
-    text: holiday-custom-mothers-day
 
 - type: holiday
   id: OwlAndPussycatDay
@@ -155,50 +89,29 @@
   beginMonth: May
 
 - type: holiday
-  id: TowelDay
-  name: holiday-name-towel-day
-  beginDay: 25
+  id: WorldBeeDay
+  name: holiday-name-world-bee-day
+  beginDay: 20
   beginMonth: May
 
 - type: holiday
-  id: MoMMIDay
-  name: holiday-name-mommi-day
-  beginDay: 30
+  id: InternationalClownDay
+  name: holiday-name-international-clown-day
+  beginDay: 24
   beginMonth: May
 
-- type: holiday
-  id: GarbageDay
-  name: holiday-name-garbage-day
-  beginDay: 17
-  beginMonth: June
-
 - type: holiday
   id: InternationalPicnicDay
   name: holiday-name-international-picnic-day
   beginDay: 18
   beginMonth: June
 
-- type: holiday
-  id: FathersDay
-  name: holiday-name-fathers-day
-  beginMonth: August
-  shouldCelebrate:
-    !type:WeekdayInMonth
-    weekday: Sunday
-    occurrence: 3
-
 - type: holiday
   id: SummerSolstice
   name: holiday-name-summer-solstice
   beginDay: 21
   beginMonth: June
 
-- type: holiday
-  id: StonewallRiotsAnniversary
-  name: holiday-name-stonewall-riots-anniversary
-  beginDay: 28
-  beginMonth: June
-
 - type: holiday
   id: DoctorDay
   name: holiday-name-doctor-day
@@ -211,35 +124,17 @@
   beginDay: 2
   beginMonth: July
 
-- type: holiday
-  id: USIndependenceDay
-  name: holiday-name-us-independence-day
-  beginDay: 4
-  beginMonth: July
-
 - type: holiday
   id: WritersDay
   name: holiday-name-writers-day
   beginDay: 8
   beginMonth: July
 
-- type: holiday
-  id: BastilleDay
-  name: holiday-name-bastille-day
-  beginDay: 14
-  beginMonth: July
-  greet:
-    !type:Custom
-    text: holiday-custom-bastille-day
-
 - type: holiday
   id: FriendshipDay
   name: holiday-name-friendship-day
   beginDay: 30
   beginMonth: July
-  greet:
-    !type:Custom
-    text: holiday-custom-friendship-day
 
 - type: holiday
   id: BeerDay
@@ -254,22 +149,6 @@
   name: holiday-name-talk-like-a-pirate-day
   beginDay: 19
   beginMonth: September
-  greet:
-    !type:Custom
-    text: holiday-custom-talk-like-a-pirate-day
-
-- type: holiday
-  id: ProgrammersDay
-  name: holiday-name-programmers-day
-  shouldCelebrate:
-    !type:DayOfYear
-    dayOfYear: 256
-
-- type: holiday
-  id: BisexualPrideDay
-  name: holiday-name-bisexual-pride-day
-  beginDay: 23
-  beginMonth: September
 
 - type: holiday
   id: StupidQuestionsDay
@@ -290,43 +169,22 @@
   beginMonth: October
 
 - type: holiday
-  id: LesbianDay
-  name: holiday-name-lesbian-day
-  beginDay: 8
-  beginMonth: October
-
-- type: holiday
-  id: NationalComingOutDay
-  name: holiday-name-national-coming-out-day
-  beginDay: 11
+  id: BossDay
+  name: holiday-name-boss-day
+  beginDay: 16
   beginMonth: October
 
 - type: holiday
-  id: CanadianThanksgiving
-  name: holiday-name-canadian-thanksgiving
+  id: SpaceAsshole
+  name: holiday-name-space-asshole
+  beginDay: 25
   beginMonth: October
-  shouldCelebrate:
-    !type:WeekdayInMonth
-    occurrence: 2
-    weekday: Monday
-
-- type: holiday
-  id: SpiritDay
-  name: holiday-name-spirit-day
-  beginMonth: October
-  shouldCelebrate:
-    !type:WeekdayInMonth
-    occurrence: 3
-    weekday: Thursday
 
 - type: holiday
   id: Halloween
   name: holiday-name-halloween
   beginDay: 31
   beginMonth: October
-  greet:
-    !type:Custom
-    text: holiday-custom-halloween
 
 - type: holiday
   id: VeganDay
@@ -334,26 +192,11 @@
   beginDay: 1
   beginMonth: November
 
-- type: holiday
-  id: ArmisticeDay
-  name: holiday-name-armistice-day
-  beginDay: 11
-  beginMonth: November
-
 - type: holiday
   id: KindnessDay
   name: holiday-name-kindness-day
   beginDay: 13
   beginMonth: November
-  greet:
-    !type:Custom
-    text: holiday-custom-kindness-day
-
-- type: holiday
-  id: LifeDay
-  name: holiday-name-life-day
-  beginDay: 17
-  beginMonth: November
 
 - type: holiday
   id: FlowersDay
@@ -361,27 +204,12 @@
   beginDay: 19
   beginMonth: November
 
-- type: holiday
-  id: TransgenderRemembranceDay
-  name: holiday-name-transgender-remembrance-day
-  beginDay: 20
-  beginMonth: November
-
 - type: holiday
   id: SayingHelloDay
   name: holiday-name-saying-hello-day
   beginDay: 21
   beginMonth: November
 
-- type: holiday
-  id: Thanksgiving
-  name: holiday-name-thanksgiving
-  beginMonth: November
-  shouldCelebrate:
-    !type:WeekdayInMonth
-    occurrence: 4
-    weekday: Thursday
-
 - type: holiday
   id: Sinterklaas
   name: holiday-name-sinterklaas
@@ -407,24 +235,22 @@
   beginMonth: December
 
 - type: holiday
-  id: Christmas
-  name: holiday-name-christmas
+  id: OrgasmDay
+  name: holiday-name-orgasm-day
+  beginDay: 22
+  beginMonth: December
+
+- type: holiday
+  id: ChristmasEve
+  name: holiday-name-christmas-eve
   beginDay: 24
-  endDay: 26
   beginMonth: December
-  greet:
-    !type:Custom
-    text: holiday-custom-christmas
 
 - type: holiday
-  id: FestiveSeason
-  name: holiday-name-festive-season
-  beginDay: 1
-  endDay: 31
+  id: Christmas
+  name: holiday-name-christmas
+  beginDay: 25
   beginMonth: December
-  greet:
-    !type:Custom
-    text: holiday-custom-festive-season
 
 - type: holiday
   id: BoxingDay
@@ -432,15 +258,14 @@
   beginDay: 26
   beginMonth: December
 
+- type: holiday
+  id: NewYearsEve
+  name: holiday-name-new-years-eve
+  beginDay: 31
+  beginMonth: December
+
 - type: holiday
   id: FridayThirteenth
   name: holiday-name-friday-thirteenth
   shouldCelebrate:
     !type:FridayThirteenth { }
-
-- type: holiday
-  id: PrideMonth
-  name: holiday-name-pride-month
-  beginDay: 1
-  endDay: 31
-  beginMonth: June