Skip to content

Commit

Permalink
Merge pull request #536 from kmcbride3/main
Browse files Browse the repository at this point in the history 
Improve Canadian holidays
  • Loading branch information
@derTobsch
derTobsch committed Jun 13, 2024
2 parents 0ae2940 + 036ad02 commit 7abeec5
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 19 deletions.
19 changes: 14 additions & 5 deletions jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ holiday.description.BOYACA = Battle of Boyacá
holiday.description.BRIDGING_HOLIDAY = Bridging Holiday
holiday.description.BROOKLY_QUEENS = Brooklyn-Queens Day
holiday.description.BUNKER_HILL = Bunker Hill Day
holiday.description.CANADA_DAY = Canada Day
holiday.description.CANBERRA_DAY = Canberra Day
holiday.description.CANDELARIA = Fiesta de la Candelaria
holiday.description.CANDLEMAS = Candlemas
Expand Down Expand Up @@ -153,16 +154,18 @@ holiday.description.HUMAN_RIGHTS = Human Rights Day
holiday.description.HURRICANE_SANDY = Hurricane Sandy
holiday.description.HUS = Jan Hus Day
holiday.description.HUSBANDS_DAY = Husbands Day
holiday.description.ID_UL_FITR = Id-ul- Fitr
holiday.description.ID_UL_FITR = Eid-ul-Fitr
holiday.description.IMMACULATE_CONCEPTION = Immaculate Conception Day
holiday.description.IMPERIAL_DAY = Event of imperial mourning or celebration
holiday.description.INDEPENDENCE_AND_REPUBLIC_DAY = Independence and Republic Day
holiday.description.INDEPENDENCE_DAY = Independence Day
holiday.description.INDEP_CUENCA = Independence of Cuenca
holiday.description.INDEP_GUYAQUIL = Independence of Guayaquil
holiday.description.INDEP_QUITO = Independence of Quito
holiday.description.INDIGENOUS_PEOPLES_DAY = National Indigenous Peoples Day
holiday.description.INDIGENOUS_RESISTANCE = Day of the Indigenous Resistance
holiday.description.INTERNATIONAL_WOMAN = International Woman's Day
holiday.description.ISLANDER_DAY = Islander Day
holiday.description.JEFFERSON_DAVIS = Jefferson Davis Day
holiday.description.JOAO_PESSOA_DAY = João Pessoa Death
holiday.description.JOHANNIS_DAY = Johannis day
Expand Down Expand Up @@ -190,6 +193,7 @@ holiday.description.LEE_JACKSON = Lee-Jackson Day
holiday.description.LEOPOLD = Leopold III. day
holiday.description.LIBERATION = Liberation Day
holiday.description.LINCOLN = Lincoln's Birthday
holiday.description.LOUIS_RIEL = Louis Riel Day
holiday.description.LUNAR_NEW_YEARS_DAY = Lunar New Year's Day
holiday.description.MAHA_SHIVRATREE = Maha Shivaratree
holiday.description.MAJORITY_RULE_DAY = Majority Rule Day
Expand Down Expand Up @@ -220,11 +224,14 @@ holiday.description.NATIVITY_MARY = Nativity of Mary
holiday.description.NAVY_DAY = Navy day
holiday.description.NELSON_ANNIVERSARY = Nelson Anniversary
holiday.description.NEVADA = Nevada Day
holiday.description.NEW_YEAR = New Year
holiday.description.NEW_YEARS_EVE = New Years Eve
holiday.description.NEW_BRUNSWICK_DAY = New Brunswick Day
holiday.description.NEW_YEAR = New Year's Day
holiday.description.NEW_YEARS_EVE = New Year's Eve
holiday.description.NUNAVUT_DAY = Nunavut Day
holiday.description.OCHI = Ochi Day
holiday.description.OCT_REVOLUTION = October Revolution Day
holiday.description.OIL_EXPROPRIATION_DAY = Oil Expropriation Day
holiday.description.ORANGE_SHIRT_DAY = Orange Shirt Day
holiday.description.OTAGO_ANNIVERSARY = Otago Anniversary
holiday.description.PATRIOT = Patriots' Day
holiday.description.PEACE = Peace Festival
Expand All @@ -249,7 +256,7 @@ holiday.description.RECREATION = Recreation Day
holiday.description.REFORMATION_DAY = Reformation day
holiday.description.REGIONAL = Regional holiday
holiday.description.REMEMBERANCE_OF_PRESIDENT_FORD = Remembrance of President Ford
holiday.description.REMEMBRANCE = Remembrance day
holiday.description.REMEMBRANCE = Remembrance Day
holiday.description.REMEMBRANCE_TRUTH_JUSTICE = Day of Remembrance for Truth and Justice
holiday.description.REPENTANCE_PRAYER = Day of Repentance and Prayer
holiday.description.REPUBLIC_DAY = Republic Day
Expand All @@ -268,6 +275,7 @@ holiday.description.SANTA_ROSA = Holy Rosa of Lima
holiday.description.SANTIAGO = Fiesta de Santiago
holiday.description.SANTIAGO_APOSTOL = Santiago Apóstol
holiday.description.SANTO_DOMINGO = Fiesta de Santo Domingo
holiday.description.SASKATCHEWAN_DAY = Saskatchewan Day
holiday.description.SECOND_CHRISTMAS_DAY = 2nd Christmas day
holiday.description.SECOND_DAY_OF_LUNAR_NEW_YEAR = The second day of Lunar New Year
holiday.description.SELF_GOVERNANCE = Self-governance Day
Expand Down Expand Up @@ -315,6 +323,7 @@ holiday.description.THIRD_DAY_OF_LUNAR_NEW_YEAR = The third day of Lunar Ne
holiday.description.THREE_HIERARCHS = The Three Holy Hierarchs
holiday.description.TIRADENTES = Tiradentes' Day
holiday.description.TRUMAN = Truman Day
holiday.description.TRUTH_RECONCILIATION_DAY = National Day for Truth and Reconciliation
holiday.description.TT_BANK_HOLIDAY = T.T. Bank Holiday
holiday.description.TUEN_NG_FESTIVAL = Tuen Ng Festival
holiday.description.TURKEY_CHILDRENS_DAY = National Sovereignty and Children's Day
Expand All @@ -328,7 +337,7 @@ holiday.description.UNIFICATION = Unification Day
holiday.description.UNIFICATION_GERMANY = German Unity Day
holiday.description.VESAK_DAY = Vesak Day
holiday.description.VETERANS_DAY = Veterans Day
holiday.description.VICTORIA_DAY = Queen Victorias Birthday
holiday.description.VICTORIA_DAY = Queen Victoria's Birthday
holiday.description.VICTORY = Victory Day
holiday.description.VICTORY_ADWA = Victory at Adwa Day
holiday.description.VICTORY_DAY = Wars end in Europe
Expand Down
12 changes: 11 additions & 1 deletion jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ holiday.description.BOYACA = Bataille de Boyaca
holiday.description.BRIDGING_HOLIDAY = Pont de Jour férier
holiday.description.BROOKLY_QUEENS = Journée des reines de Brooklyn
holiday.description.BUNKER_HILL = jour du Bunker dde la Colinne
holiday.description.CANADA_DAY = Fête du Canada
holiday.description.CANBERRA_DAY = Journée de Camberra
holiday.description.CANDELARIA = Fête de la Candelaria
holiday.description.CANDLEMAS = Chandeleur
Expand Down Expand Up @@ -153,15 +154,18 @@ holiday.description.HUMAN_RIGHTS = Journée des Droits de l'
holiday.description.HURRICANE_SANDY = Ouragant Sandy
holiday.description.HUS = Journée de Jan Hus
holiday.description.HUSBANDS_DAY = Journée des Mariés
holiday.description.ID_UL_FITR = Aïd-ul-Fitr
holiday.description.IMMACULATE_CONCEPTION = Journée de l'Immaculée Conception
holiday.description.IMPERIAL_DAY = L'événement de deuil impérial ou de célébration
holiday.description.INDEPENDENCE_AND_REPUBLIC_DAY = Jour de l'indépendance et de la République
holiday.description.INDEPENDENCE_DAY = Journée de l'indépendance
holiday.description.INDEP_CUENCA = Journée de l'indépendance du Cuenca
holiday.description.INDEP_GUYAQUIL = Journée de l'indépendance du Guyaquil
holiday.description.INDEP_QUITO = Journée de l'indépendance de Quito
holiday.description.INDIGENOUS_PEOPLES_DAY = Journée nationale des peuples Autochtones
holiday.description.INDIGENOUS_RESISTANCE = Journée de la résistance indigène
holiday.description.INTERNATIONAL_WOMAN = Journée Internationale de la Femme
holiday.description.ISLANDER_DAY = Fête des Insulaires
holiday.description.JEFFERSON_DAVIS = Journée de Jefferson Davis
holiday.description.JOAO_PESSOA_DAY = João Pessoa mort
holiday.description.JOHANNIS_DAY = Johannis day
Expand All @@ -176,7 +180,7 @@ holiday.description.KINGS_CORONATION = King's Coronation
holiday.description.KINGS_DAY = Kings' Birthday
holiday.description.KINGS_FEAST = King's Feast
holiday.description.KRUGER = Kruger Day
holiday.description.LABOUR_DAY = Fête du Travail
holiday.description.LABOUR_DAY = Fête du travail
holiday.description.LADY_APRESENTACAO = Our Lady of Apresentação
holiday.description.LADY_CONCEICAO = Our Lady of Conceição
holiday.description.LADY_GOOD_VOYAGE = Our Lady of the Good Voyage
Expand All @@ -189,6 +193,7 @@ holiday.description.LEE_JACKSON = Lee-Jackson Day
holiday.description.LEOPOLD = Leopold III. day
holiday.description.LIBERATION = Liberation Day
holiday.description.LINCOLN = Lincoln's Birthday
holiday.description.LOUIS_RIEL = Journée Louis Riel
holiday.description.LUNAR_NEW_YEARS_DAY = Jour du nouvel an lunaire
holiday.description.MAHA_SHIVRATREE = Maha Shivaratree
holiday.description.MAJORITY_RULE_DAY = Jour de la règle de la majorité
Expand Down Expand Up @@ -219,11 +224,14 @@ holiday.description.NATIVITY_MARY = Nativité de Marie
holiday.description.NAVY_DAY = Navy day
holiday.description.NELSON_ANNIVERSARY = Nelson Anniversary
holiday.description.NEVADA = Nevada Day
holiday.description.NEW_BRUNSWICK_DAY = Jour du Nouveau-Brunswick
holiday.description.NEW_YEAR = Jour de l'An
holiday.description.NEW_YEARS_EVE = Veille du Jour de l'An
holiday.description.NUNAVUT_DAY = Jour De Nunavut
holiday.description.OCHI = Ochi Day
holiday.description.OCT_REVOLUTION = October Revolution Day
holiday.description.OIL_EXPROPRIATION_DAY = Day Expropriation Oil
holiday.description.ORANGE_SHIRT_DAY = Jour du chandail orange
holiday.description.OTAGO_ANNIVERSARY = Otago Anniversary
holiday.description.PATRIOT = Patriots' Day
holiday.description.PEACE = Peace Festival
Expand Down Expand Up @@ -267,6 +275,7 @@ holiday.description.SANTA_ROSA = Holy Rosa of Lima
holiday.description.SANTIAGO = Fiesta de Santiago
holiday.description.SANTIAGO_APOSTOL = Santiago Apóstol
holiday.description.SANTO_DOMINGO = Fiesta de Santo Domingo
holiday.description.SASKATCHEWAN_DAY = Jour Saskatchewan
holiday.description.SECOND_CHRISTMAS_DAY = Deuxième vacances de Noël
holiday.description.SECOND_DAY_OF_LUNAR_NEW_YEAR = Le deuxième jour du Nouvel An lunaire
holiday.description.SELF_GOVERNANCE = Self-governance Day
Expand Down Expand Up @@ -314,6 +323,7 @@ holiday.description.THIRD_DAY_OF_LUNAR_NEW_YEAR = Le troisième jour du Nou
holiday.description.THREE_HIERARCHS = The Three Holy Hierarchs
holiday.description.TIRADENTES = Tiradentes' Day
holiday.description.TRUMAN = Journée de Truman
holiday.description.TRUTH_RECONCILIATION_DAY = Journée nationale pour la vérité et la réconciliation
holiday.description.TT_BANK_HOLIDAY = Tourist Trophy Senior Race Day
holiday.description.TUEN_NG_FESTIVAL = Festival de Tuen Ng
holiday.description.TURKEY_CHILDRENS_DAY = Journée de la souveraineté nationale et des enfants
Expand Down
Loading

0 comments on commit 7abeec5

Please sign in to comment.