From 64dfc56d3c0c0a8b35be2b366ed516802cca733e Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Thu, 27 Jan 2022 15:57:06 +0100
Subject: [PATCH 001/152] Update README.md

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index dfd04a3a..ce184af3 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,14 @@ Two object keys are returned:
 </a>
 
 # CHANGELOG
+## [v3.3](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.3) (January 27th 2022)
+ * move festivity data from the 2008 Editio Typica Tertia emendata out from the `LitCalAPI.php`, to a JSON file
+ * move data for festivities from Decrees of the Congregation of Divine Worship out from the `LitCalAPI.php`, to a JSON file
+## [v3.2](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.2) (January 23rd 2022)
+ * allow full CORS requests from enabled domains
+ * allow Diocesan overrides for Epiphany, Ascension and Corpus Christi
+## [v3.1](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.1) (December 26th 2021)
+ * bugfix which was missed in the v3.0 release: 86ee62ad68d58736880da2b5b39117dec7386dfc
 
 ## [v3.0](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.0) (December 26th 2021)
  * all calendar data moved from a MySQL database to JSON files, that can be tracked in the repository

From 2431b34dacfc2a487eb7c76b14c7e4ab3dcc6bba Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Thu, 27 Jan 2022 15:59:35 +0100
Subject: [PATCH 002/152] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ce184af3..b03338dd 100644
--- a/README.md
+++ b/README.md
@@ -232,7 +232,7 @@ add translations for the Messages array in Italian, English and Latin (please fo
  * move as many festivities as possible to the MySQL tables to allow for localization (mobile feasts will be calculated in the script, but still need to be localized)
  * add ICS data generation (requires more localization strings, because it is already a form of final display of the data)
 
-## [v2.0](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/1.0) (January 8th 2018)
+## [v2.0](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/2.0) (January 8th 2018)
  * separate the display logic from the engine, so that the engine can act as an endpoint
  * make the engine return JSON or XML data that the display logic can use to generate a user-friendly representation of the data
 

From 11b0734e60225173a4ae9db0f5c5f179eabf6ebb Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Sat, 29 Jan 2022 11:46:18 +0000
Subject: [PATCH 003/152] Translated using Weblate (Italian)

Currently translated at 100.0% (103 of 103 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/it/
---
 i18n/it/LC_MESSAGES/litcal.mo | Bin 13478 -> 13482 bytes
 i18n/it/LC_MESSAGES/litcal.po |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/i18n/it/LC_MESSAGES/litcal.mo b/i18n/it/LC_MESSAGES/litcal.mo
index 5f35f3457410a8b755846149f5b41637a8b460da..051216de371fab5292e6c07ffd388206685f4916 100644
GIT binary patch
delta 624
zcmXZZJ7`l;9LMorB_=U8wIvt}R!x)C8a0oq&_!^ln@CM9baA=F4p*9&dAPLPF-vrb
z58CQtz@bnGB=|tkf<uR{(#_3Q1gA`bpneaz)93vE=bqoW|9juqTXv`FaYiM*jY=c9
zi>BVkN&MmVkHw^u)Z-Y$6q@I+<8i!&r*H{}v4{a&#Sk{IjGJikgYki9<8tJqk)~ms
z#d~-I&B2#$zvKEIP4EuR;T}ft#FX>|GuXq=SjFmj$;O}f0Pjwdji0cMf2SR(#^Uvb
z!GZCFbf5Y$_OXu*Jh&)rVE&TSME_+%@EQKb#iaBPZ>OZ^#<aA8-|-t}GtwHSXQV^i
z#wC2}Tp3LI3(XhMRmlT>JcmIHV-mSbH}NQz-Tg;6LH)w5d&sc*ieCJKChy3#!8xC6
z5YNz0gjn#Bnn8w?h2|eM(OmQjO;EeL?tOQ9sM5+tZBNPm@}c!HIv=PNBK74;u2?U&
eLa{`+R<I)ZV!_H;y0iQ+!fwebS>1)$;@E%LidW?T

delta 620
zcmXZZPe{{Y9LMpGxF$=}B2!4iUz@u2FEu*^9SXeULAF@fr4FGZo|<gBHM+zO9#jx1
z2Gu&)K@gG-gN*`>or11`XTc!DlLs$KMEZW%@AP^;--qw>Jm24M!>pT1-cvj$>5E@#
z$M1L^xA7|eM!W9~NSCk^Z4P4x-omqZ54$mmZTQ@+zr>5=d7Q;}XwUccH@w`hqFN|K
zC|F1F5#C1I_};C5cCDek@EeZd4|K3~Kw7~l)^H2+m>rZ1?%^|x2c<i>iEH>bSd?C{
zSiRP0=nP5I<Rv`B16;sgVd(>!h_sBJs8q){c#Mgdbb{m8rMK20DUG|hgA>EjD~yat
zfAAAN#Mi|ejY;>>eu01JLC>hvhd%7W5OSC9;u)NA_jA}wF1fja46C2$#Ur%m{YTr^
ze6yhsuaH9>EO?}1$dG!B_8%>xZ78EX=wr3){o2!%EZz5;CR3{W<38gQQn{&2!IZiK
dp)TXhrPAi9$>fX@sX50u*(X_3oeVs<a0)xxR$2f6

diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 544eb4cc..ecfdba12 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-01-27 14:41+0000\n"
-"PO-Revision-Date: 2022-01-27 14:23+0000\n"
+"PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/it/>\n"
@@ -614,12 +614,12 @@ msgstr "Per una santa martire"
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:88
 msgid "For a Pope"
-msgstr "Per i papi"
+msgstr "Per un papa"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:90
 msgid "For a Bishop"
-msgstr "Per i vescovi"
+msgstr "Per un vescovo"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:92
@@ -629,7 +629,7 @@ msgstr "Per un pastore"
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:94
 msgid "For Several Pastors"
-msgstr "Per i pastori"
+msgstr "Per più pastori"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:96
@@ -669,7 +669,7 @@ msgstr "Per più santi"
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:110
 msgid "For One Saint"
-msgstr "Per un Santo"
+msgstr "Per un santo"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:112
@@ -684,7 +684,7 @@ msgstr "Per un monaco"
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:116
 msgid "For a Nun"
-msgstr "Per i religiosi"
+msgstr "Per una monaca"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:118

From c27289f3c893a184d605e8b1a495a48e2e76669d Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Tue, 1 Feb 2022 16:42:49 +0100
Subject: [PATCH 004/152] -fixes issue #95 (USA Saint Vincent deacon)

and simplify USA calendar method while we're at it
---
 includes/FestivityCollection.php |   4 +-
 includes/LitCalAPI.php           | 125 ++++++++++++-------------------
 includes/enums/RomanMissal.php   |   2 +-
 3 files changed, 51 insertions(+), 80 deletions(-)

diff --git a/includes/FestivityCollection.php b/includes/FestivityCollection.php
index 7ea6ef81..bcbca10e 100644
--- a/includes/FestivityCollection.php
+++ b/includes/FestivityCollection.php
@@ -40,11 +40,11 @@ public function __construct( LitSettings $LitSettings ) {
         $this->LitGrade = new LitGrade( $this->LitSettings->Locale );
     }
 
-    private static function DateIsSunday( DateTime $dt ) : bool {
+    public static function DateIsSunday( DateTime $dt ) : bool {
         return (int)$dt->format( 'N' ) === 7;
     }
 
-    private static function DateIsNotSunday( DateTime $dt ) : bool {
+    public static function DateIsNotSunday( DateTime $dt ) : bool {
         return (int)$dt->format( 'N' ) !== 7;
     }
 
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 0904969a..0a484b99 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1082,6 +1082,8 @@ private function checkImmaculateHeartCoincidence( DateTime $currentFeastDate, st
     private function createFestivityFromDecree( object $row ) : void {
         if( $row->Festivity->TYPE === "mobile" ) {
             //we won't have a date defined for mobile festivites, we'll have to calculate them here case by case
+            //otherwise we'll have to create a language that we can interpret in an automated fashion...
+            //for example we can use strtotime
             switch( $row->Festivity->TAG ) {
                 case "MaryMotherChurch":
                     $row->Festivity->DATE = LitFunc::calcGregEaster( $this->LitSettings->Year )->add( new DateInterval( 'P' . ( 7 * 7 + 1 ) . 'D' ) );
@@ -1730,19 +1732,17 @@ private function applyCalendarUSA() : void {
         //move Saint Vincent Deacon from Jan 22 to Jan 23 in order to allow for National Day of Prayer for the Unborn on Jan 22
         //however if Jan 22 is a Sunday, National Day of Prayer for the Unborn is moved to Jan 23 ( in place of Saint Vincent Deacon )
         $festivity = $this->Cal->getFestivity( "StVincentDeacon" );
-        if( $festivity !== null ){
-            //I believe we don't have to worry about suppressing, because if it's on a Sunday it won't exist already
-            //so if the National Day of Prayer happens on a Sunday and must be moved to Monday, Saint Vincent will be already gone anyways
-            $StVincentDeaconNewDate = $festivity->date->add( new DateInterval( 'P1D' ) );
-            $this->Cal->moveFestivityDate( "StVincentDeacon", $StVincentDeaconNewDate );
-            //let's not worry about translating these messages, just leave them in English
-            $this->Messages[] = sprintf(
-                "USA: The Memorial '%s' was moved from Jan 22 to Jan 23 to make room for the National Day of Prayer for the Unborn, as per the 2011 Roman Missal issued by the USCCB",
-                '<i>' . $festivity->name . '</i>'
-            );
-            $this->Cal->setProperty( "StVincentDeacon", "name", "[ USA ] " . $festivity->name );
+        if( $festivity !== null ) {
+            $StVincentDeaconNewDate = clone ( $festivity->date );
+            $StVincentDeaconNewDate->add( new DateInterval( 'P1D' ) );
+            $this->moveFestivityDate( "StVincentDeacon", $StVincentDeaconNewDate, "National Day of Prayer for the Unborn", RomanMissal::USA_EDITION_2011 );
         }
 
+        //move Saint Paul of the Cross to the next day (Oct 20), to make room for Saint John Brebeuf, elevated to memorial
+        $StPaulCrossNewDate = DateTime::createFromFormat( '!j-n-Y', '20-10-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $this->moveFestivityDate( "StPaulCross", $StPaulCrossNewDate, "Saint John Brebeuf (elevated to memorial)", RomanMissal::USA_EDITION_2011 );
+
+        //elevate Saint John Brebeuf to memorial
         $festivity = $this->Cal->getFestivity( "StsJeanBrebeuf" );
         if( $festivity !== null ) {
             //if it exists, it means it's not on a Sunday, so we can go ahead and elevate it to Memorial
@@ -1753,46 +1753,6 @@ private function applyCalendarUSA() : void {
                 $this->LitSettings->Year
             );
             $this->Cal->setProperty( "StsJeanBrebeuf", "name", "[ USA ] " . $festivity->name );
-
-            $festivity1 = $this->Cal->getFestivity( "StPaulCross" );
-            if( $festivity1 !== null ){ //of course it will exist if StsJeanBrebeuf exists, they are originally on the same day
-                $this->Cal->moveFestivityDate( "StPaulCross", $festivity1->date->add( new DateInterval( 'P1D' ) ) );
-                if( $this->Cal->inSolemnitiesFeastsOrMemorials( $festivity1->date ) ) {
-                    $this->Messages[] = sprintf(
-                        "USA: The optional memorial '%s' is transferred from Oct 19 to Oct 20 as per the 2011 Roman Missal issued by the USCCB, to make room for '%s' elevated to the rank of Memorial, however in the year %d it is superseded by a higher ranking liturgical event",
-                        '<i>' . $festivity1->name . '</i>',
-                        '<i>' . $festivity->name . '</i>',
-                        $this->LitSettings->Year
-                    );
-                    $this->Cal->removeFestivity( "StPaulCross" );
-                }else{
-                    $this->Messages[] = sprintf(
-                        'USA: The optional memorial \'%1$s\' is transferred from Oct 19 to Oct 20 as per the 2011 Roman Missal issued by the USCCB, to make room for \'%2$s\' elevated to the rank of Memorial: applicable to the year %3$d.',
-                        '<i>' . $festivity1->name . '</i>',
-                        '<i>' . $festivity->name . '</i>',
-                        $this->LitSettings->Year
-                    );
-                    $this->Cal->setProperty( "StPaulCross", "name", "[ USA ] " . $festivity1->name );
-                }
-            }
-        }
-        else{
-            //if Oct 19 is a Sunday or Solemnity, Saint Paul of the Cross won't exist. But it still needs to be moved to Oct 20 so we must create it again
-            //just keep in mind the StsJeanBrebeuf also won't exist, so we need to retrieve the name from the tempCal
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '20-10-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-            $festivity = $this->Cal->getFestivity( "StPaulCross" );
-            if( !$this->Cal->inSolemnities( $currentFeastDate ) && $festivity === null ) {
-                $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ "StPaulCross" ];
-                $row2 = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ "StsJeanBrebeuf" ];
-                $festivity = new Festivity( "[ USA ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
-                $this->Cal->addFestivity( "StPaulCross", $festivity );
-                $this->Messages[] = sprintf(
-                    'USA: The optional memorial \'%1$s\' is transferred from Oct 19 to Oct 20 as per the 2011 Roman Missal issued by the USCCB, to make room for \'%2$s\' elevated to the rank of Memorial: applicable to the year %3$d.',
-                    $row->NAME,
-                    '<i>' . $row2->NAME . '</i>',
-                    $this->LitSettings->Year
-                );
-            }
         }
 
         //The fourth Thursday of November is Thanksgiving
@@ -1802,10 +1762,10 @@ private function applyCalendarUSA() : void {
         $this->Cal->addFestivity( "ThanksgivingDay", $festivity );
 
         $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '18-7-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-        $this->moveFestivityDate( "StCamillusDeLellis", $currentFeastDate, "Blessed Kateri Tekakwitha" );
+        $this->moveFestivityDate( "StCamillusDeLellis", $currentFeastDate, "Blessed Kateri Tekakwitha", RomanMissal::USA_EDITION_2011 );
 
         $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '5-7-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-        $this->moveFestivityDate( "StElizabethPortugal", $currentFeastDate, "Independence Day" );
+        $this->moveFestivityDate( "StElizabethPortugal", $currentFeastDate, "Independence Day", RomanMissal::USA_EDITION_2011 );
 
         $this->readPropriumDeSanctisJSONData( RomanMissal::USA_EDITION_2011 );
 
@@ -1841,45 +1801,56 @@ private function applyCalendarUSA() : void {
      * we might have to abstract out the Calendar that is the source
      * of the festivity that is being transferred
      */
-    private function moveFestivityDate( string $tag, DateTime $newDate, string $inFavorOf ) {
+    private function moveFestivityDate( string $tag, DateTime $newDate, string $inFavorOf, $missal ) {
         $festivity = $this->Cal->getFestivity( $tag );
         $newDateStr = $newDate->format('F jS');
-        if( !$this->Cal->inSolemnities( $newDate ) ) {
-            if( $festivity !== null ){
-                //Move from old date to new date, to make room for another celebration
-                $this->Cal->moveFestivityDate( $tag, $newDate );
+        if( !$this->Cal->inSolemnitiesFeastsOrMemorials( $newDate ) ) {
+            if( $festivity !== null ) {
                 $oldDateStr = $festivity->date->format('F jS');
+                $this->Cal->moveFestivityDate( $tag, $newDate );
             }
             else{
                 //if it was suppressed on the original date because of a higher ranking celebration,
                 //we should recreate it on the new date
-                $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ $tag ];
-                $festivity = new Festivity( $row->NAME, $newDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
-                $this->Cal->addFestivity( $tag, $festivity );
-                $oldDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-                $oldDateStr = $oldDate->format('F jS');
+                //except in the case of Saint Vincent Deacon, where the National Day of Prayer will take over the new date
+                if( $tag !== "StVincentDeacon" ) {
+                    $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ $tag ];
+                    $festivity = new Festivity( $row->NAME, $newDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
+                    $this->Cal->addFestivity( $tag, $festivity );
+                    $oldDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                    $oldDateStr = $oldDate->format('F jS');
+                }
+            }
+            if( $festivity !== null ) {
+                $this->Messages[] = sprintf(
+                    'USA: The %1$s \'%2$s\' is transferred from %5$s to %6$s as per the %7$s, to make room for \'%3$s\': applicable to the year %4$d.',
+                    $this->LitGrade->i18n( $festivity->grade ),
+                    '<i>' . $festivity->name . '</i>',
+                    '<i>' . $inFavorOf . '</i>',
+                    $this->LitSettings->Year,
+                    $oldDateStr,
+                    $newDateStr,
+                    RomanMissal::getName( $missal )
+                );
+                $this->Cal->setProperty( $tag, "name", "[ USA ] " . $festivity->name );
             }
-            $this->Messages[] = sprintf(
-                'USA: The optional memorial \'%1$s\' is transferred from %4$s to %5$s as per the 2011 Roman Missal issued by the USCCB, to make room for the Memorial \'%2$s\': applicable to the year %3$d.',
-                '<i>' . $festivity->name . '</i>',
-                '<i>' . $inFavorOf . '</i>',
-                $this->LitSettings->Year,
-                $oldDateStr,
-                $newDateStr
-            );
-            $this->Cal->setProperty( $tag, "name", "[ USA ] " . $festivity->name );
         }
         else{
             if( $festivity !== null ) {
                 $oldDateStr = $festivity->date->format('F jS');
-                //If the new date is already covered by a Solmenity, then we can't move the celebration, so we simply suppress it
+                $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $newDate );
+                //If the new date is already covered by a Solemnity, Feast or Memorial, then we can't move the celebration, so we simply suppress it
                 $this->Messages[] = sprintf(
-                    'USA: The optional memorial \'%1$s\' is transferred from %4$s to %5$s as per the 2011 Roman Missal issued by the USCCB, to make room for the Memorial \'%2$s\', however it is superseded by a higher ranking festivity in the year %3$d.',
+                    'USA: The %1$s \'%2$s\' would have been transferred from %3$s to %4$s as per the %5$s, to make room for \'%6$s\', however it is suppressed by the %7$s \'%8$s\' in the year %9$d.',
+                    $this->LitGrade->i18n( $festivity->grade ),
                     '<i>' . $festivity->name . '</i>',
-                    '<i>' . $inFavorOf . '</i>',
-                    $this->LitSettings->Year,
                     $oldDateStr,
-                    $newDateStr
+                    $newDateStr,
+                    RomanMissal::getName( $missal ),
+                    '<i>' . $inFavorOf . '</i>',
+                    $coincidingFestivity->grade,
+                    $coincidingFestivity->event->name,
+                    $this->LitSettings->Year
                 );
                 $this->Cal->removeFestivity( $tag );
             }
diff --git a/includes/enums/RomanMissal.php b/includes/enums/RomanMissal.php
index b6066eca..f43e7012 100644
--- a/includes/enums/RomanMissal.php
+++ b/includes/enums/RomanMissal.php
@@ -29,7 +29,7 @@ class RomanMissal {
         "VATICAN_1975"  => "Editio Typica Secunda 1975",
         "VATICAN_2002"  => "Editio Typica Tertia 2002",
         "VATICAN_2008"  => "Editio Typica Tertia Emendata 2008",
-        "USA_2011"      => "Roman Missal 2011 Edition",
+        "USA_2011"      => "2011 Roman Missal issued by the USCCB",
         "ITALY_1983"    => "Messale Romano ed. 1983",
         "ITALY_2020"    => "Messale Romano ed. 2020"
     ];

From 841d20840d133a625bfe93d6a47e6edec5b8763a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:43:40 +0000
Subject: [PATCH 005/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 56 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index ac8e3f05..e435cb67 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,10 +49,10 @@ msgstr ""
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
@@ -126,8 +126,8 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -218,7 +218,7 @@ msgid ""
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,30 +372,30 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 

From 1c95f12f1e4eb250e03e73ea7b8e30618b753f8b Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 1 Feb 2022 16:43:45 +0100
Subject: [PATCH 006/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 56 ++++++++++++++++-----------------
 i18n/es/LC_MESSAGES/litcal.po | 56 ++++++++++++++++-----------------
 i18n/fr/LC_MESSAGES/litcal.po | 56 ++++++++++++++++-----------------
 i18n/it/LC_MESSAGES/litcal.po | 58 +++++++++++++++++------------------
 i18n/la/LC_MESSAGES/litcal.po | 56 ++++++++++++++++-----------------
 i18n/pt/LC_MESSAGES/litcal.po | 56 ++++++++++++++++-----------------
 6 files changed, 169 insertions(+), 169 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index c052441d..0655f9ea 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -49,10 +49,10 @@ msgstr ""
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
@@ -126,8 +126,8 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -218,7 +218,7 @@ msgid ""
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,30 +372,30 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index da18f0a1..3e91272b 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish\n"
@@ -49,10 +49,10 @@ msgstr ""
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
@@ -126,8 +126,8 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -218,7 +218,7 @@ msgid ""
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,30 +372,30 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index b37f4cc1..65ab3433 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -49,10 +49,10 @@ msgstr ""
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
@@ -126,8 +126,8 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -218,7 +218,7 @@ msgid ""
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,30 +372,30 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index ecfdba12..7ad392a4 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -55,10 +55,10 @@ msgstr "sabato che precede la Domenica delle Palme"
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
@@ -138,8 +138,8 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -244,7 +244,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -256,7 +256,7 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -273,7 +273,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -290,7 +290,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -305,7 +305,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -314,7 +314,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -328,7 +328,7 @@ msgstr "e Dottore della Chiesa"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -347,7 +347,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -356,7 +356,7 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -365,7 +365,7 @@ msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -376,7 +376,7 @@ msgstr ""
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -387,7 +387,7 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -400,17 +400,17 @@ msgstr ""
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
@@ -422,7 +422,7 @@ msgstr "Memoria di Santa Maria in sabato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -431,23 +431,23 @@ msgstr ""
 "La %1$s '%2$s', celebrata solitamente il giorno %3$s, è soppressa dalla %4$s "
 "'%5$s' nell'anno %6$d."
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patrono d'Europa"
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona d'Europa"
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni d'Europa"
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
 
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 1292f174..90b767e7 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -54,10 +54,10 @@ msgstr "sabbatum ante Dominicam in Palmis"
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
@@ -137,8 +137,8 @@ msgstr "post Feria IV Cinerum"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been added on %s since the year %d (%s), applicable to "
@@ -257,7 +257,7 @@ msgstr ""
 "Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
 "ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -269,7 +269,7 @@ msgstr "dies Lunae post Pentecostem"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -289,7 +289,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -309,7 +309,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -327,7 +327,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -339,7 +339,7 @@ msgstr ""
 "%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
 "%d (%s)."
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -355,7 +355,7 @@ msgstr "Dedicationis ecclesiæ"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -377,7 +377,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been suppressed by the Memorial '%s', added on %s since "
@@ -388,7 +388,7 @@ msgid ""
 msgstr ""
 "%s '%s' subplantata est ad Memoria '%s', aggregata in die %s ab anno %d (%s)."
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -397,7 +397,7 @@ msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -408,7 +408,7 @@ msgstr ""
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -419,7 +419,7 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -431,17 +431,17 @@ msgstr ""
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
@@ -453,7 +453,7 @@ msgstr "Memoria Sanctæ Mariæ in Sabbato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
@@ -465,23 +465,23 @@ msgstr ""
 "%s '%s', celebrata plerumque in die %s, subplantata est ab %s '%s' in anno "
 "%d."
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patronus Europae"
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona Europae"
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni Europae"
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
 
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index beadd5a3..d741a972 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-27 14:41+0000\n"
+"POT-Creation-Date: 2022-02-01 15:43+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -49,10 +49,10 @@ msgstr ""
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
 #: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1230
-#: includes/LitCalAPI.php:1275 includes/LitCalAPI.php:1302
-#: includes/LitCalAPI.php:1411 includes/LitCalAPI.php:1423
-#: includes/LitCalAPI.php:1438 includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
+#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:386
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
@@ -126,8 +126,8 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1109
-#: includes/LitCalAPI.php:1286
+#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
+#: includes/LitCalAPI.php:1288
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -218,7 +218,7 @@ msgid ""
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1090
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1144
+#: includes/LitCalAPI.php:1146
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1168
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1176
+#: includes/LitCalAPI.php:1178
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1210
+#: includes/LitCalAPI.php:1212
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1218
+#: includes/LitCalAPI.php:1220
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1325
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1351
+#: includes/LitCalAPI.php:1353
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1409
+#: includes/LitCalAPI.php:1411
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1421
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1436
+#: includes/LitCalAPI.php:1438
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1462
+#: includes/LitCalAPI.php:1464
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:1488
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1522 includes/LitCalAPI.php:1551
+#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1574
+#: includes/LitCalAPI.php:1576
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,30 +372,30 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1633
+#: includes/LitCalAPI.php:1635
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1651
+#: includes/LitCalAPI.php:1653
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1652 includes/LitCalAPI.php:1660
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1683
+#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
+#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1673
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 

From 0afa39b838611554d32fd0d1c2a80a11a92ec696 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Tue, 1 Feb 2022 17:52:47 +0100
Subject: [PATCH 007/152] simplify vigil mass creation

and make it more readable
---
 includes/FestivityCollection.php | 200 ++++++++++++++++---------------
 includes/LitCalAPI.php           |   2 +-
 2 files changed, 105 insertions(+), 97 deletions(-)

diff --git a/includes/FestivityCollection.php b/includes/FestivityCollection.php
index bcbca10e..4302c351 100644
--- a/includes/FestivityCollection.php
+++ b/includes/FestivityCollection.php
@@ -98,11 +98,11 @@ public function getCalEventsFromDate( DateTime $date ) : array {
         return array_filter( $this->festivities, function( $el ) use ( $date ) { return $el->date == $date; } );
     }
 
-    public function isSolemnityLordBVM( string $key ) {
+    public function isSolemnityLordBVM( string $key ) : bool {
         return in_array( $key, $this->SolemnitiesLordBVM );
     }
 
-    public function isSundayAdventLentEaster( DateTime $date ) {
+    public function isSundayAdventLentEaster( DateTime $date ) : bool {
         return in_array( $date, $this->SundaysAdventLentEaster );
     }
 
@@ -275,6 +275,94 @@ public function setCyclesAndVigils() {
         }
     }
 
+    private function festivityCanHaveVigil( Festivity|stdClass $festivity, ?string $key = null ) : bool {
+        if( $festivity instanceof Festivity ) {
+            return (
+                false === ( $key === 'AllSouls' )
+                && false === ( $key === 'AshWednesday' )
+                && false === ( $festivity->date > $this->festivities[ "PalmSun" ]->date && $festivity->date < $this->festivities[ "Easter" ]->date )
+                && false === ( $festivity->date > $this->festivities[ "Easter" ]->date && $festivity->date < $this->festivities[ "Easter2" ]->date )
+            );
+        }
+        else if( $festivity instanceof stdClass ) {
+            return (
+                false === ( $festivity->event->date > $this->festivities[ "PalmSun" ]->date && $festivity->event->date < $this->festivities[ "Easter" ]->date )
+                && false === ( $festivity->event->date > $this->festivities[ "Easter" ]->date && $festivity->event->date < $this->festivities[ "Easter2" ]->date )
+            );
+        }
+    }
+
+    private function createVigilMass( string $key, Festivity $festivity, DateTime $VigilDate ) : void {
+        $this->festivities[ $key . "_vigil" ] = new Festivity( 
+            $festivity->name . " " . $this->T[ "Vigil Mass" ],
+            $VigilDate,
+            $festivity->color,
+            $festivity->type,
+            $festivity->grade,
+            $festivity->common
+        );
+        $this->festivities[ $key ]->hasVigilMass                 = true;
+        $this->festivities[ $key ]->hasVesperI                   = true;
+        $this->festivities[ $key ]->hasVesperII                  = true;
+        $this->festivities[ $key . "_vigil" ]->isVigilMass       = true;
+        $this->festivities[ $key . "_vigil" ]->liturgicalYear    = $this->festivities[ $key ]->liturgicalYear;
+    }
+
+    private function coincidingFestivityTakesPrecedenceOverVigil( string $key, Festivity $festivity, stdClass $coincidingFestivity ) : bool {
+        return (
+            $festivity->grade < $coincidingFestivity->event->grade ||
+            ( $this->isSolemnityLordBVM( $coincidingFestivity->key ) && !$this->isSolemnityLordBVM( $key ) )
+        );
+    }
+
+    private function vigilTakesPrecedenceOverCoincidingFestivity( string $key, Festivity $festivity, stdClass $coincidingFestivity ) : bool {
+        return (
+            $festivity->grade > $coincidingFestivity->event->grade ||
+            ( $this->isSolemnityLordBVM( $key ) && !$this->isSolemnityLordBVM( $coincidingFestivity->key ) )
+        );
+    }
+
+    private function handleVigilFestivityCoincidence( string $key, Festivity $festivity, string $festivityGrade, stdClass $coincidingFestivity, bool|string $vigilTakesPrecedence ) : void {
+        if( gettype($vigilTakesPrecedence) === "string" && $vigilTakesPrecedence === "YEAR2022" ) {
+            $festivity->hasVigilMass = true;
+            $festivity->hasVesperI = true;
+            $coincidingFestivity->event->hasVesperII = false;
+            $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As per %s, the first has precedence, therefore the Vigil Mass is confirmed as are I Vespers." ),
+                $festivityGrade,
+                $festivity->name,
+                $coincidingFestivity->grade,
+                $coincidingFestivity->event->name,
+                $this->LitSettings->Year,
+                '<a href="http://www.cultodivino.va/content/cultodivino/it/documenti/responsa-ad-dubia/2020/de-calendario-liturgico-2022.html">' . _( "Decree of the Congregation for Divine Worship" ) . '</a>'
+            );
+        } else {
+            $festivity->hasVigilMass = $vigilTakesPrecedence;
+            $festivity->hasVesperI = $vigilTakesPrecedence;
+            $coincidingFestivity->event->hasVesperII = !$vigilTakesPrecedence;
+            if( $vigilTakesPrecedence ) {
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                    _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. Since the first Solemnity has precedence, it will have Vespers I and a vigil Mass, whereas the last Solemnity will not have either Vespers II or an evening Mass." ),
+                    $festivityGrade,
+                    $festivity->name,
+                    $coincidingFestivity->grade,
+                    $coincidingFestivity->event->name,
+                    $this->LitSettings->Year
+                );
+            } else {
+                unset( $this->festivities[ $key . "_vigil" ] );
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                    _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. This last Solemnity takes precedence, therefore it will maintain Vespers II and an evening Mass, while the first Solemnity will not have a Vigil Mass or Vespers I." ),
+                    $festivityGrade,
+                    $festivity->name,
+                    $coincidingFestivity->grade,
+                    $coincidingFestivity->event->name,
+                    $this->LitSettings->Year
+                );
+            }
+        }
+    }
+
     private function calculateVigilMass( string $key, Festivity $festivity ) {
 
         //Let's calculate Vigil Masses while we're at it
@@ -295,25 +383,8 @@ private function calculateVigilMass( string $key, Festivity $festivity ) {
         //conditions for which the festivity SHOULD have a vigil
         if( self::DateIsSunday( $festivity->date ) || true === ( $festivity->grade >= LitGrade::SOLEMNITY ) ){
             //filter out cases in which the festivity should NOT have a vigil
-            if(
-                false === ( $key === 'AllSouls' )
-                && false === ( $key === 'AshWednesday' )
-                && false === ( $festivity->date > $this->festivities[ "PalmSun" ]->date && $festivity->date < $this->festivities[ "Easter" ]->date )
-                && false === ( $festivity->date > $this->festivities[ "Easter" ]->date && $festivity->date < $this->festivities[ "Easter2" ]->date )
-            ){
-                $this->festivities[ $key . "_vigil" ] = new Festivity( 
-                    $festivity->name . " " . $this->T[ "Vigil Mass" ],
-                    $VigilDate,
-                    $festivity->color,
-                    $festivity->type,
-                    $festivity->grade,
-                    $festivity->common
-                );
-                $this->festivities[ $key ]->hasVigilMass                 = true;
-                $this->festivities[ $key ]->hasVesperI                   = true;
-                $this->festivities[ $key ]->hasVesperII                  = true;
-                $this->festivities[ $key . "_vigil" ]->isVigilMass       = true;
-                $this->festivities[ $key . "_vigil" ]->liturgicalYear    = $this->festivities[ $key ]->liturgicalYear;
+            if( $this->festivityCanHaveVigil( $festivity, $key ) ) {
+                $this->createVigilMass( $key, $festivity, $VigilDate );
                 //if however the Vigil coincides with another Solemnity let's make a note of it!
                 if( $this->inSolemnities( $VigilDate ) ) {
                     $coincidingFestivity = new stdClass();
@@ -329,85 +400,19 @@ private function calculateVigilMass( string $key, Festivity $festivity ) {
                     }
 
                     //suppress warning messages for known situations, like the Octave of Easter
-                    if( $festivity->grade !== LitGrade::HIGHER_SOLEMNITY ){
-                        if( $festivity->grade < $coincidingFestivity->event->grade ){
-                            $festivity->hasVigilMass = false;
-                            $festivity->hasVesperI = false;
-                            $coincidingFestivity->event->hasVesperII = true;
-                            unset( $this->festivities[ $key . "_vigil" ] );
-                            $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. This last Solemnity takes precedence, therefore it will maintain Vespers II and an evening Mass, while the first Solemnity will not have a Vigil Mass or Vespers I." ),
-                                $festivityGrade,
-                                $festivity->name,
-                                $coincidingFestivity->grade,
-                                $coincidingFestivity->event->name,
-                                $this->LitSettings->Year
-                            );
+                    if( $festivity->grade !== LitGrade::HIGHER_SOLEMNITY ) {
+                        if( $this->coincidingFestivityTakesPrecedenceOverVigil( $key, $festivity, $coincidingFestivity ) ) {
+                            $this->handleVigilFestivityCoincidence( $key, $festivity, $festivityGrade, $coincidingFestivity, false );
                         }
-                        else if( $festivity->grade > $coincidingFestivity->event->grade || ( $this->isSolemnityLordBVM( $key ) && !$this->isSolemnityLordBVM( $coincidingFestivity->key ) ) ) {
-                            $festivity->hasVigilMass = true;
-                            $festivity->hasVesperI = true;
-                            $coincidingFestivity->event->hasVesperII = false;
-                            $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. Since the first Solemnity has precedence, it will have Vespers I and a vigil Mass, whereas the last Solemnity will not have either Vespers II or an evening Mass." ),
-                                $festivityGrade,
-                                $festivity->name,
-                                $coincidingFestivity->grade,
-                                $coincidingFestivity->event->name,
-                                $this->LitSettings->Year
-                            );
+                        else if( $this->vigilTakesPrecedenceOverCoincidingFestivity( $key, $festivity, $coincidingFestivity ) ) {
+                            $this->handleVigilFestivityCoincidence( $key, $festivity, $festivityGrade, $coincidingFestivity, true );
                         }
-                        else if( $this->isSolemnityLordBVM( $coincidingFestivity->key ) && !$this->isSolemnityLordBVM( $key ) ){
-                            $coincidingFestivity->event->hasVesperII = true;
-                            $festivity->hasVesperI = false;
-                            $festivity->hasVigilMass = false;
-                            unset( $this->festivities[ $key . "_vigil" ] );
-                            $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. This last Solemnity takes precedence, therefore it will maintain Vespers II and an evening Mass, while the first Solemnity will not have a Vigil Mass or Vespers I." ),
-                                $festivityGrade,
-                                $festivity->name,
-                                $coincidingFestivity->grade,
-                                $coincidingFestivity->event->name,
-                                $this->LitSettings->Year
-                            );
-                        } else {
-                            if( $this->LitSettings->Year === 2022 ){
-                                if( $key === 'SacredHeart' || $key === 'Lent3' || $key === 'Assumption' ){
-                                    $coincidingFestivity->event->hasVesperII = false;
-                                    $festivity->hasVesperI = true;
-                                    $festivity->hasVigilMass = true;
-                                    $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                        _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As per %s, the first has precedence, therefore the Vigil Mass is confirmed as are I Vespers." ),
-                                        $festivityGrade,
-                                        $festivity->name,
-                                        $coincidingFestivity->grade,
-                                        $coincidingFestivity->event->name,
-                                        $this->LitSettings->Year,
-                                        '<a href="http://www.cultodivino.va/content/cultodivino/it/documenti/responsa-ad-dubia/2020/de-calendario-liturgico-2022.html">' . _( "Decree of the Congregation for Divine Worship" ) . '</a>'
-                                    );
-                                }
-                            }
-                            else {
-                                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                    _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We should ask the Congregation for Divine Worship what to do about this!" ),
-                                    $festivityGrade,
-                                    $festivity->name,
-                                    $coincidingFestivity->grade,
-                                    $coincidingFestivity->event->name,
-                                    $this->LitSettings->Year
-                                );
-                            }
+                        else if ( $this->LitSettings->Year === 2022 && ( $key === 'SacredHeart' || $key === 'Lent3' || $key === 'Assumption' ) ) {
+                            $this->handleVigilFestivityCoincidence( $key, $festivity, $festivityGrade, $coincidingFestivity, "YEAR2022" );
                         }
-                    } else {
-                        if(
-                            //false === ( $key === 'AllSouls' )
-                            //&& false === ( $key === 'AshWednesday' )
-                            false === ( $coincidingFestivity->event->date > $this->festivities[ "PalmSun" ]->date && $coincidingFestivity->event->date < $this->festivities[ "Easter" ]->date )
-                            && false === ( $coincidingFestivity->event->date > $this->festivities[ "Easter" ]->date && $coincidingFestivity->event->date < $this->festivities[ "Easter2" ]->date )
-                        ){
-
+                        else {
                             $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. Since the first Solemnity has precedence, it will have Vespers I and a vigil Mass, whereas the last Solemnity will not have either Vespers II or an evening Mass." ),
+                                _( "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We should ask the Congregation for Divine Worship what to do about this!" ),
                                 $festivityGrade,
                                 $festivity->name,
                                 $coincidingFestivity->grade,
@@ -416,6 +421,9 @@ private function calculateVigilMass( string $key, Festivity $festivity ) {
                             );
                         }
                     }
+                    else if ( $this->festivityCanHaveVigil( $coincidingFestivity, null ) ) {
+                        $this->handleVigilFestivityCoincidence( $key, $festivity, $festivityGrade, $coincidingFestivity, true );
+                    }
                 }
             } else {
                 $this->festivities[ $key ]->hasVigilMass = false;
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 0a484b99..d31d6ae6 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -21,7 +21,7 @@
 
 class LitCalAPI {
 
-    const API_VERSION                               = '3.3';
+    const API_VERSION                               = '3.4';
     public APICore $APICore;
 
     private string $CacheDuration                   = "";

From a12923665d1a0fdaa5fae55135b2a0e482f04a93 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 16:53:40 +0000
Subject: [PATCH 008/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index e435cb67..f341b8e7 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -414,16 +414,15 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -432,15 +431,16 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From ceedfb823f48cd44d0b5b0882cf38b634fd485a6 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 1 Feb 2022 17:53:45 +0100
Subject: [PATCH 009/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 26 ++++++++++++-------------
 i18n/es/LC_MESSAGES/litcal.po | 26 ++++++++++++-------------
 i18n/fr/LC_MESSAGES/litcal.po | 26 ++++++++++++-------------
 i18n/it/LC_MESSAGES/litcal.po | 36 +++++++++++++++++------------------
 i18n/la/LC_MESSAGES/litcal.po | 32 +++++++++++++++----------------
 i18n/pt/LC_MESSAGES/litcal.po | 26 ++++++++++++-------------
 6 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 0655f9ea..57fa2fbb 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -414,16 +414,15 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -432,15 +431,16 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 3e91272b..d283c5c8 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -414,16 +414,15 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -432,15 +431,16 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 65ab3433..21327bba 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -414,16 +414,15 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -432,15 +431,16 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 7ad392a4..4429fd30 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -59,7 +59,7 @@ msgstr "sabato che precede la Domenica delle Palme"
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
@@ -466,20 +466,18 @@ msgstr "ANNO"
 msgid "Vigil Mass"
 msgstr "Messa della vigilia"
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 "La Messa nella Vigilia per la %s '%s' coincide con la %s '%s' nell'anno %d. "
-"Quest'ultima Solennità ha la precedenza, pertanto manterrà i Secondi Vespri "
-"e una Messa serale, mentre la prima Solennità non avrà né una Messa di "
-"Vigilia né i Primi Vespri."
+"Secondo il %s, la prima ha la precedenza, pertanto la Messa nella Vigilia è "
+"confermata come anche i Primi Vespri."
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -492,18 +490,20 @@ msgstr ""
 "Messa di Vigilia, mentre l'ultima Solennità non avrà né i Secondi Vespri né "
 "una Messa serale."
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 "La Messa nella Vigilia per la %s '%s' coincide con la %s '%s' nell'anno %d. "
-"Secondo il %s, la prima ha la precedenza, pertanto la Messa nella Vigilia è "
-"confermata come anche i Primi Vespri."
+"Quest'ultima Solennità ha la precedenza, pertanto manterrà i Secondi Vespri "
+"e una Messa serale, mentre la prima Solennità non avrà né una Messa di "
+"Vigilia né i Primi Vespri."
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 90b767e7..08583698 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -58,7 +58,7 @@ msgstr "sabbatum ante Dominicam in Palmis"
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
@@ -500,19 +500,15 @@ msgstr "ANNUM"
 msgid "Vigil Mass"
 msgstr "Missa in Vigilia"
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
-"Missa in Vigilia %s '%s' coincidet cum %s'%s' in anno %d. Sollemnitas ultima "
-"praecedentia habet, ergo servabit Secundis Vesperis atque Missa vesperum, "
-"cum Sollemnitas prima neque Missa in Vigilia neque Primis Vesperis servabit."
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -521,15 +517,19 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
+"Missa in Vigilia %s '%s' coincidet cum %s'%s' in anno %d. Sollemnitas ultima "
+"praecedentia habet, ergo servabit Secundis Vesperis atque Missa vesperum, "
+"cum Sollemnitas prima neque Missa in Vigilia neque Primis Vesperis servabit."
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index d741a972..c6e325a3 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 15:43+0000\n"
+"POT-Creation-Date: 2022-02-01 16:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
 #: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
-#: includes/FestivityCollection.php:386
+#: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -414,16 +414,15 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:339 includes/FestivityCollection.php:366
+#: includes/FestivityCollection.php:331
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
-"This last Solemnity takes precedence, therefore it will maintain Vespers II "
-"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
-"Vespers I."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
+"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
+"are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:352 includes/FestivityCollection.php:410
+#: includes/FestivityCollection.php:345
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -432,15 +431,16 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:380
+#: includes/FestivityCollection.php:355
 #, php-format
 msgid ""
-"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
-"per %s, the first has precedence, therefore the Vigil Mass is confirmed as "
-"are I Vespers."
+"The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
+"This last Solemnity takes precedence, therefore it will maintain Vespers II "
+"and an evening Mass, while the first Solemnity will not have a Vigil Mass or "
+"Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:392
+#: includes/FestivityCollection.php:415
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From 630ca174efb47f3dd570a74ed58012d42c49dbac Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 2 Feb 2022 17:17:17 +0100
Subject: [PATCH 010/152] Create new_bug_report.yml

---
 .github/ISSUE_TEMPLATE/new_bug_report.yml | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/new_bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/new_bug_report.yml b/.github/ISSUE_TEMPLATE/new_bug_report.yml
new file mode 100644
index 00000000..fe8fd521
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new_bug_report.yml
@@ -0,0 +1,56 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+assignees:
+  - JohnRDOrazio
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of the API where you using when you noticed the bug?
+      options:
+        - v1
+        - v2
+        - v3 (Default)
+        - dev (Edge)
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Which browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+  - type: textarea
+    id: error-messages
+    attributes:
+      label: Relevant error messages
+      description: If there are any error messages related to the bug, please add them here. This will be automatically formatted into code, so no need for backticks.
+      render: shell

From c030115a365cbf2b368bc3e1a06d9f8e2f08986a Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 2 Feb 2022 18:05:44 +0000
Subject: [PATCH 011/152] Translated using Weblate (English)

Currently translated at 100.0% (12 of 12 strings)

Translation: Liturgical Calendar/Memorials from Decrees
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/memorials-from-decrees/en/
---
 data/memorialsFromDecrees/i18n/en.json | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/memorialsFromDecrees/i18n/en.json b/data/memorialsFromDecrees/i18n/en.json
index f44e4605..2d4a0de0 100644
--- a/data/memorialsFromDecrees/i18n/en.json
+++ b/data/memorialsFromDecrees/i18n/en.json
@@ -1,14 +1,14 @@
-{
-    "MaryMotherChurch": "Blessed Virgin Mary, Mother of the Church",
-    "StMartha": "Saints Martha, Mary and Lazarus",
-    "StJohnXXIII": "Saint John XXIII, Pope",
-    "StJohnPaulII": "Saint John Paul II, Pope",
-    "LadyLoreto": "Blessed Virgin Mary of Loreto",
-    "StPaulVI": "Saint Paul VI, Pope",
-    "StFaustinaKowalska": "Saint Faustina Kowalska",
-    "StGregoryNarek": "Saint Gregory of Narek, abbot and doctor of the Church",
-    "StJohnAvila": "Saint John of Avila, priest and doctor of the Church",
-    "StHildegardBingen": "Saint Hildegard of Bingen, virgin and doctor of the Church",
-    "StThereseChildJesus": "Saint Thérèse of the Child Jesus, virgin and doctor of the Church",
-    "StIrenaeus": "Saint Irenaeus, bishop and martyr and doctor of the Church"
-}
+{
+    "MaryMotherChurch": "Blessed Virgin Mary, Mother of the Church",
+    "StMartha": "Saints Martha, Mary and Lazarus",
+    "StJohnXXIII": "Saint John XXIII, Pope",
+    "StJohnPaulII": "Saint John Paul II, Pope",
+    "LadyLoreto": "Blessed Virgin Mary of Loreto",
+    "StPaulVI": "Saint Paul VI, Pope",
+    "StFaustinaKowalska": "Saint Faustina Kowalska",
+    "StGregoryNarek": "Saint Gregory of Narek, Abbot and Doctor of the Church",
+    "StJohnAvila": "Saint John of Avila, Priest and Doctor of the Church",
+    "StHildegardBingen": "Saint Hildegard of Bingen, Virgin and Doctor of the Church",
+    "StThereseChildJesus": "Saint Thérèse of the Child Jesus, Virgin and Doctor of the Church",
+    "StIrenaeus": "Saint Irenaeus, Bishop and Martyr and Doctor of the Church"
+}

From 68e84a8eb704bf50fc8cabbb3a0db4ed8717200f Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 2 Feb 2022 16:28:31 +0000
Subject: [PATCH 012/152] Translated using Weblate (English)

Currently translated at 100.0% (187 of 187 strings)

Translation: Liturgical Calendar/Proprium de Sanctis 1970
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/proprium-de-sanctis-1970/en/
---
 data/propriumdesanctis_1970/i18n/en.json | 378 +++++++++++------------
 1 file changed, 189 insertions(+), 189 deletions(-)

diff --git a/data/propriumdesanctis_1970/i18n/en.json b/data/propriumdesanctis_1970/i18n/en.json
index 05bf1c7a..9ff972dc 100644
--- a/data/propriumdesanctis_1970/i18n/en.json
+++ b/data/propriumdesanctis_1970/i18n/en.json
@@ -1,189 +1,189 @@
-{
-    "StsBasilGreg": "Saints Basil the Great and Gregory Nazianzen, bishops and doctors",
-    "StRayPenyafort": "Saint Raymond of Penyafort, priest",
-    "StHilaryPoitiers": "Saint Hilary of Poitiers, bishop and doctor",
-    "StAnthonyEgypt": "Saint Anthony of Egypt, abbot",
-    "StFabianPope": "Saint Fabian, pope and martyr",
-    "StSebastian": "Saint Sebastian, martyr",
-    "StAgnes": "Saint Agnes, virgin and martyr",
-    "StVincentDeacon": "Saint Vincent, deacon and martyr",
-    "StFrancisDeSales": "Saint Francis de Sales, bishop and doctor",
-    "ConversionStPaul": "The Conversion of Saint Paul, apostle",
-    "StsTimothyTitus": "Saints Timothy and Titus, bishops",
-    "StAngelaMerici": "Saint Angela Merici, virgin",
-    "StThomasAquinas": "Saint Thomas Aquinas, priest and doctor",
-    "StJohnBosco": "Saint John Bosco, priest",
-    "Presentation": "Presentation of the Lord",
-    "StBlase": "Saint Blase, bishop and martyr",
-    "StAnsgar": "Saint Ansgar, bishop",
-    "StAgatha": "Saint Agatha, virgin and martyr",
-    "StsPaulMiki": "Saints Paul Miki and companions, martyrs",
-    "StJeromeEmiliani": "Saint Jerome Emiliani, priest",
-    "StScholastica": "Saint Scholastica, virgin",
-    "LadyLourdes": "Our Lady of Lourdes",
-    "StsCyrilMethodius": "Saints Cyril, monk, and Methodius, bishop",
-    "SevenHolyFounders": "Seven Holy Founders of the Servite Order",
-    "StPeterDamian": "Saint Peter Damian, bishop and doctor of the Church",
-    "ChairStPeter": "Chair of Saint Peter, apostle",
-    "StPolycarp": "Saint Polycarp, bishop and martyr",
-    "StCasimir": "Saint Casimir",
-    "StsPerpetuaFelicity": "Saints Perpetua and Felicity, martyrs",
-    "StJohnGod": "Saint John of God, religious",
-    "StFrancesRome": "Saint Frances of Rome, religious",
-    "StPatrick": "Saint Patrick, bishop",
-    "StCyrilJerusalem": "Saint Cyril of Jerusalem, bishop and doctor",
-    "StJoseph": "Saint Joseph Husband of the Blessed Virgin Mary",
-    "StTuribius": "Saint Turibius of Mogrovejo, bishop",
-    "Annunciation": "Annunciation of the Lord",
-    "StFrancisPaola": "Saint Francis of Paola, hermit",
-    "StIsidore": "Saint Isidore, bishop and doctor of the Church",
-    "StVincentFerrer": "Saint Vincent Ferrer, priest",
-    "StJohnBaptistDeLaSalle": "Saint John Baptist de la Salle, priest",
-    "StStanislaus": "Saint Stanislaus, bishop and martyr",
-    "StMartinPope": "Saint Martin I, pope and martyr",
-    "StAnselm": "Saint Anselm of Canterbury, bishop and doctor of the Church",
-    "StGeorge": "Saint George, martyr",
-    "StFidelisSigmaringen": "Saint Fidelis of Sigmaringen, priest and martyr",
-    "StMarkEvangelist": "Saint Mark the Evangelist",
-    "StPeterChanel": "Saint Peter Chanel, priest and martyr",
-    "StCatherineSiena": "Saint Catherine of Siena, virgin and doctor of the Church",
-    "StPiusV": "Saint Pius V, pope",
-    "StJosephWorker": "Saint Joseph the Worker",
-    "StAthanasius": "Saint Athanasius, bishop and doctor",
-    "StsPhilipJames": "Saints Philip and James, Apostles",
-    "StsNereusAchilleus": "Saints Nereus and Achilleus, martyrs",
-    "StPancras": "Saint Pancras, martyr",
-    "StMatthiasAp": "Saint Matthias the Apostle",
-    "StJohnIPope": "Saint John I, pope and martyr",
-    "StBernardineSiena": "Saint Bernardine of Siena, priest",
-    "StBedeVenerable": "Saint Bede the Venerable, priest and doctor",
-    "StGregoryVII": "Saint Gregory VII, pope",
-    "StMaryMagdalenePazzi": "Saint Mary Magdalene de Pazzi, virgin",
-    "StPhilipNeri": "Saint Philip Neri, priest",
-    "StAugustineCanterbury": "Saint Augustine of Canterbury, bishop",
-    "Visitation": "Visitation of the Blessed Virgin Mary",
-    "StJustinMartyr": "Saint Justin Martyr",
-    "StsMarcellinusPeter": "Saints Marcellinus and Peter, martyrs",
-    "StsCharlesLwanga": "Saints Charles Lwanga and companions, martyrs",
-    "StBoniface": "Saint Boniface, bishop and martyr",
-    "StNorbert": "Saint Norbert, bishop",
-    "StEphrem": "Saint Ephrem, deacon and doctor",
-    "StBarnabasAp": "Saint Barnabas the Apostle",
-    "StAnthonyPadua": "Saint Anthony of Padua, priest and doctor",
-    "StRomuald": "Saint Romuald, abbot",
-    "StAloysiusGonzaga": "Saint Aloysius Gonzaga, religious",
-    "StPaulinusNola": "Saint Paulinus of Nola, bishop",
-    "StsJohnFisherThomasMore": "Saints John Fisher, bishop and martyr and Thomas More, martyr",
-    "NativityJohnBaptist": "Nativity of Saint John the Baptist",
-    "StCyrilAlexandria": "Saint Cyril of Alexandria, bishop and doctor",
-    "StIrenaeus": "Saint Irenaeus, bishop and martyr",
-    "StsPeterPaulAp": "Saints Peter and Paul, Apostles",
-    "FirstMartyrsRome": "First Martyrs of the Church of Rome",
-    "StThomasAp": "Saint Thomas the Apostle",
-    "StElizabethPortugal": "Saint Elizabeth of Portugal",
-    "StAnthonyZaccaria": "Saint Anthony Zaccaria, priest",
-    "StMariaGoretti": "Saint Maria Goretti, virgin and martyr",
-    "StBenedict": "Saint Benedict, abbot",
-    "StHenry": "Saint Henry",
-    "StCamillusDeLellis": "Saint Camillus de Lellis, priest",
-    "StBonaventure": "Saint Bonaventure, bishop and doctor",
-    "LadyMountCarmel": "Our Lady of Mount Carmel",
-    "StLawrenceBrindisi": "Saint Lawrence of Brindisi, priest and doctor",
-    "StMaryMagdalene": "Saint Mary Magdalene",
-    "StBridget": "Saint Bridget, religious",
-    "StJamesAp": "Saint James, apostle",
-    "StsJoachimAnne": "Saints Joachim and Anne",
-    "StMartha": "Saint Martha",
-    "StPeterChrysologus": "Saint Peter Chrysologus, bishop and doctor",
-    "StIgnatiusLoyola": "Saint Ignatius of Loyola, priest",
-    "StAlphonsusMariaDeLiguori": "Saint Alphonsus Maria de Liguori, bishop and doctor of the Church",
-    "StEusebius": "Saint Eusebius of Vercelli, bishop",
-    "StJeanVianney": "Saint Jean Vianney (the Curé of Ars), priest",
-    "DedicationStMaryMajor": "Dedication of the Basilica of Saint Mary Major",
-    "Transfiguration": "Transfiguration of the Lord",
-    "StSixtusIIPope": "Saint Sixtus II, pope, and companions, martyrs",
-    "StCajetan": "Saint Cajetan, priest",
-    "StDominic": "Saint Dominic, priest",
-    "StLawrenceDeacon": "Saint Lawrence, deacon and martyr",
-    "StClare": "Saint Clare, virgin",
-    "StJaneFrancesDeChantal": "Saint Jane Frances de Chantal, religious",
-    "StsPontianHippolytus": "Saints Pontian, pope, and Hippolytus, priest, martyrs",
-    "Assumption": "Assumption of the Blessed Virgin Mary",
-    "StStephenHungary": "Saint Stephen of Hungary",
-    "StJohnEudes": "Saint John Eudes, priest",
-    "StBernardClairvaux": "Saint Bernard of Clairvaux, abbot and doctor of the Church",
-    "StPiusX": "Saint Pius X, pope",
-    "QueenshipMary": "Queenship of Blessed Virgin Mary",
-    "StRoseLima": "Saint Rose of Lima, virgin",
-    "StBartholomewAp": "Saint Bartholomew the Apostle",
-    "StLouis": "Saint Louis",
-    "StJosephCalasanz": "Saint Joseph Calasanz, priest",
-    "StMonica": "Saint Monica",
-    "StAugustineHippo": "Saint Augustine of Hippo, bishop and doctor of the Church",
-    "BeheadingJohnBaptist": "The Beheading of Saint John the Baptist, martyr",
-    "StGregoryGreat": "Saint Gregory the Great, pope and doctor",
-    "NativityVirginMary": "Nativity of the Blessed Virgin Mary",
-    "StJohnChrysostom": "Saint John Chrysostom, bishop and doctor",
-    "ExaltationCross": "Exaltation of the Holy Cross",
-    "LadySorrows": "Our Lady of Sorrows",
-    "StsCorneliusCyprian": "Saints Cornelius, pope, and Cyprian, bishop, martyrs",
-    "StRobertBellarmine": "Saint Robert Bellarmine, bishop and doctor",
-    "StJanuarius": "Saint Januarius, bishop and martyr",
-    "StMatthewEvangelist": "Saint Matthew the Evangelist, Apostle",
-    "StsCosmasDamian": "Saints Cosmas and Damian, martyrs",
-    "StVincentDePaul": "Saint Vincent de Paul, priest",
-    "StWenceslaus": "Saint Wenceslaus, martyr",
-    "StsArchangels": "Saints Michael, Gabriel and Raphael, Archangels",
-    "StJerome": "Saint Jerome, priest and doctor",
-    "StThereseChildJesus": "Saint Thérèse of the Child Jesus, virgin",
-    "GuardianAngels": "Guardian Angels",
-    "StFrancisAssisi": "Saint Francis of Assisi",
-    "StBruno": "Saint Bruno, priest",
-    "LadyRosary": "Our Lady of the Rosary",
-    "StDenis": "Saint Denis, bishop, and companions, martyrs",
-    "StJohnLeonardi": "Saint John Leonardi, priest",
-    "StCallistusIPope": "Saint Callistus I, pope and martyr",
-    "StTeresaJesus": "Saint Teresa of Jesus, virgin and doctor",
-    "StHedwig": "Saint Hedwig, religious",
-    "StMargaretAlacoque": "Saint Margaret Mary Alacoque, virgin",
-    "StIgnatiusAntioch": "Saint Ignatius of Antioch, bishop and martyr",
-    "StLukeEvangelist": "Saint Luke the Evangelist",
-    "StsJeanBrebeuf": "Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
-    "StPaulCross": "Saint Paul of the Cross, Priest",
-    "StJohnCapistrano": "Saint John of Capistrano, priest",
-    "StAnthonyMaryClaret": "Saint Anthony Mary Claret, bishop",
-    "StSimonStJudeAp": "Saint Simon and Saint Jude, apostles",
-    "AllSaints": "All Saints Day",
-    "AllSouls": "Commemoration of all the Faithful Departed (All Souls' Day)",
-    "StMartinPorres": "Saint Martin de Porres, religious",
-    "StCharlesBorromeo": "Saint Charles Borromeo, bishop",
-    "DedicationLateran": "Dedication of the Lateran basilica",
-    "StLeoGreat": "Saint Leo the Great, pope and doctor",
-    "StMartinTours": "Saint Martin of Tours, bishop",
-    "StJosaphat": "Saint Josaphat, bishop and martyr",
-    "StAlbertGreat": "Saint Albert the Great, bishop and doctor",
-    "StMargaretScotland": "Saint Margaret of Scotland",
-    "StGertrudeGreat": "Saint Gertrude the Great, virgin",
-    "StElizabethHungary": "Saint Elizabeth of Hungary, religious",
-    "DedicationStsPeterPaul": "Dedication of the basilicas of Saints Peter and Paul, Apostles",
-    "PresentationMary": "Presentation of the Blessed Virgin Mary",
-    "StCecilia": "Saint Cecilia, virgin and martyr",
-    "StClementIPope": "Saint Clement I, pope and martyr",
-    "StColumban": "Saint Columban, religious",
-    "StAndrewAp": "Saint Andrew the Apostle",
-    "StFrancisXavier": "Saint Francis Xavier, priest",
-    "StJohnDamascene": "Saint John Damascene, priest and doctor",
-    "StNicholas": "Saint Nicholas, bishop",
-    "StAmbrose": "Saint Ambrose, bishop and doctor",
-    "ImmaculateConception": "Immaculate Conception of the Blessed Virgin Mary",
-    "StDamasusIPope": "Saint Damasus I, pope",
-    "StLucySyracuse": "Saint Lucy of Syracuse, virgin and martyr",
-    "StJohnCross": "Saint John of the Cross, priest and doctor",
-    "StPeterCanisius": "Saint Peter Canisius, priest and doctor",
-    "StJohnKanty": "Saint John of Kanty, priest",
-    "StStephenProtomartyr": "Saint Stephen, the first martyr",
-    "StJohnEvangelist": "Saint John, Apostle and Evangelist",
-    "HolyInnocents": "Holy Innocents, martyrs",
-    "StThomasBecket": "Saint Thomas Becket, bishop and martyr",
-    "StSylvesterIPope": "Saint Sylvester I, pope"
-}
\ No newline at end of file
+{
+    "StsBasilGreg": "Saints Basil the Great and Gregory Nazianzen, Bishops and Doctors of the Church",
+    "StRayPenyafort": "Saint Raymond of Penyafort, Priest",
+    "StHilaryPoitiers": "Saint Hilary, Bishop and Doctor of the Church",
+    "StAnthonyEgypt": "Saint Anthony, Abbot",
+    "StFabianPope": "Saint Fabian, Pope and Martyr",
+    "StSebastian": "Saint Sebastian, Martyr",
+    "StAgnes": "Saint Agnes, Virgin and Martyr",
+    "StVincentDeacon": "Saint Vincent, Deacon and Martyr",
+    "StFrancisDeSales": "Saint Francis de Sales, Bishop and Doctor of the Church",
+    "ConversionStPaul": "The Conversion of Saint Paul the Apostle",
+    "StsTimothyTitus": "Saints Timothy and Titus, Bishops",
+    "StAngelaMerici": "Saint Angela Merici, Virgin",
+    "StThomasAquinas": "Saint Thomas Aquinas, Priest and Doctor of the Church",
+    "StJohnBosco": "Saint John Bosco, Priest",
+    "Presentation": "Presentation of the Lord",
+    "StBlase": "Saint Blase, Bishop and Martyr",
+    "StAnsgar": "Saint Ansgar, Bishop",
+    "StAgatha": "Saint Agatha, Virgin and Martyr",
+    "StsPaulMiki": "Saint Paul Miki and Companions, Martyrs",
+    "StJeromeEmiliani": "Saint Jerome Emiliani, Priest",
+    "StScholastica": "Saint Scholastica, Virgin",
+    "LadyLourdes": "Our Lady of Lourdes",
+    "StsCyrilMethodius": "Saints Cyril, Monk, and Methodius, Bishop",
+    "SevenHolyFounders": "The Seven Holy Founders of the Servite Order",
+    "StPeterDamian": "Saint Peter Damian, Bishop and Doctor of the Church",
+    "ChairStPeter": "The Chair of Saint Peter the Apostle",
+    "StPolycarp": "Saint Polycarp, Bishop and Martyr",
+    "StCasimir": "Saint Casimir",
+    "StsPerpetuaFelicity": "Saints Perpetua and Felicity, Martyrs",
+    "StJohnGod": "Saint John of God, Religious",
+    "StFrancesRome": "Saint Frances of Rome, Religious",
+    "StPatrick": "Saint Patrick, Bishop",
+    "StCyrilJerusalem": "Saint Cyril of Jerusalem, Bishop and Doctor of the Church",
+    "StJoseph": "Saint Joseph Husband of the Blessed Virgin Mary",
+    "StTuribius": "Saint Turibius of Mogrovejo, Bishop",
+    "Annunciation": "Annunciation of the Lord",
+    "StFrancisPaola": "Saint Francis of Paola, Hermit",
+    "StIsidore": "Saint Isidore, Bishop and Doctor of the Church",
+    "StVincentFerrer": "Saint Vincent Ferrer, Priest",
+    "StJohnBaptistDeLaSalle": "Saint John Baptist de la Salle, Priest",
+    "StStanislaus": "Saint Stanislaus, Bishop and Martyr",
+    "StMartinPope": "Saint Martin I, Pope and Martyr",
+    "StAnselm": "Saint Anselm, Bishop and Doctor of the Church",
+    "StGeorge": "Saint George, Martyr",
+    "StFidelisSigmaringen": "Saint Fidelis of Sigmaringen, Priest and Martyr",
+    "StMarkEvangelist": "Saint Mark the Evangelist",
+    "StPeterChanel": "Saint Peter Chanel, Priest and Martyr",
+    "StCatherineSiena": "Saint Catherine of Siena, Virgin and Doctor of the Church",
+    "StPiusV": "Saint Pius V, Pope",
+    "StJosephWorker": "Saint Joseph the Worker",
+    "StAthanasius": "Saint Athanasius, Bishop and Doctor of the Church",
+    "StsPhilipJames": "Saints Philip and James, Apostles",
+    "StsNereusAchilleus": "Saints Nereus and Achilleus, Martyrs",
+    "StPancras": "Saint Pancras, Martyr",
+    "StMatthiasAp": "Saint Matthias the Apostle",
+    "StJohnIPope": "Saint John I, Pope and Martyr",
+    "StBernardineSiena": "Saint Bernardine of Siena, Priest",
+    "StBedeVenerable": "Saint Bede the Venerable, Priest and Doctor of the Church",
+    "StGregoryVII": "Saint Gregory VII, Pope",
+    "StMaryMagdalenePazzi": "Saint Mary Magdalene de Pazzi, Virgin",
+    "StPhilipNeri": "Saint Philip Neri, Priest",
+    "StAugustineCanterbury": "Saint Augustine of Canterbury, Bishop",
+    "Visitation": "Visitation of the Blessed Virgin Mary",
+    "StJustinMartyr": "Saint Justin Martyr",
+    "StsMarcellinusPeter": "Saints Marcellinus and Peter, Martyrs",
+    "StsCharlesLwanga": "Saint Charles Lwanga and Companions, Martyrs",
+    "StBoniface": "Saint Boniface, Bishop and Martyr",
+    "StNorbert": "Saint Norbert, Bishop",
+    "StEphrem": "Saint Ephrem, Deacon and Doctor of the Church",
+    "StBarnabasAp": "Saint Barnabas the Apostle",
+    "StAnthonyPadua": "Saint Anthony of Padua, Priest and Doctor of the Church",
+    "StRomuald": "Saint Romuald, Abbot",
+    "StAloysiusGonzaga": "Saint Aloysius Gonzaga, Religious",
+    "StPaulinusNola": "Saint Paulinus of Nola, Bishop",
+    "StsJohnFisherThomasMore": "Saints John Fisher, Bishop, and Thomas More, Martyrs",
+    "NativityJohnBaptist": "The Nativity of Saint John the Baptist",
+    "StCyrilAlexandria": "Saint Cyril of Alexandria, Bishop and Doctor of the Church",
+    "StIrenaeus": "Saint Irenaeus, Bishop and Martyr",
+    "StsPeterPaulAp": "Saints Peter and Paul, Apostles",
+    "FirstMartyrsRome": "The First Martyrs of the Holy Roman Church",
+    "StThomasAp": "Saint Thomas the Apostle",
+    "StElizabethPortugal": "Saint Elizabeth of Portugal",
+    "StAnthonyZaccaria": "Saint Anthony Zaccaria, Priest",
+    "StMariaGoretti": "Saint Maria Goretti, Virgin and Martyr",
+    "StBenedict": "Saint Benedict, Abbot",
+    "StHenry": "Saint Henry",
+    "StCamillusDeLellis": "Saint Camillus de Lellis, Priest",
+    "StBonaventure": "Saint Bonaventure, Bishop and Doctor of the Church",
+    "LadyMountCarmel": "Our Lady of Mount Carmel",
+    "StLawrenceBrindisi": "Saint Lawrence of Brindisi, Priest and Doctor of the Church",
+    "StMaryMagdalene": "Saint Mary Magdalene",
+    "StBridget": "Saint Bridget, Religious",
+    "StJamesAp": "Saint James, Apostle",
+    "StsJoachimAnne": "Saints Joachim and Anne, Parents of the Blessed Virgin Mary",
+    "StMartha": "Saint Martha",
+    "StPeterChrysologus": "Saint Peter Chrysologus, Bishop and Doctor of the Church",
+    "StIgnatiusLoyola": "Saint Ignatius of Loyola, Priest",
+    "StAlphonsusMariaDeLiguori": "Saint Alphonsus Mary Liguori, Bishop and Doctor of the Church",
+    "StEusebius": "Saint Eusebius of Vercelli, Bishop",
+    "StJeanVianney": "Saint John Mary Vianney, Priest",
+    "DedicationStMaryMajor": "The Dedication of the Basilica of Saint Mary Major",
+    "Transfiguration": "The Transfiguration of the Lord",
+    "StSixtusIIPope": "Saint Sixtus II, Pope, and Companions, Martyrs",
+    "StCajetan": "Saint Cajetan, Priest",
+    "StDominic": "Saint Dominic, Priest",
+    "StLawrenceDeacon": "Saint Lawrence, Deacon and Martyr",
+    "StClare": "Saint Clare, Virgin",
+    "StJaneFrancesDeChantal": "Saint Jane Frances de Chantal, Religious",
+    "StsPontianHippolytus": "Saints Pontian, Pope, and Hippolytus, Priest, Martyrs",
+    "Assumption": "The Assumption of the Blessed Virgin Mary",
+    "StStephenHungary": "Saint Stephen of Hungary",
+    "StJohnEudes": "Saint John Eudes, Priest",
+    "StBernardClairvaux": "Saint Bernard, Abbot and Doctor of the Church",
+    "StPiusX": "Saint Pius X, Pope",
+    "QueenshipMary": "The Queenship of the Blessed Virgin Mary",
+    "StRoseLima": "Saint Rose of Lima, virgin",
+    "StBartholomewAp": "Saint Bartholomew, Apostle",
+    "StLouis": "Saint Louis",
+    "StJosephCalasanz": "Saint Joseph Calasanz, Priest",
+    "StMonica": "Saint Monica",
+    "StAugustineHippo": "Saint Augustine, Bishop and Doctor of the Church",
+    "BeheadingJohnBaptist": "The Beheading of Saint John the Baptist, Martyr",
+    "StGregoryGreat": "Saint Gregory the Great, Pope and Doctor of the Church",
+    "NativityVirginMary": "The Nativity of the Blessed Virgin Mary",
+    "StJohnChrysostom": "Saint John Chrysostom, Bishop and Doctor of the Church",
+    "ExaltationCross": "Exaltation of the Holy Cross",
+    "LadySorrows": "Our Lady of Sorrows",
+    "StsCorneliusCyprian": "Saints Cornelius, Pope, and Cyprian, Bishop, Martyrs",
+    "StRobertBellarmine": "Saint Robert Bellarmine, Bishop and Doctor of the Church",
+    "StJanuarius": "Saint Januarius, Bishop and Martyr",
+    "StMatthewEvangelist": "Saint Matthew, Apostle and Evangelist",
+    "StsCosmasDamian": "Saints Cosmas and Damian, Martyrs",
+    "StVincentDePaul": "Saint Vincent de Paul, Priest",
+    "StWenceslaus": "Saint Wenceslaus, Martyr",
+    "StsArchangels": "Saints Michael, Gabriel and Raphael, Archangels",
+    "StJerome": "Saint Jerome, Priest and Doctor of the Church",
+    "StThereseChildJesus": "Saint Thérèse of the Child Jesus, Virgin",
+    "GuardianAngels": "The Holy Guardian Angels",
+    "StFrancisAssisi": "Saint Francis of Assisi",
+    "StBruno": "Saint Bruno, Priest",
+    "LadyRosary": "Our Lady of the Rosary",
+    "StDenis": "Saint Denis, Bishop, and Companions, Martyrs",
+    "StJohnLeonardi": "Saint John Leonardi, Priest",
+    "StCallistusIPope": "Saint Callistus I, Pope and Martyr",
+    "StTeresaJesus": "Saint Teresa of Jesus, Virgin and Doctor of the Church",
+    "StHedwig": "Saint Hedwig, Religious",
+    "StMargaretAlacoque": "Saint Margaret Mary Alacoque, Virgin",
+    "StIgnatiusAntioch": "Saint Ignatius of Antioch, Bishop and Martyr",
+    "StLukeEvangelist": "Saint Luke, Evangelist",
+    "StsJeanBrebeuf": "Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
+    "StPaulCross": "Saint Paul of the Cross, Priest",
+    "StJohnCapistrano": "Saint John of Capestrano, Priest",
+    "StAnthonyMaryClaret": "Saint Anthony Mary Claret, Bishop",
+    "StSimonStJudeAp": "Saints Simon and Jude, Apostles",
+    "AllSaints": "All Saints",
+    "AllSouls": "The Commemoration of all the Faithful Departed (All Souls' Day)",
+    "StMartinPorres": "Saint Martin de Porres, Religious",
+    "StCharlesBorromeo": "Saint Charles Borromeo, Bishop",
+    "DedicationLateran": "The Dedication of the Lateran Basilica",
+    "StLeoGreat": "Saint Leo the Great, Pope and Doctor of the Church",
+    "StMartinTours": "Saint Martin of Tours, Bishop",
+    "StJosaphat": "Saint Josaphat, Bishop and Martyr",
+    "StAlbertGreat": "Saint Albert the Great, Bishop and Doctor of the Church",
+    "StMargaretScotland": "Saint Margaret of Scotland",
+    "StGertrudeGreat": "Saint Gertrude the Great, Virgin",
+    "StElizabethHungary": "Saint Elizabeth of Hungary, Religious",
+    "DedicationStsPeterPaul": "The Dedication of the Basilicas of Saints Peter and Paul, Apostles",
+    "PresentationMary": "The Presentation of the Blessed Virgin Mary",
+    "StCecilia": "Saint Cecilia, Virgin and Martyr",
+    "StClementIPope": "Saint Clement I, Pope and Martyr",
+    "StColumban": "Saint Columban, Religious",
+    "StAndrewAp": "Saint Andrew, Apostle",
+    "StFrancisXavier": "Saint Francis Xavier, Priest",
+    "StJohnDamascene": "Saint John Damascene, Priest and Doctor of the Church",
+    "StNicholas": "Saint Nicholas, Bishop",
+    "StAmbrose": "Saint Ambrose, Bishop and Doctor of the Church",
+    "ImmaculateConception": "The Immaculate Conception of the Blessed Virgin Mary",
+    "StDamasusIPope": "Saint Damasus I, Pope",
+    "StLucySyracuse": "Saint Lucy of Syracuse, Virgin and Martyr",
+    "StJohnCross": "Saint John of the Cross, Priest and Doctor of the Church",
+    "StPeterCanisius": "Saint Peter Canisius, Priest and Doctor of the Church",
+    "StJohnKanty": "Saint John of Kanty, Priest",
+    "StStephenProtomartyr": "Saint Stephen, The First Martyr",
+    "StJohnEvangelist": "Saint John, Apostle and Evangelist",
+    "HolyInnocents": "The Holy Innocents, Martyrs",
+    "StThomasBecket": "Saint Thomas Becket, Bishop and Martyr",
+    "StSylvesterIPope": "Saint Sylvester I, Pope"
+}

From 613880fabf3a66f0e74174ae1b1ca7371c8fdceb Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 2 Feb 2022 16:47:18 +0000
Subject: [PATCH 013/152] Translated using Weblate (English)

Currently translated at 100.0% (19 of 19 strings)

Translation: Liturgical Calendar/Proprium de Sanctis 2002
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/proprium-de-sanctis-2002/en/
---
 data/propriumdesanctis_2002/i18n/en.json | 42 ++++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/data/propriumdesanctis_2002/i18n/en.json b/data/propriumdesanctis_2002/i18n/en.json
index 4094d7ae..67e7ab5d 100644
--- a/data/propriumdesanctis_2002/i18n/en.json
+++ b/data/propriumdesanctis_2002/i18n/en.json
@@ -1,21 +1,21 @@
-{
-    "NameJesus": "The Most Holy Name of Jesus",
-    "StJosephineBakhita": "Saint Josephine Bakhita, virgin",
-    "StAdalbert": "Saint Adalbert, bishop and martyr",
-    "StLouisGrignionMontfort": "Saint Louis Grignion de Montfort, priest",
-    "LadyFatima": "Our Lady of Fatima",
-    "StChristopherMagallanes": "Saint Christopher Magallanes and companions, martyrs",
-    "StRitaCascia": "Saint Rita of Cascia",
-    "StAugustineZhaoRong": "Saint Augustine Zhao Rong and companions, martyrs",
-    "StApollinaris": "Saint Apollinaris, bishop and martyr",
-    "StSharbelMakhluf": "Saint Sharbel Makhluf, hermit",
-    "StPeterJulianEymard": "Saint Peter Julian Eymard, priest",
-    "StEdithStein": "Saint Teresa Benedicta of the Cross (Edith Stein), virgin and martyr",
-    "StMaximilianKolbe": "Saint Maximilian Mary Kolbe, priest and martyr",
-    "StPeterClaver": "Saint Peter Claver, priest",
-    "HolyNameMary": "Holy Name of the Blessed Virgin Mary",
-    "StAndrewKimTaegon": "Saint Andrew Kim Taegon, priest, and Paul Chong Hasang and companions, martyrs",
-    "StsLawrenceRuiz": "Saints Lawrence Ruiz and companions, martyrs",
-    "StAndrewDungLac": "Saint Andrew Dung-Lac and his companions, martyrs",
-    "StCatherineAlexandria": "Saint Catherine of Alexandria, virgin and martyr"
-}
+{
+    "NameJesus": "The Most Holy Name of Jesus",
+    "StJosephineBakhita": "Saint Josephine Bakhita, Virgin",
+    "StAdalbert": "Saint Adalbert, Bishop and Martyr",
+    "StLouisGrignionMontfort": "Saint Louis Grignion de Montfort, Priest",
+    "LadyFatima": "Our Lady of Fatima",
+    "StChristopherMagallanes": "Saint Christopher Magallanes, Priest, and Companions, Martyrs",
+    "StRitaCascia": "Saint Rita of Cascia, Religious",
+    "StAugustineZhaoRong": "Saint Augustine Zhao Rong, Priest, and Companions, Martyrs",
+    "StApollinaris": "Saint Apollinaris, Bishop and Martyr",
+    "StSharbelMakhluf": "Saint Sharbel Makhluf, Hermit",
+    "StPeterJulianEymard": "Saint Peter Julian Eymard, Priest",
+    "StEdithStein": "Saint Teresa Benedicta of the Cross, Virgin and Martyr",
+    "StMaximilianKolbe": "Saint Maximilian Mary Kolbe, Priest and Martyr",
+    "StPeterClaver": "Saint Peter Claver, Priest",
+    "HolyNameMary": "The Holy Name of the Blessed Virgin Mary",
+    "StAndrewKimTaegon": "Saint Andrew Kim Tae-gŏn, Priest, and Paul Chŏng Ha-sang, and Companions, Martyrs",
+    "StsLawrenceRuiz": "Saint Lawrence Ruiz and Companions, Martyrs",
+    "StAndrewDungLac": "Saint Andrew Dũng-Lạc, Priest, and Companions, Martyrs",
+    "StCatherineAlexandria": "Saint Catherine of Alexandria, Virgin and Martyr"
+}

From 2a19f7bbf90e965c62d57eea254a5b34e1d47a08 Mon Sep 17 00:00:00 2001
From: padrecedano <padre.cedano@gmail.com>
Date: Fri, 4 Feb 2022 01:17:52 +0000
Subject: [PATCH 014/152] Translated using Weblate (Spanish)

Currently translated at 5.8% (6 of 103 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/es/
---
 i18n/es/LC_MESSAGES/litcal.mo | Bin 0 -> 1300 bytes
 i18n/es/LC_MESSAGES/litcal.po |  25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 i18n/es/LC_MESSAGES/litcal.mo

diff --git a/i18n/es/LC_MESSAGES/litcal.mo b/i18n/es/LC_MESSAGES/litcal.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9b46a18bcf5c52ee005b38e96a462eb1be105978
GIT binary patch
literal 1300
zcmZWoO^@3|7&cHq3O59tiu4u{wH51lgOF&m*@&gdLZqZwB`Kxc-q>%Psq7guGp-1C
zZd~~R9FgFFkPvXq86oilIC9~@i963YyA2W}J$^j)`~C69%h$e&a9#wi154l~;7cH!
zpMY0^pMlqa-+&nS6PN+7JQGDFI0L@{{vG@y@DD(^fBRe%y$=2rd<^~zJON+77DZox
z75Gi?-(aXTaeyLRoAbgYKMRIxbDj^+wxf)<#A`2>MwO~IthZNRSF$!%4xfjTS`jj9
z@*AOhM(0*?_R462APv<MrG*|E>o%&2X1dtYR@gdPTT@c^?z_jtI=ghnu<YupGS*Ah
zp+}}BZ<S<Z<<nZ6S2}Op1Pj#8I?)n77p9O>E5D_iZFiH_TojJr9%(53U-6^nl1d>f
zyN__gj#eU&vaH=&tc5Rcg6gfdyG{6Ap#~wdw(CTJ7wl^r%2QcMB?}Q<a8c5t*7zD-
zSo2s?ACI&6Be4!;=+UBLt=xugO%!x<m2yG%xDY7V+pW2TbmOVZRTjTr=Pq8F9<?rJ
z@m!v$U?Co|mmWPDoz3IvEFPZGhqK;v{MIM4`=i!`osX9x{DQr)Jvx6dnb7^S>4^HH
z>DhSl-q~<CA1xLGi0ZuNT;ip0c?he&@xF4sBx#BOE7EyvHX7|=Z8Br|b7eZIDU)iS
zn@ftPdBn)2$s^%P#SYEVxl6<)2X8$R*P4!}qeDTuo#PfJ#fwJh+X}gP`OGI(!AhS{
zy1{seKYg$~kMA7hE;|&DbZSD`dvs@|eCwj9Ef?{*v8C&gu9~Ymefxy=ucw-BoKp9s
z^>O@xXhGvcksit_Buejey2qVvs~PUycTAbMs@{Er1rRDYO!=BMemoUmME(E2%@Sa4
z_F7j<kgDAenku$Tf{xb(B$|CN5oXqq6XL8?C<7J75%0ba&!FIy4YtB|bZFcZ3T?)2
zm_nt>WB6e($Tv$c;j10UIHSHAggxjdYCx$`I#sZgVjudeLEH6{)qvpepnpV|Kk`V-
z9EF@O_hTRYhRLbSg#EyL!8{|ttL<=-?|x}ah2>c6zFsjzLxrq@Nlf|Bl;~7bmpPZl
GMgIcOsgWrF

literal 0
HcmV?d00001

diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index d283c5c8..3ff23354 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -6,16 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-01 16:53+0000\n"
-"PO-Revision-Date: 2021-12-14 00:20+0100\n"
-"Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
-"Language-Team: Spanish\n"
+"PO-Revision-Date: 2022-02-05 02:15+0000\n"
+"Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
+"Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
+"liturgical-calendar/api-strings/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: includes/LitCalAPI.php:222
 #, php-format
@@ -23,16 +25,17 @@ msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
+"Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
 #: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
 #, php-format
 msgid "%s day before Epiphany"
-msgstr ""
+msgstr "%s día antes de la Epifanía"
 
 #: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
 #, php-format
 msgid "%s day after Epiphany"
-msgstr ""
+msgstr "%s día después de la Epifanía"
 
 #: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
 #: includes/LitCalAPI.php:575
@@ -41,10 +44,12 @@ msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
+"La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
+"celebración ha sido trasladada a %s (%s) según el %s."
 
 #: includes/LitCalAPI.php:537
 msgid "the Saturday preceding Palm Sunday"
-msgstr ""
+msgstr "Sábado anterior al Domingo de Ramos"
 
 #: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
 #: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
@@ -55,7 +60,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
-msgstr ""
+msgstr "Decreto de la Congregación para el Culto Divino"
 
 #: includes/LitCalAPI.php:553
 msgid "the Monday following the Second Sunday of Easter"

From 3d77f602f29d6a3afaacefb43b3b147ca1dedaef Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 11:52:54 +0100
Subject: [PATCH 015/152] add cache-control to LitCalMetadata.php

---
 LitCalMetadata.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index d16ee011..d1f066d9 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -9,6 +9,7 @@
     header( 'Access-Control-Allow-Origin: *' );
 }
 header( 'Access-Control-Max-Age: 86400' );    // cache for 1 day
+header( 'Cache-Control: must-revalidate, max-age=259200' );
 header( 'Content-Type: application/json' );
 
 //National Calendars are defined in the LitCalAPI engine itself,
@@ -37,12 +38,20 @@
             }
         }
 
-        echo json_encode( [
+        $response = json_encode( [
             "LitCalMetadata" => [
                 "NationalCalendars" => $nationalCalendars,
                 "DiocesanCalendars" => $diocesanCalendars
             ],
         ], JSON_PRETTY_PRINT );
+        $responseHash = md5( $response );
+        header("Etag: \"{$responseHash}\"");
+        if (!empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $responseHash) {
+            header( $_SERVER[ "SERVER_PROTOCOL" ] . " 304 Not Modified" );
+            header('Content-Length: 0');
+        } else {
+            echo $response;
+        }
     } else {
         http_response_code(503);
     }

From d9c73447da1f9997eb0716a6591badc2a0e928ab Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 11:54:38 +0100
Subject: [PATCH 016/152] no longer need references to sql tables

---
 includes/enums/RomanMissal.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/includes/enums/RomanMissal.php b/includes/enums/RomanMissal.php
index f43e7012..808d91a0 100644
--- a/includes/enums/RomanMissal.php
+++ b/includes/enums/RomanMissal.php
@@ -13,14 +13,14 @@ class RomanMissal {
     const ITALY_EDITION_2020                    = "ITALY_2020";
 
     public static array $values = [ 
-        "LITURGY__calendar_propriumdesanctis"               => "VATICAN_1970",
-        "LITURGY__calendar_propriumdesanctis_1971"          => "VATICAN_1971",
-        "LITURGY__calendar_propriumdesanctis_1975"          => "VATICAN_1975",
-        "LITURGY__calendar_propriumdesanctis_2002"          => "VATICAN_2002",
-        "LITURGY__calendar_propriumdesanctis_2008"          => "VATICAN_2008",
-        "LITURGY__USA_calendar_propriumdesanctis_2011"      => "USA_2011",
-        "LITURGY__ITALY_calendar_propriumdesanctis_1983"    => "ITALY_1983",
-        "LITURGY__ITALY_calendar_propriumdesanctis_2020"    => "ITALY_2020"
+        "VATICAN_1970",
+        "VATICAN_1971",
+        "VATICAN_1975",
+        "VATICAN_2002",
+        "VATICAN_2008",
+        "USA_2011",
+        "ITALY_1983",
+        "ITALY_2020"
     ];
 
     public static array $names = [
@@ -65,8 +65,8 @@ public static function isLatinMissal( $value ) : bool {
         return in_array( $value, self::$values ) && strpos( $value, "VATICAN_" );
     }
 
-    public static function getSanctoraleTableName( $value ) : string|int|false {
-        return array_search( $value, self::$values );
+    public static function getName( $value ) : string {
+        return self::$names[ $value ];
     }
 
     public static function getSanctoraleFileName( $value ) : string|false {
@@ -76,8 +76,4 @@ public static function getSanctoraleFileName( $value ) : string|false {
     public static function getSanctoraleI18nFilePath( $value ) : string|false {
         return self::$i18nPath[ $value ];
     }
-
-    public static function getName( $value ) : string {
-        return self::$names[ $value ];
-    }
 }

From a378f16e5072c4c298b5bf31263222f159148fbb Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 12:03:14 +0100
Subject: [PATCH 017/152] add DiocesanGroups to LitCalMetadata

---
 LitCalMetadata.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index d1f066d9..6b2410eb 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -22,10 +22,17 @@
 if( file_exists( 'nations/index.json' ) ) {
     $index = file_get_contents( 'nations/index.json' );
     if( $index !== false ) {
-        $diocesanCalendars = json_decode( $index, true );
-        $nationalCalendars = [];
+        $diocesanCalendars  = json_decode( $index, true );
+        $nationalCalendars  = [];
+        $diocesanGroups     = [];
         foreach( $diocesanCalendars as $key => $value ) {
             unset( $diocesanCalendars[$key]["path"] );
+            if( array_key_exists( "group", $value ) && $value !== "" ) {
+                if( !array_key_exists($value["group"], $diocesanGroups) ) {
+                    $diocesanGroups[$value["group"]] = [];
+                }
+                $diocesanGroups[$value["group"]][] = $key;
+            }
             if( !array_key_exists($diocesanCalendars[$key]["nation"], $nationalCalendars) ) {
                 $nationalCalendars[$diocesanCalendars[$key]["nation"]] = [];
             }
@@ -41,7 +48,8 @@
         $response = json_encode( [
             "LitCalMetadata" => [
                 "NationalCalendars" => $nationalCalendars,
-                "DiocesanCalendars" => $diocesanCalendars
+                "DiocesanCalendars" => $diocesanCalendars,
+                "DiocesanGroups"    => $diocesanGroups
             ],
         ], JSON_PRETTY_PRINT );
         $responseHash = md5( $response );

From 1716486704a51eca41cdc066e66744c9c832f05b Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 23:24:26 +0100
Subject: [PATCH 018/152] begin moving NationalCalendar to json data

---
 includes/LitCalAPI.php                        |  57 ++++--
 nations/EUROPE/it.json                        |   7 +
 nations/Europe.json                           | 172 ++++++++++++++++++
 ... Sora - Cassino - Aquino - Pontecorvo.json |   1 +
 nations/ITALY/ITALY.json                      |   0
 nations/index.json                            |   2 +-
 6 files changed, 225 insertions(+), 14 deletions(-)
 create mode 100644 nations/EUROPE/it.json
 create mode 100644 nations/Europe.json
 create mode 100644 nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json
 create mode 100644 nations/ITALY/ITALY.json

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index d31d6ae6..539b8eeb 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -32,6 +32,8 @@ class LitCalAPI {
     private LitGrade $LitGrade;
 
     private ?object $DiocesanData                   = null;
+    private ?object $NationalData                   = null;
+    private ?object $widerRegionData                = null;
     private ?object $GeneralIndex                   = null;
     private NumberFormatter $formatter;
     private NumberFormatter $formatterFem;
@@ -172,7 +174,7 @@ private function updateSettingsBasedOnDiocesanCalendar() : void {
     }
 
 
-    private function loadLocalCalendarData() : void {
+    private function loadDiocesanCalendarData() : void {
         if( $this->LitSettings->DiocesanCalendar !== null ){
             //since a Diocesan calendar is being requested, we need to retrieve the JSON data
             //first we need to discover the path, so let's retrieve our index file
@@ -220,14 +222,14 @@ private function dieIfBeforeMinYear() : void {
         //with the Prima Editio Typica of the Roman Missal and the General Norms promulgated with the Motu Proprio "Mysterii Paschali" in 1969
         if ( $this->LitSettings->Year < 1970 ) {
             $this->Messages[] = sprintf( _( "Only years from 1970 and after are supported. You tried requesting the year %d." ), $this->LitSettings->Year );
-            $this->GenerateResponseToRequest();
+            $this->GenerateResponse();
         }
     }
 
     /**
      * Retrieve Higher Ranking Solemnities from Proprium de Tempore
      */
-    private function populatePropriumDeTempore() : void {
+    private function loadPropriumDeTemporeData() : void {
         $propriumdetemporeFile = strtolower( "data/propriumdetempore/{$this->LitSettings->Locale}.json" );
         if( file_exists( $propriumdetemporeFile ) ) {
             $PropriumDeTempore = json_decode( file_get_contents( $propriumdetemporeFile ), true );
@@ -241,7 +243,7 @@ private function populatePropriumDeTempore() : void {
         }
     }
 
-    private function readPropriumDeSanctisJSONData( string $missal ) : void {
+    private function loadPropriumDeSanctisData( string $missal ) : void {
         $propriumdesanctisFile = RomanMissal::getSanctoraleFileName( $missal );
         $propriumdesanctisI18nPath = RomanMissal::getSanctoraleI18nFilePath( $missal );
 
@@ -271,7 +273,7 @@ private function readPropriumDeSanctisJSONData( string $missal ) : void {
         }
     }
 
-    private function readMemorialsFromDecreesJSONData() : void {
+    private function loadMemorialsFromDecreesData() : void {
         $memorialsFromDecreesFile       = "data/memorialsFromDecrees/memorialsFromDecrees.json";
         $memorialsFromDecreesI18nPath   = "data/memorialsFromDecrees/i18n/";
         $memorialsFromDecreesI18nFile = $memorialsFromDecreesI18nPath . strtolower( $this->LitSettings->Locale ) . ".json";
@@ -1584,7 +1586,7 @@ private function applyCalendarItaly() : void {
         $this->applyPatronSaintsEurope();
         $this->applyPatronSaintsItaly();
         if( $this->LitSettings->Year >= 1983 && $this->LitSettings->Year < 2002 ) {
-            $this->readPropriumDeSanctisJSONData( RomanMissal::ITALY_EDITION_1983 );
+            $this->loadPropriumDeSanctisData( RomanMissal::ITALY_EDITION_1983 );
             //The extra liturgical events found in the 1983 edition of the Roman Missal in Italian,
             //were then incorporated into the Latin edition in 2002 ( effectively being incorporated into the General Roman Calendar )
             //so when dealing with Italy, we only need to add them from 1983 until 2002, after which it's taken care of by the General Calendar
@@ -1767,7 +1769,7 @@ private function applyCalendarUSA() : void {
         $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '5-7-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $this->moveFestivityDate( "StElizabethPortugal", $currentFeastDate, "Independence Day", RomanMissal::USA_EDITION_2011 );
 
-        $this->readPropriumDeSanctisJSONData( RomanMissal::USA_EDITION_2011 );
+        $this->loadPropriumDeSanctisData( RomanMissal::USA_EDITION_2011 );
 
         foreach ( $this->tempCal[ RomanMissal::USA_EDITION_2011 ] as $row ) {
             $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
@@ -1867,7 +1869,7 @@ private static function DateIsNotSunday( DateTime $dt ) : bool {
 
     private function calculateUniversalCalendar() : void {
 
-        $this->populatePropriumDeTempore();
+        $this->loadPropriumDeTemporeData();
         /**
          *  CALCULATE LITURGICAL EVENTS BASED ON THE ORDER OF PRECEDENCE OF LITURGICAL DAYS ( LY 59 )
          *  General Norms for the Liturgical Year and the Calendar ( issued on Feb. 14 1969 )
@@ -1886,7 +1888,7 @@ private function calculateUniversalCalendar() : void {
         $this->calculateEasterOctave();
         //3. Solemnities of the Lord, of the Blessed Virgin Mary, and of saints listed in the General Calendar
         $this->calculateMobileSolemnitiesOfTheLord();
-        $this->readPropriumDeSanctisJSONData( RomanMissal::EDITIO_TYPICA_1970 );
+        $this->loadPropriumDeSanctisData( RomanMissal::EDITIO_TYPICA_1970 );
         $this->calculateFixedSolemnities(); //this will also handle All Souls Day
 
         //4. PROPER SOLEMNITIES:
@@ -1920,16 +1922,16 @@ private function calculateUniversalCalendar() : void {
         $this->calculateMemorials( LitGrade::MEMORIAL, RomanMissal::EDITIO_TYPICA_1970 );
 
         if ( $this->LitSettings->Year >= 2002 ) {
-            $this->readPropriumDeSanctisJSONData( RomanMissal::EDITIO_TYPICA_TERTIA_2002 );
+            $this->loadPropriumDeSanctisData( RomanMissal::EDITIO_TYPICA_TERTIA_2002 );
             $this->calculateMemorials( LitGrade::MEMORIAL, RomanMissal::EDITIO_TYPICA_TERTIA_2002 );
         }
 
         if( $this->LitSettings->Year >= 2008 ) {
-            $this->readPropriumDeSanctisJSONData( RomanMissal::EDITIO_TYPICA_TERTIA_EMENDATA_2008 );
+            $this->loadPropriumDeSanctisData( RomanMissal::EDITIO_TYPICA_TERTIA_EMENDATA_2008 );
             $this->calculateMemorials( LitGrade::MEMORIAL, RomanMissal::EDITIO_TYPICA_TERTIA_EMENDATA_2008 );
         }
 
-        $this->readMemorialsFromDecreesJSONData();
+        $this->loadMemorialsFromDecreesData();
         $this->applyDecrees( LitGrade::MEMORIAL );
 
         //11. Proper obligatory memorials, and that is:
@@ -2210,6 +2212,33 @@ public function setAllowedReturnTypes( array $returnTypes ) : void {
         $this->AllowedReturnTypes = array_values( array_intersect( ReturnType::$values, $returnTypes ) );
     }
 
+    private function loadNationalCalendarData() : void {
+        $nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
+        if( file_exists( $nationalDataFile ) ) {
+            $this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
+            if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
+                $widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
+                $widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
+                if( file_exists( $widerRegionI18nFile ) ) {
+                    $widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
+                    if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
+                        $this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
+                        if( json_last_error() === JSON_ERROR_NONE ) {
+                            foreach( $this->WiderRegionData as $idx => $value ) {
+                                $tag = $value["Festivity"]["tag"];
+                                $this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
+                            }
+                        } else {
+                            $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
+                        }
+                    } else {
+                        $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * The LitCalEngine will only work once you call the public Init() method
      * Do not change the order of the methods that follow,
@@ -2218,7 +2247,7 @@ public function setAllowedReturnTypes( array $returnTypes ) : void {
     public function Init(){
         $this->APICore->Init();
         $this->initParameterData();
-        $this->loadLocalCalendarData();
+        $this->loadDiocesanCalendarData();
         $this->APICore->setResponseContentTypeHeader();
         if( $this->cacheFileIsAvailable() ){
             //If we already have done the calculation
@@ -2232,6 +2261,8 @@ public function Init(){
             $this->calculateUniversalCalendar();
 
             if( $this->LitSettings->NationalCalendar !== null ) {
+                //$this->loadNationalCalendarData();
+                //$this->applyNationalCalendar();
                 switch( $this->LitSettings->NationalCalendar ){
                     case 'ITALY':
                         $this->applyCalendarItaly();
diff --git a/nations/EUROPE/it.json b/nations/EUROPE/it.json
new file mode 100644
index 00000000..de7a9e86
--- /dev/null
+++ b/nations/EUROPE/it.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "San Benedetto, abate, patrono d'Europa",
+    "StsCyrilMethodius": "Santi Cirillo, monaco, e Metodio, vescovo, patroni d'Europa",
+    "StBridget": "Santa Brigida, religiosa, patrona d'Europa",
+    "StCatherineSiena": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia e d'Europa",
+    "StEdithStein": "Santa Teresa Benedetta della Croce, vergine e martire, patrona d'Europa"
+}
diff --git a/nations/Europe.json b/nations/Europe.json
new file mode 100644
index 00000000..14098228
--- /dev/null
+++ b/nations/Europe.json
@@ -0,0 +1,172 @@
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "StBenedict",
+                "color": "white",
+                "grade": 4,
+                "day": 11,
+                "month": 7,
+                "sinceYear": 1964
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "decreeURL": "https://www.vatican.va/content/paul-vi/%s/apost_letters/documents/hf_p-vi_apl_19641024_pacis-nuntius.html",
+                "decreeLangs": {
+                    "IT": "it",
+                    "ES": "es",
+                    "LA": "la"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StsCyrilMethodius",
+                "color": "white",
+                "grade": 4,
+                "day": 14,
+                "month": 2,
+                "sinceYear": 1980
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/apost_letters/1980/documents/hf_jp-ii_apl_31121980_egregiae-virtutis.html",
+                "decreeLangs": {
+                    "ES": "es",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StBridget",
+                "color": "white",
+                "grade": 4,
+                "day": 23,
+                "month": 7,
+                "sinceYear": 1999
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StCatherineSiena",
+                "color": "white",
+                "grade": 4,
+                "day": 29,
+                "month": 4,
+                "sinceYear": 1999
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StEdithStein",
+                "color": "white",
+                "grade": 4,
+                "day": 9,
+                "month": 8,
+                "sinceYear": 1999,
+                "common": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+                "readings": {
+                    "FIRST_READING": "",
+                    "RESPONSORIAL_PSALM": "",
+                    "SECOND_READING": "",
+                    "ALLELUIA_VERSE": "",
+                    "GOSPEL": ""
+                }
+            },
+            "Metadata": {
+                "action": "create",
+                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StEdithStein",
+                "color": "white",
+                "grade": 4,
+                "day": 9,
+                "month": 8,
+                "sinceYear": 2002
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        }
+    ],
+    "NationalCalendars": {
+        "AUSTRIA": "AT",
+        "BELGIUM": "BE",
+        "BULGARIA": "BG",
+        "CZECH REPUBLIC": "CZ",
+        "CYPRUS": "CY",
+        "CROATIA": "HR",
+        "DENMARK": "DK",
+        "ESTONIA": "EE",
+        "FINLAND": "FI",
+        "FRANCE": "FR",
+        "GERMANY": "DE",
+        "GREECE": "GR",
+        "IRELAND": "IE",
+        "ITALY": "IT",
+        "LATVIA": "LV",
+        "LITHUANIA": "LT",
+        "LUXEMBOURG": "LU",
+        "MALTA": "MT",
+        "NETHERLANDS": "NL",
+        "POLONIA": "PL",
+        "PORTUGAL": "PT",
+        "ROMANIA": "RO",
+        "SLOVACCHIA": "SK",
+        "SLOVENIA": "SI",
+        "SPAIN": "ES",
+        "SWEDEN": "SE",
+        "HUNGARY": "HU"
+    }
+}
diff --git a/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json
new file mode 100644
index 00000000..977ef41f
--- /dev/null
+++ b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json	
@@ -0,0 +1 @@
+{"LitCal":{"DedicazionedellaChiesaMadrediCassinoinCassino":{"name":"Dedicazione della Chiesa Madre di Cassino (in Cassino)","color":"white","grade":6,"common":"Dedication of a Church","day":5,"month":6,"formRowNum":1,"sinceYear":"1970"},"SantaRestituta":{"name":"Santa Restituta","color":["white"],"grade":4,"common":"Proper","day":27,"month":5,"formRowNum":0,"sinceYear":"1970"}}}
diff --git a/nations/ITALY/ITALY.json b/nations/ITALY/ITALY.json
new file mode 100644
index 00000000..e69de29b
diff --git a/nations/index.json b/nations/index.json
index 5eff8744..8afa2a4b 100644
--- a/nations/index.json
+++ b/nations/index.json
@@ -1 +1 @@
-{"DIOCESIDIROMA":{"path":"nations\/ITALY\/Diocesi di Roma.json","nation":"ITALY","diocese":"Diocesi di Roma","group":"Diocesi del Lazio"},"ARCHDIOCESEOFBOSTONMASSACHUSETTS":{"path":"nations\/USA\/Archdiocese of Boston (Massachusetts).json","nation":"USA","diocese":"Archdiocese of Boston (Massachusetts)"}}
+{"DIOCESIDIROMA":{"path":"nations\/ITALY\/Diocesi di Roma.json","nation":"ITALY","diocese":"Diocesi di Roma","group":"Diocesi del Lazio"},"ARCHDIOCESEOFBOSTONMASSACHUSETTS":{"path":"nations\/USA\/Archdiocese of Boston (Massachusetts).json","nation":"USA","diocese":"Archdiocese of Boston (Massachusetts)"},"DIOCESIDISORACASSINOAQUINOPONTECORVO":{"path":"nations\/ITALY\/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json","nation":"ITALY","diocese":"Diocesi di Sora - Cassino - Aquino - Pontecorvo","group":"Diocesi del Lazio"}}

From dc267576753346e9f0a6a691815a992d5b3e1cd2 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 6 Feb 2022 22:25:05 +0000
Subject: [PATCH 019/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 113 +++++++++++++++++++++++++-----------------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index f341b8e7..ec53d668 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,96 +17,96 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +126,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +145,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +160,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +198,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +211,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,33 +372,38 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327

From b0baff8bdb13dea2c261952686e882dade81dc35 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 6 Feb 2022 23:25:11 +0100
Subject: [PATCH 020/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 113 +++++++++++++++++----------------
 i18n/es/LC_MESSAGES/litcal.po | 115 ++++++++++++++++++----------------
 i18n/fr/LC_MESSAGES/litcal.po | 113 +++++++++++++++++----------------
 i18n/it/LC_MESSAGES/litcal.po | 113 +++++++++++++++++----------------
 i18n/la/LC_MESSAGES/litcal.po | 113 +++++++++++++++++----------------
 i18n/pt/LC_MESSAGES/litcal.po | 113 +++++++++++++++++----------------
 6 files changed, 355 insertions(+), 325 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 57fa2fbb..fb06509b 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -17,96 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +126,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +145,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +160,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +198,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +211,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,33 +372,38 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 3ff23354..420e5050 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,18 +27,18 @@ msgid ""
 msgstr ""
 "Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s día antes de la Epifanía"
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s día después de la Epifanía"
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -47,71 +47,71 @@ msgstr ""
 "La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
 "celebración ha sido trasladada a %s (%s) según el %s."
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr "Sábado anterior al Domingo de Ramos"
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -131,15 +131,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -150,7 +150,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -165,12 +165,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -203,7 +203,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -216,14 +216,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -278,14 +278,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -316,21 +316,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -338,7 +338,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -346,7 +346,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -355,17 +355,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -377,33 +377,38 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 21327bba..cf94ee3b 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -17,96 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +126,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +145,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +160,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +198,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +211,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,33 +372,38 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 4429fd30..01017a96 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -28,18 +28,18 @@ msgstr ""
 "Sono supportati anni dal 1970 in poi soltanto. Tu invece hai provato a "
 "richiedere l'anno %d."
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s giorno prima dell'Epifania"
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s giorno dopo l'Epifania"
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -48,30 +48,30 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
 "celebrazione è stata trasferita al %s (%s) in accordo con il %s."
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabato che precede la Domenica delle Palme"
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "lunedì che segue la Seconda Domenica di Pasqua"
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr "lunedì seguente"
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -80,7 +80,7 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -89,7 +89,7 @@ msgstr ""
 "Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
 "nell'anno %d, la prima è stata anticipata di un giorno come da %s."
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -98,27 +98,27 @@ msgstr ""
 "'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
 "viene celebrata il %s anziché la Domenica dopo Natale."
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "della %s Settimana dell'Avvento"
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "%s Giorno dell'Ottava di Natale"
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "della %s Settimana di Quaresima"
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr "dopo il Mercoledì delle Ceneri"
 
@@ -138,8 +138,8 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -148,7 +148,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -161,7 +161,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -179,12 +179,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "La %1$s '%2$s' è soppiantata dalla %3$s '%4$s' nell'anno %5$d."
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr "Costituzione Apostolica Missale Romanum"
 
@@ -199,7 +199,7 @@ msgstr "Costituzione Apostolica Missale Romanum"
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -220,7 +220,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -235,7 +235,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -244,7 +244,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -256,7 +256,7 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -273,7 +273,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -290,7 +290,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -305,7 +305,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -314,7 +314,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -328,7 +328,7 @@ msgstr "e Dottore della Chiesa"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -347,7 +347,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -356,7 +356,7 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -365,7 +365,7 @@ msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -376,7 +376,7 @@ msgstr ""
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -387,7 +387,7 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -400,17 +400,17 @@ msgstr ""
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
@@ -422,7 +422,7 @@ msgstr "Memoria di Santa Maria in sabato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -431,26 +431,31 @@ msgstr ""
 "La %1$s '%2$s', celebrata solitamente il giorno %3$s, è soppressa dalla %4$s "
 "'%5$s' nell'anno %6$d."
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patrono d'Europa"
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona d'Europa"
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni d'Europa"
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 08583698..9a3cf747 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.9.1\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,18 +27,18 @@ msgid ""
 msgstr ""
 "Petere potes nisi ab annis MCMLXX et ultra. Tu anno %d conatus est petere."
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "Dies %s ante Epiphaniam"
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "Dies %s post Epiphaniam"
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -47,30 +47,30 @@ msgstr ""
 "Coincidet enim Sollemnitas <i>'%s'</i> cum <b>%s</b> in anno %d, ergo "
 "traslata est celebratio ad %s (%s) secundum %s."
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabbatum ante Dominicam in Palmis"
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "diem Lunæ post Dominicam Secundam Paschæ"
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr "diem Lunæ proximum"
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -79,7 +79,7 @@ msgstr ""
 "Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in anno %d. "
 "Oportet quaerere a Congregatione Cultu Divino quid facere!"
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -88,7 +88,7 @@ msgstr ""
 "Ex causa Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in "
 "anno %d, anticipata est ab uno die secundum %s."
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -97,27 +97,27 @@ msgstr ""
 "'%s' coincidet cum Dominica in anno %d, ergo Festum <i>'%s'</i> celebrentur "
 "die %s quam Dominica post Nativitate."
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "Hebdomadæ %s Adventus"
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "Dies %s Octavæ Nativitatis"
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "Hebdomadæ %s Quadragesimæ"
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr "post Feria IV Cinerum"
 
@@ -137,8 +137,8 @@ msgstr "post Feria IV Cinerum"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been added on %s since the year %d (%s), applicable to "
@@ -150,7 +150,7 @@ msgstr ""
 "%s <i>'%s'</i> aggregata est igitur in die <b>%s</b> ab anno %d (%s), ergo "
 "viget in anno %d."
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -161,7 +161,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -183,13 +183,13 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, fuzzy, php-format
 #| msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added in the %s of the Roman Missal since the year %d (%s) "
@@ -227,7 +227,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -245,7 +245,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, fuzzy, php-format
 #| msgid ""
 #| "The Memorial '%s' coincides with another Memorial '%s' in the year %d. "
@@ -257,7 +257,7 @@ msgstr ""
 "Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
 "ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -269,7 +269,7 @@ msgstr "dies Lunae post Pentecostem"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -289,7 +289,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -309,7 +309,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -327,7 +327,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -339,7 +339,7 @@ msgstr ""
 "%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
 "%d (%s)."
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -355,7 +355,7 @@ msgstr "Dedicationis ecclesiæ"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -377,7 +377,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been suppressed by the Memorial '%s', added on %s since "
@@ -388,7 +388,7 @@ msgid ""
 msgstr ""
 "%s '%s' subplantata est ad Memoria '%s', aggregata in die %s ab anno %d (%s)."
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -397,7 +397,7 @@ msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -408,7 +408,7 @@ msgstr ""
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -419,7 +419,7 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -431,17 +431,17 @@ msgstr ""
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
@@ -453,7 +453,7 @@ msgstr "Memoria Sanctæ Mariæ in Sabbato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
@@ -465,26 +465,31 @@ msgstr ""
 "%s '%s', celebrata plerumque in die %s, subplantata est ab %s '%s' in anno "
 "%d."
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patronus Europae"
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona Europae"
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni Europae"
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index c6e325a3..88a10918 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-01 16:53+0000\n"
+"POT-Creation-Date: 2022-02-06 22:25+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -17,96 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: includes/LitCalAPI.php:222
+#: includes/LitCalAPI.php:224
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:329 includes/LitCalAPI.php:368
+#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:343 includes/LitCalAPI.php:381
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:533 includes/LitCalAPI.php:549
-#: includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
+#: includes/LitCalAPI.php:577
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:537
+#: includes/LitCalAPI.php:539
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:542 includes/LitCalAPI.php:558
-#: includes/LitCalAPI.php:584 includes/LitCalAPI.php:612
-#: includes/LitCalAPI.php:898 includes/LitCalAPI.php:1017
-#: includes/LitCalAPI.php:1073 includes/LitCalAPI.php:1232
-#: includes/LitCalAPI.php:1277 includes/LitCalAPI.php:1304
-#: includes/LitCalAPI.php:1413 includes/LitCalAPI.php:1425
-#: includes/LitCalAPI.php:1440 includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
+#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
+#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
+#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
+#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
+#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
+#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
 #: includes/FestivityCollection.php:337
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:555
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:581
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:590
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:608
+#: includes/LitCalAPI.php:610
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:676
+#: includes/LitCalAPI.php:678
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:710 includes/LitCalAPI.php:734
+#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:787
+#: includes/LitCalAPI.php:789
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:806
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:828
+#: includes/LitCalAPI.php:830
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:833
+#: includes/LitCalAPI.php:835
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +126,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:853 includes/LitCalAPI.php:1111
-#: includes/LitCalAPI.php:1288
+#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
+#: includes/LitCalAPI.php:1290
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:884 includes/LitCalAPI.php:976
+#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +145,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:930
+#: includes/LitCalAPI.php:932
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +160,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:952
+#: includes/LitCalAPI.php:954
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:974
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:994
+#: includes/LitCalAPI.php:996
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +198,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1030
+#: includes/LitCalAPI.php:1032
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +211,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1069
+#: includes/LitCalAPI.php:1071
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1090
+#: includes/LitCalAPI.php:1092
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1146
+#: includes/LitCalAPI.php:1148
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +245,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1168
+#: includes/LitCalAPI.php:1170
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +260,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1178
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +273,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1212
+#: includes/LitCalAPI.php:1214
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1220
+#: includes/LitCalAPI.php:1222
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1325
+#: includes/LitCalAPI.php:1327
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +311,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1353
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1411
+#: includes/LitCalAPI.php:1413
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1425
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +333,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1438
+#: includes/LitCalAPI.php:1440
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +341,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1464
+#: includes/LitCalAPI.php:1466
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,17 +350,17 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1488
+#: includes/LitCalAPI.php:1490
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1524 includes/LitCalAPI.php:1553
+#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1576
+#: includes/LitCalAPI.php:1578
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
@@ -372,33 +372,38 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1635
+#: includes/LitCalAPI.php:1637
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1653
+#: includes/LitCalAPI.php:1655
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1654 includes/LitCalAPI.php:1662
-#: includes/LitCalAPI.php:1666 includes/LitCalAPI.php:1685
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
+#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1657
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1673
+#: includes/LitCalAPI.php:1675
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
+#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327

From d2ae04de03a2b08360c7ab62e04830c41a34a0f7 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 23:33:07 +0100
Subject: [PATCH 021/152] add cache header to response

---
 includes/LitCalAPI.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 539b8eeb..03a3d80a 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -2139,39 +2139,43 @@ private function generateResponse() {
         $SerializeableLitCal->Metadata->FeastsMemorials  = $this->Cal->getFeastsAndMemorials();
 
         //make sure we have an engineCache folder for the current Version
-        if( realpath( "engineCache/v" . str_replace( ".","_",self::API_VERSION ) ) === false ){
-            mkdir( "engineCache/v" . str_replace( ".","_",self::API_VERSION ), 0755, true );
+        if( realpath( "engineCache/v" . str_replace( ".", "_", self::API_VERSION ) ) === false ) {
+            mkdir( "engineCache/v" . str_replace( ".", "_", self::API_VERSION ), 0755, true );
         }
 
         switch ( $this->LitSettings->ReturnType ) {
             case ReturnType::JSON:
-                file_put_contents( $this->CACHEFILE, json_encode( $SerializeableLitCal ) );
-                echo json_encode( $SerializeableLitCal );
+                $response = json_encode( $SerializeableLitCal );
                 break;
             case ReturnType::XML:
                 $jsonStr = json_encode( $SerializeableLitCal );
                 $jsonObj = json_decode( $jsonStr, true );
                 $xml = new SimpleXMLElement ( "<?xml version=\"1.0\" encoding=\"UTF-8\"?" . "><LiturgicalCalendar xmlns=\"https://www.bibleget.io/catholicliturgy\"/>" );
                 LitFunc::convertArray2XML( $jsonObj, $xml );
-                file_put_contents( $this->CACHEFILE, $xml->asXML() );
-                print $xml->asXML();
+                $response = $xml->asXML();
                 break;
             case ReturnType::ICS:
                 $infoObj = $this->getGithubReleaseInfo();
                 if( $infoObj->status === "success" ) {
-                    $ical = $this->produceIcal( $SerializeableLitCal, $infoObj->obj );
-                    file_put_contents( $this->CACHEFILE, $ical );
-                    echo $ical;
+                    $response = $this->produceIcal( $SerializeableLitCal, $infoObj->obj );
                 }
                 else{
                     die( 'Error receiving or parsing info from github about latest release: '.$infoObj->message );
                 }
                 break;
             default:
-                file_put_contents( $this->CACHEFILE, json_encode( $SerializeableLitCal ) );
-                echo json_encode( $SerializeableLitCal );
+                $response = json_encode( $SerializeableLitCal );
                 break;
         }
+        file_put_contents( $this->CACHEFILE, $response );
+        $responseHash = md5( $response );
+        header("Etag: \"{$responseHash}\"");
+        if (!empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $responseHash) {
+            header( $_SERVER[ "SERVER_PROTOCOL" ] . " 304 Not Modified" );
+            header('Content-Length: 0');
+        } else {
+            echo $response;
+        }
         die();
     }
 

From 05c7b9e1f8898c58143f0d26f9c4699808d35974 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 6 Feb 2022 22:33:54 +0000
Subject: [PATCH 022/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index ec53d668..af2f6ce4 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""

From 4ea3ac32fe05cf109625a2e07075400e1214ab4a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 6 Feb 2022 23:33:59 +0100
Subject: [PATCH 023/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 4 ++--
 i18n/es/LC_MESSAGES/litcal.po | 4 ++--
 i18n/fr/LC_MESSAGES/litcal.po | 4 ++--
 i18n/it/LC_MESSAGES/litcal.po | 4 ++--
 i18n/la/LC_MESSAGES/litcal.po | 4 ++--
 i18n/pt/LC_MESSAGES/litcal.po | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index fb06509b..c82f7e38 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 420e5050..baad7af7 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -404,7 +404,7 @@ msgstr ""
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index cf94ee3b..4c6b9a92 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 01017a96..282434ae 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -451,7 +451,7 @@ msgstr "patroni d'Europa"
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 9a3cf747..5555dce9 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -485,7 +485,7 @@ msgstr "patroni Europae"
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 88a10918..4130cabb 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:25+0000\n"
+"POT-Creation-Date: 2022-02-06 22:33+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2232 includes/LitCalAPI.php:2235
+#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""

From df7e17da9e9e331cfb84f6b7ccb4af4c5632bd41 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 6 Feb 2022 23:58:22 +0100
Subject: [PATCH 024/152] add cache headers along with response

---
 includes/APICore.php   |  1 +
 includes/LitCalAPI.php | 79 ++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/includes/APICore.php b/includes/APICore.php
index db1b50b2..b5f7655f 100644
--- a/includes/APICore.php
+++ b/includes/APICore.php
@@ -113,6 +113,7 @@ public function setResponseContentType( string $responseContentType ) : void {
     }
 
     public function setResponseContentTypeHeader() : void {
+        header( 'Cache-Control: must-revalidate, max-age=259200' ); //cache for 1 month
         header( "Content-Type: {$this->ResponseContentType}; charset=utf-8" );
     }
 
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 03a3d80a..0cbc021e 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -33,7 +33,7 @@ class LitCalAPI {
 
     private ?object $DiocesanData                   = null;
     private ?object $NationalData                   = null;
-    private ?object $widerRegionData                = null;
+    private ?object $WiderRegionData                = null;
     private ?object $GeneralIndex                   = null;
     private NumberFormatter $formatter;
     private NumberFormatter $formatterFem;
@@ -1582,6 +1582,40 @@ private function calculateSaturdayMemorialBVM() : void {
         }
     }
 
+    private function loadNationalCalendarData() : void {
+        $nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
+        if( file_exists( $nationalDataFile ) ) {
+            $this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
+            if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
+                $widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
+                $widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
+                if( file_exists( $widerRegionI18nFile ) ) {
+                    $widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
+                    if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
+                        $this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
+                        if( json_last_error() === JSON_ERROR_NONE ) {
+                            foreach( $this->WiderRegionData as $idx => $value ) {
+                                $tag = $value["Festivity"]["tag"];
+                                $this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
+                            }
+                        } else {
+                            $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
+                        }
+                    } else {
+                        $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
+                    }
+                }
+            }
+        }
+    }
+
+    private function applyNationalCalendar() : void {
+        //first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
+        if( $this->WiderRegionData !== null ) {
+
+        }
+    }
+
     private function applyCalendarItaly() : void {
         $this->applyPatronSaintsEurope();
         $this->applyPatronSaintsItaly();
@@ -2216,33 +2250,6 @@ public function setAllowedReturnTypes( array $returnTypes ) : void {
         $this->AllowedReturnTypes = array_values( array_intersect( ReturnType::$values, $returnTypes ) );
     }
 
-    private function loadNationalCalendarData() : void {
-        $nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
-        if( file_exists( $nationalDataFile ) ) {
-            $this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
-            if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
-                $widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
-                $widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
-                if( file_exists( $widerRegionI18nFile ) ) {
-                    $widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
-                    if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
-                        $this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
-                        if( json_last_error() === JSON_ERROR_NONE ) {
-                            foreach( $this->WiderRegionData as $idx => $value ) {
-                                $tag = $value["Festivity"]["tag"];
-                                $this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
-                            }
-                        } else {
-                            $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
-                        }
-                    } else {
-                        $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * The LitCalEngine will only work once you call the public Init() method
      * Do not change the order of the methods that follow,
@@ -2253,11 +2260,21 @@ public function Init(){
         $this->initParameterData();
         $this->loadDiocesanCalendarData();
         $this->APICore->setResponseContentTypeHeader();
+
         if( $this->cacheFileIsAvailable() ){
             //If we already have done the calculation
             //and stored the results in a cache file
             //then we're done, just output this and die
-            echo file_get_contents( $this->CACHEFILE );
+            //or better, make the client use it's own cache copy!
+            $response = file_get_contents( $this->CACHEFILE );
+            $responseHash = md5( $response );
+            header("Etag: \"{$responseHash}\"");
+            if (!empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $responseHash) {
+                header( $_SERVER[ "SERVER_PROTOCOL" ] . " 304 Not Modified" );
+                header('Content-Length: 0');
+            } else {
+                echo $response;
+            }
             die();
         } else {
             $this->dieIfBeforeMinYear();
@@ -2269,7 +2286,9 @@ public function Init(){
                 //$this->applyNationalCalendar();
                 switch( $this->LitSettings->NationalCalendar ){
                     case 'ITALY':
-                        $this->applyCalendarItaly();
+                        $this->loadNationalCalendarData();
+                        $this->applyNationalCalendar();
+                        //$this->applyCalendarItaly();
                         break;
                     case 'USA':
                         //I don't have any data before 2011

From 745c017bd491bc73c2fb7b553507787b0ed25fc8 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 6 Feb 2022 22:59:00 +0000
Subject: [PATCH 025/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index af2f6ce4..d4475f78 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -364,6 +364,11 @@ msgstr ""
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -372,38 +377,33 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327

From 1b1b24bd57d1a75f17f9f69f9477d87d90660126 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 6 Feb 2022 23:59:05 +0100
Subject: [PATCH 026/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 i18n/es/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 i18n/fr/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 i18n/it/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 i18n/la/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 i18n/pt/LC_MESSAGES/litcal.po | 24 ++++++++++++------------
 6 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index c82f7e38..2b22255e 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -364,6 +364,11 @@ msgstr ""
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -372,38 +377,33 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index baad7af7..e335842a 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -369,6 +369,11 @@ msgstr ""
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -377,38 +382,33 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 4c6b9a92..1de86c8e 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -364,6 +364,11 @@ msgstr ""
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -372,38 +377,33 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 282434ae..f197ca78 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -414,6 +414,11 @@ msgstr "della %s Settimana del Tempo Ordinario"
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -422,7 +427,7 @@ msgstr "Memoria di Santa Maria in sabato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -431,31 +436,26 @@ msgstr ""
 "La %1$s '%2$s', celebrata solitamente il giorno %3$s, è soppressa dalla %4$s "
 "'%5$s' nell'anno %6$d."
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patrono d'Europa"
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona d'Europa"
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni d'Europa"
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 5555dce9..3df7584f 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -445,6 +445,11 @@ msgstr "Hebdomadæ %s Temporis Ordinarii"
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -453,7 +458,7 @@ msgstr "Memoria Sanctæ Mariæ in Sabbato"
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
@@ -465,31 +470,26 @@ msgstr ""
 "%s '%s', celebrata plerumque in die %s, subplantata est ab %s '%s' in anno "
 "%d."
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr "patronus Europae"
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr "patrona Europae"
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr "patroni Europae"
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 4130cabb..b2785a29 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:33+0000\n"
+"POT-Creation-Date: 2022-02-06 22:59+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -364,6 +364,11 @@ msgstr ""
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
+#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#, php-format
+msgid "Error retrieving and decoding Wider Region data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -372,38 +377,33 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1637
+#: includes/LitCalAPI.php:1671
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1655
+#: includes/LitCalAPI.php:1689
 msgctxt "Male singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1664
-#: includes/LitCalAPI.php:1668 includes/LitCalAPI.php:1687
+#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
+#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
 msgctxt "Female singular"
 msgid "patron of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1657
+#: includes/LitCalAPI.php:1691
 msgctxt "Male plural"
 msgid "patrons of Europe"
 msgstr ""
 
-#: includes/LitCalAPI.php:1675
+#: includes/LitCalAPI.php:1709
 msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
 msgstr ""
 
-#: includes/LitCalAPI.php:2236 includes/LitCalAPI.php:2239
-#, php-format
-msgid "Error retrieving and decoding Wider Region data from file %s."
-msgstr ""
-
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:327

From b3f567f71a7566da8ba20cc943bd4578534c3ac4 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 7 Feb 2022 14:13:48 +0100
Subject: [PATCH 027/152] add WiderRegions property to metadata output

---
 LitCalMetadata.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index 6b2410eb..c78b4263 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -44,12 +44,21 @@
                 $nationalCalendars[$nation] = [];
             }
         }
+        $filterDirResults = ['..', '.', 'index.json'];
+        $dirResults = array_diff( scandir('nations'), $filterDirResults );
+        $widerRegionsFiles = array_values( array_filter( $dirResults, function($el) {
+            return !is_dir('nations/' . $el) && pathinfo('nations/' . $el, PATHINFO_EXTENSION) === 'json';
+        }) );
+        $widerRegionsNames = array_map( function($el){
+            return pathinfo('nations/' . $el, PATHINFO_FILENAME);
+        }, $widerRegionsFiles );
 
         $response = json_encode( [
             "LitCalMetadata" => [
                 "NationalCalendars" => $nationalCalendars,
                 "DiocesanCalendars" => $diocesanCalendars,
-                "DiocesanGroups"    => $diocesanGroups
+                "DiocesanGroups"    => $diocesanGroups,
+                "WiderRegions"      => $widerRegionsNames
             ],
         ], JSON_PRETTY_PRINT );
         $responseHash = md5( $response );

From a9e176092f44da4fe0fe505097bd69ddc5ea614a Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 7 Feb 2022 14:15:04 +0100
Subject: [PATCH 028/152] add more methods to FestivityCollection

notInFeasts etc.
---
 includes/FestivityCollection.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/includes/FestivityCollection.php b/includes/FestivityCollection.php
index 4302c351..6e73acf4 100644
--- a/includes/FestivityCollection.php
+++ b/includes/FestivityCollection.php
@@ -110,22 +110,42 @@ public function inSolemnities( DateTime $date ) : bool {
         return in_array( $date, $this->solemnities );
     }
 
+    public function notInSolemnities( DateTime $date ) : bool {
+        return !$this->inSolemnities( $date );
+    }
+
     public function inFeasts( DateTime $date ) : bool {
         return in_array( $date, $this->feasts );
     }
 
+    public function notInFeasts( DateTime $date ) : bool {
+        return !$this->inFeasts( $date );
+    }
+
     public function inSolemnitiesOrFeasts( DateTime $date ) : bool {
         return $this->inSolemnities( $date ) || $this->inFeasts( $date );
     }
 
+    public function notInSolemnitiesOrFeasts( DateTime $date ) : bool {
+        return !$this->inSolemnitiesOrFeasts( $date );
+    }
+
     public function inMemorials( DateTime $date ) : bool {
         return in_array( $date, $this->memorials );
     }
 
+    public function notInMemorials( DateTime $date ) : bool {
+        return !$this->inMemorials( $date );
+    }
+
     public function inFeastsOrMemorials( DateTime $date ) : bool {
         return $this->inFeasts( $date ) || $this->inMemorials( $date );
     }
 
+    public function notInFeastsOrMemorials( DateTime $date ) : bool {
+        return !$this->inFeastsOrMemorials( $date );
+    }
+
     public function inSolemnitiesFeastsOrMemorials( DateTime $date ) : bool {
         return $this->inSolemnities( $date ) || $this->inFeastsOrMemorials( $date );
     }

From c9986a6ccfb7ae64f398549e7166a6797517dd99 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 13:15:51 +0000
Subject: [PATCH 029/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index d4475f78..3a24c909 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -427,7 +427,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -436,7 +436,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -445,7 +445,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From 226046bd57c01bee20239fcb547eb6ac4493c0e7 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 7 Feb 2022 14:15:56 +0100
Subject: [PATCH 030/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/es/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/fr/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/it/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/la/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/pt/LC_MESSAGES/litcal.po | 12 ++++++------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 2b22255e..d419f226 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -427,7 +427,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -436,7 +436,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -445,7 +445,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index e335842a..e6ea879a 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -58,7 +58,7 @@ msgstr "Sábado anterior al Domingo de Ramos"
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
@@ -424,7 +424,7 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -432,7 +432,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -441,7 +441,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -450,7 +450,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 1de86c8e..492c96e0 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -427,7 +427,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -436,7 +436,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -445,7 +445,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index f197ca78..26663609 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -59,7 +59,7 @@ msgstr "sabato che precede la Domenica delle Palme"
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
@@ -471,7 +471,7 @@ msgstr "ANNO"
 msgid "Vigil Mass"
 msgstr "Messa della vigilia"
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -482,7 +482,7 @@ msgstr ""
 "Secondo il %s, la prima ha la precedenza, pertanto la Messa nella Vigilia è "
 "confermata come anche i Primi Vespri."
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -495,7 +495,7 @@ msgstr ""
 "Messa di Vigilia, mentre l'ultima Solennità non avrà né i Secondi Vespri né "
 "una Messa serale."
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -508,7 +508,7 @@ msgstr ""
 "e una Messa serale, mentre la prima Solennità non avrà né una Messa di "
 "Vigilia né i Primi Vespri."
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 3df7584f..0aad04a2 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -58,7 +58,7 @@ msgstr "sabbatum ante Dominicam in Palmis"
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
@@ -505,7 +505,7 @@ msgstr "ANNUM"
 msgid "Vigil Mass"
 msgstr "Missa in Vigilia"
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -513,7 +513,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -522,7 +522,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -534,7 +534,7 @@ msgstr ""
 "praecedentia habet, ergo servabit Secundis Vesperis atque Missa vesperum, "
 "cum Sollemnitas prima neque Missa in Vigilia neque Primis Vesperis servabit."
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index b2785a29..1cbc1e2b 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 22:59+0000\n"
+"POT-Creation-Date: 2022-02-07 13:15+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
 #: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
 #: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
-#: includes/FestivityCollection.php:337
+#: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr ""
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:331
+#: includes/FestivityCollection.php:351
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -427,7 +427,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:345
+#: includes/FestivityCollection.php:365
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -436,7 +436,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:355
+#: includes/FestivityCollection.php:375
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -445,7 +445,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:415
+#: includes/FestivityCollection.php:435
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From 0f939ba6dcca1866b13721bafc5f519c47d8ed16 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 7 Feb 2022 14:16:10 +0100
Subject: [PATCH 031/152] add getYearLimits method to RomanMissal

---
 includes/enums/RomanMissal.php | 64 +++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/includes/enums/RomanMissal.php b/includes/enums/RomanMissal.php
index 808d91a0..24c8e350 100644
--- a/includes/enums/RomanMissal.php
+++ b/includes/enums/RomanMissal.php
@@ -24,36 +24,47 @@ class RomanMissal {
     ];
 
     public static array $names = [
-        "VATICAN_1970"  => "Editio Typica 1970",
-        "VATICAN_1971"  => "Reimpressio Emendata 1971",
-        "VATICAN_1975"  => "Editio Typica Secunda 1975",
-        "VATICAN_2002"  => "Editio Typica Tertia 2002",
-        "VATICAN_2008"  => "Editio Typica Tertia Emendata 2008",
-        "USA_2011"      => "2011 Roman Missal issued by the USCCB",
-        "ITALY_1983"    => "Messale Romano ed. 1983",
-        "ITALY_2020"    => "Messale Romano ed. 2020"
+        self::EDITIO_TYPICA_1970                    => "Editio Typica 1970",
+        self::REIMPRESSIO_EMENDATA_1971             => "Reimpressio Emendata 1971",
+        self::EDITIO_TYPICA_SECUNDA_1975            => "Editio Typica Secunda 1975",
+        self::EDITIO_TYPICA_TERTIA_2002             => "Editio Typica Tertia 2002",
+        self::EDITIO_TYPICA_TERTIA_EMENDATA_2008    => "Editio Typica Tertia Emendata 2008",
+        self::USA_EDITION_2011                      => "2011 Roman Missal issued by the USCCB",
+        self::ITALY_EDITION_1983                    => "Messale Romano ed. 1983 pubblicata dalla CEI",
+        self::ITALY_EDITION_2020                    => "Messale Romano ed. 2020 pubblicata dalla CEI"
     ];
 
     public static array $jsonFiles = [
-        "VATICAN_1970"  => "data/propriumdesanctis_1970/propriumdesanctis_1970.json",
-        "VATICAN_1971"  => false,
-        "VATICAN_1975"  => false,
-        "VATICAN_2002"  => "data/propriumdesanctis_2002/propriumdesanctis_2002.json",
-        "VATICAN_2008"  => "data/propriumdesanctis_2008/propriumdesanctis_2008.json",
-        "USA_2011"      => "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json",
-        "ITALY_1983"    => "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json",
-        "ITALY_2020"    => false
+        self::EDITIO_TYPICA_1970                    => "data/propriumdesanctis_1970/propriumdesanctis_1970.json",
+        self::REIMPRESSIO_EMENDATA_1971             => false,
+        self::EDITIO_TYPICA_SECUNDA_1975            => false,
+        self::EDITIO_TYPICA_TERTIA_2002             => "data/propriumdesanctis_2002/propriumdesanctis_2002.json",
+        self::EDITIO_TYPICA_TERTIA_EMENDATA_2008    => "data/propriumdesanctis_2008/propriumdesanctis_2008.json",
+        self::USA_EDITION_2011                      => "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json",
+        self::ITALY_EDITION_1983                    => "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json",
+        self::ITALY_EDITION_2020                    => false
     ];
 
     public static array $i18nPath = [
-        "VATICAN_1970"  => "data/propriumdesanctis_1970/i18n/",
-        "VATICAN_1971"  => false,
-        "VATICAN_1975"  => false,
-        "VATICAN_2002"  => "data/propriumdesanctis_2002/i18n/",
-        "VATICAN_2008"  => "data/propriumdesanctis_2008/i18n/",
-        "USA_2011"      => false,
-        "ITALY_1983"    => false,
-        "ITALY_2020"    => false
+        self::EDITIO_TYPICA_1970                    => "data/propriumdesanctis_1970/i18n/",
+        self::REIMPRESSIO_EMENDATA_1971             => false,
+        self::EDITIO_TYPICA_SECUNDA_1975            => false,
+        self::EDITIO_TYPICA_TERTIA_2002             => "data/propriumdesanctis_2002/i18n/",
+        self::EDITIO_TYPICA_TERTIA_EMENDATA_2008    => "data/propriumdesanctis_2008/i18n/",
+        self::USA_EDITION_2011                      => false,
+        self::ITALY_EDITION_1983                    => false,
+        self::ITALY_EDITION_2020                    => false
+    ];
+
+    public static array $yearLimits = [
+        self::EDITIO_TYPICA_1970                    => [ "sinceYear" => 1970 ],
+        self::REIMPRESSIO_EMENDATA_1971             => [ "sinceYear" => 1971 ],
+        self::EDITIO_TYPICA_SECUNDA_1975            => [ "sinceYear" => 1975 ],
+        self::EDITIO_TYPICA_TERTIA_2002             => [ "sinceYear" => 2002 ],
+        self::EDITIO_TYPICA_TERTIA_EMENDATA_2008    => [ "sinceYear" => 2008 ],
+        self::USA_EDITION_2011                      => [ "sinceYear" => 2011 ],
+        self::ITALY_EDITION_1983                    => [ "sinceYear" => 1983, "untilYear" => 2002 ],
+        self::ITALY_EDITION_2020                    => [ "sinceYear" => 2020 ]
     ];
 
 
@@ -76,4 +87,9 @@ public static function getSanctoraleFileName( $value ) : string|false {
     public static function getSanctoraleI18nFilePath( $value ) : string|false {
         return self::$i18nPath[ $value ];
     }
+
+    public static function getYearLimits( $value ) : object {
+        return (object) self::$yearLimits[ $value ];
+    }
+
 }

From 4e298779201e49ab820453be2e8c3f1083082935 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 7 Feb 2022 14:17:27 +0100
Subject: [PATCH 032/152] load and handle national calendar from JSON files

---
 includes/LitCalAPI.php   | 410 +++++++++++++++++++++++++++++----------
 nations/Europe.json      |  24 +--
 nations/ITALY/ITALY.json |  53 +++++
 3 files changed, 368 insertions(+), 119 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 0cbc021e..e788ccd8 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -254,7 +254,17 @@ private function loadPropriumDeSanctisData( string $missal ) : void {
                 if( json_last_error() !== JSON_ERROR_NONE ) {
                     die( '{"ERROR": "There was an error trying to retrieve and decode JSON i18n data for the Proprium de Sanctis for the Missal ' . RomanMissal::getName( $missal ) . ': ' . json_last_error_msg() . '"}' );
                 }
+            } else {
+                $this->Messages[] = sprintf(
+                    _( 'Data for the sanctorale from %s could not be found.' ),
+                    RomanMissal::getName( $missal )
+                );
             }
+        } else {
+            $this->Messages[] = sprintf(
+                _( 'Translation data for the sanctorale from %s could not be found.' ),
+                RomanMissal::getName( $missal )
+            );
         }
 
         if( file_exists( $propriumdesanctisFile ) ) {
@@ -1585,50 +1595,314 @@ private function calculateSaturdayMemorialBVM() : void {
     private function loadNationalCalendarData() : void {
         $nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
         if( file_exists( $nationalDataFile ) ) {
-            $this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
-            if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
-                $widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
-                $widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
-                if( file_exists( $widerRegionI18nFile ) ) {
-                    $widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
-                    if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
-                        $this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
-                        if( json_last_error() === JSON_ERROR_NONE ) {
-                            foreach( $this->WiderRegionData as $idx => $value ) {
-                                $tag = $value["Festivity"]["tag"];
-                                $this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
+            $this->NationalData = json_decode( file_get_contents( $nationalDataFile ) );
+            if( json_last_error() === JSON_ERROR_NONE ) {
+                if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData->Metadata, "WiderRegion" ) ){
+                    $widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
+                    $widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
+                    if( file_exists( $widerRegionI18nFile ) ) {
+                        $widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
+                        if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
+                            $this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ) );
+                            if( json_last_error() === JSON_ERROR_NONE && property_exists( $this->WiderRegionData, "LitCal" ) ) {
+                                foreach( $this->WiderRegionData->LitCal as $idx => $value ) {
+                                    $tag = $value->Festivity->tag;
+                                    $this->WiderRegionData->LitCal[$idx]->Festivity->name = $widerRegionI18nData->{ $tag };
+                                }
+                            } else {
+                                $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
                             }
                         } else {
-                            $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
+                            $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
                         }
-                    } else {
-                        $this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
                     }
+                } else {
+                    $this->Messages[] = "Could not find a WiderRegion property in the Metadata for the National Calendar {$this->LitSettings->NationalCalendar}";
                 }
+            } else {
+                $this->Messages[] = sprintf( _( "Error retrieving and decoding National data from file %s." ), $nationalDataFile ) . ": " . json_last_error_msg();
             }
         }
     }
 
-    private function applyNationalCalendar() : void {
-        //first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
-        if( $this->WiderRegionData !== null ) {
+    private function handleMissingFestivity( object $row ) : void {
+        $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
+        if( $this->Cal->inSolemnitiesFeastsOrMemorials( $currentFeastDate ) || self::DateIsSunday( $currentFeastDate ) ) {
+            $coincidingFestivity = new stdClass();
+            if ( self::DateIsSunday( $currentFeastDate ) && $coincidingFestivity->event->grade < LitGrade::SOLEMNITY ){
+                //it's a Sunday
+                $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
+                $coincidingFestivity->grade = $this->LitSettings->Locale === LitLocale::LATIN ? 'Die Domini' : ucfirst( $this->dayOfTheWeek->format( $currentFeastDate->format( 'U' ) ) );
+            } else if ( $this->Cal->inSolemnities( $currentFeastDate ) ) {
+                $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
+                //it's a Feast of the Lord or a Solemnity
+                $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
+            } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
+                $coincidingFestivity->event = $this->Cal->feastOrMemorialFromDate( $currentFeastDate );
+                //we should probably be able to create it anyways in this case?
+                $this->Cal->addFestivity( $row->Festivity->tag, new Festivity( $row->Festivity->name, $currentFeastDate, $row->Festivity->color, LitFeastType::FIXED, $row->Festivity->grade, LitCommon::PROPRIO ) );
+                $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
+            }
+            $this->Messages[] =  '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                /**translators:
+                 * 1. Grade of the festivity
+                 * 2. Name of the festivity
+                 * 3. Date on which the festivity is usually celebrated
+                 * 4. Grade of the superseding festivity
+                 * 5. Name of the superseding festivity
+                 * 6. Current year
+                 */
+                _( 'The %1$s \'%2$s\', usually celebrated on %3$s, is suppressed by the %4$s \'%5$s\' in the year %6$d.' ),
+                $this->LitGrade->i18n( $row->Festivity->grade, false ),
+                $row->Festivity->name,
+                $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
+                $coincidingFestivity->grade,
+                $coincidingFestivity->event->name,
+                $this->LitSettings->Year
+            );
+        }
+    }
+
+    private function festivityCanBeCreated( object $row ) : bool {
+        switch( $row->Festivity->grade ) {
+            case LitGrade::MEMORIAL_OPT:
+                return $this->Cal->notInSolemnitiesFeastsOrMemorials( $row->Festivity->DATE );
+            case LitGrade::MEMORIAL:
+                return $this->Cal->notInSolemnitiesOrFeasts( $row->Festivity->DATE );
+                //however we still have to handle possible coincidences with another memorial
+            case LitGrade::FEAST:
+                return $this->Cal->notInSolemnities( $row->Festivity->DATE );
+                //however we still have to handle possible coincidences with another feast
+            case LitGrade::SOLEMNITY:
+                return true;
+                //however we still have to handle possible coincidences with another solemnity
+        }
+        return false;
+    }
+
+    private function festivityDoesNotCoincide( object $row ) : bool {
+        switch( $row->Festivity->grade ) {
+            case LitGrade::MEMORIAL_OPT:
+                return true;
+                //optional memorials never have problems as regards coincidence with another optional memorial
+            case LitGrade::MEMORIAL:
+                return $this->Cal->notInMemorials( $row->Festivity->DATE );
+            case LitGrade::FEAST:
+                return $this->Cal->notInFeasts( $row->Festivity->DATE );
+            case LitGrade::SOLEMNITY:
+                return $this->Cal->notInSolemnities( $row->Festivity->DATE );
+        }
+        //functions should generally have a default return value
+        //however, it would make no sense to give a default return value here
+        //we really need to cover all cases and give a sure return value
+    }
+
+    private function handleFestivityCreationWithCoincidence( object $row ) : void {
+        switch( $row->Festivity->grade ) {
+            case LitGrade::MEMORIAL:
+                //both memorials become optional memorials
+                $coincidingFestivities = $this->Cal->getCalEventsFromDate( $row->Festivity->DATE );
+                $coincidingMemorials = array_filter( $coincidingFestivities, function( $el ) { return $el->grade === LitGrade::MEMORIAL; } );
+                $coincidingMemorialName = '';
+                foreach( $coincidingMemorials as $key => $value ) {
+                    $this->Cal->setProperty( $key, "grade", LitGrade::MEMORIAL_OPT );
+                    $coincidingMemorialName = $value->name;
+                }
+                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, $row->Festivity->common );
+                $this->Cal->addFestivity( $row->Festivity->tag, $festivity );
+                $this->Messages[] = sprintf(
+                    /**translators:
+                     * 1. Name of the first coinciding Memorial
+                     * 2. Name of the second coinciding Memorial
+                     * 3. Current year
+                     * 4. Source of the information
+                     */
+                    _( 'The Memorial \'%1$s\' coincides with another Memorial \'%2$s\' in the year %3$d. They are both reduced in rank to optional memorials.' ),
+                    $row->Festivity->name,
+                    $coincidingMemorialName,
+                    $this->LitSettings->Year
+                );
+                break;
+            case LitGrade::FEAST:
+                //there seems to be a coincidence with a different Feast on the same day!
+                //what should we do about this? perhaps move one of them?
+                $coincidingFestivities = $this->Cal->getCalEventsFromDate( $row->Festivity->DATE );
+                $coincidingFeasts = array_filter( $coincidingFestivities, function( $el ) { return $el->grade === LitGrade::FEAST; } );
+                $coincidingFeastName = '';
+                foreach( $coincidingFeasts as $key => $value ) {
+                    //$this->Cal->setProperty( $key, "grade", LitGrade::MEMORIAL_OPT );
+                    $coincidingFeastName = $value->name;
+                }
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                    $this->LitSettings->NationalCalendar . ": the Feast '%s', usually celebrated on %s, coincides with another Feast '%s' in the year %d! Does something need to be done about this?",
+                    '<b>' . $row->Festivity->name . '</b>',
+                    '<b>' . $this->dayAndMonth->format(  $row->Festivity->DATE->format( 'U' ) ) . '</b>',
+                    '<b>' . $coincidingFeastName . '</b>',
+                    $this->LitSettings->Year
+                );
+                break;
+            case LitGrade::SOLEMNITY:
+                //there seems to be a coincidence with a different Solemnity on the same day!
+                //should we attempt to move to the next open slot?
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+                    $this->LitSettings->NationalCalendar . ": the Solemnity '%s', usually celebrated on %s, coincides with the Sunday or Solemnity '%s' in the year %d! Does something need to be done about this?",
+                    '<i>' . $row->Festivity->name . '</i>',
+                    '<b>' . $this->dayAndMonth->format(  $row->Festivity->DATE->format( 'U' ) ) . '</b>',
+                    '<i>' . $this->Cal->solemnityFromDate(  $row->Festivity->DATE )->name . '</i>',
+                    $this->LitSettings->Year
+                );
+                break;
+        }
+    }
 
+    private function createNewRegionalFestivity( object $row ) : void {
+        $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        if( $this->festivityCanBeCreated( $row ) ) {
+            if( $this->festivityDoesNotCoincide( $row ) ) {
+                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, $row->Festivity->grade, $row->Festivity->common );
+                $this->Cal->addFestivity( $row->Festivity->tag, $festivity );
+            } else {
+                $this->handleFestivityCreationWithCoincidence( $row );
+            }
+            $this->Messages[] = sprintf(
+                /**translators:
+                 * 1. Grade or rank of the festivity
+                 * 2. Name of the festivity
+                 * 3. Day of the festivity
+                 * 4. Year from which the festivity has been added
+                 * 5. Source of the information
+                 * 6. Current year
+                 */
+                _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' ),
+                $this->LitGrade->i18n( $row->Festivity->grade, false ),
+                $row->Festivity->name,
+                $this->LitSettings->Locale === LitLocale::LATIN ? ( $row->Festivity->DATE->format( 'j' ) . ' ' . LitMessages::LATIN_MONTHS[ (int)$row->Festivity->DATE->format( 'n' ) ] ) :
+                    ( $this->LitSettings->Locale === LitLocale::ENGLISH ? $row->Festivity->DATE->format( 'F jS' ) :
+                        $this->dayAndMonth->format( $row->Festivity->DATE->format( 'U' ) )
+                    ),
+                $row->Metadata->sinceYear,
+                $this->elaborateDecreeSource( $row ),
+                $this->LitSettings->Year
+            );
+        } else {
+            //$this->handleCoincidenceDecree( $row );
         }
     }
 
-    private function applyCalendarItaly() : void {
-        $this->applyPatronSaintsEurope();
-        $this->applyPatronSaintsItaly();
-        if( $this->LitSettings->Year >= 1983 && $this->LitSettings->Year < 2002 ) {
-            $this->loadPropriumDeSanctisData( RomanMissal::ITALY_EDITION_1983 );
-            //The extra liturgical events found in the 1983 edition of the Roman Missal in Italian,
-            //were then incorporated into the Latin edition in 2002 ( effectively being incorporated into the General Roman Calendar )
-            //so when dealing with Italy, we only need to add them from 1983 until 2002, after which it's taken care of by the General Calendar
-            $this->applyMessaleRomano1983();
+    private function applyNationalCalendar() : void {
+        //first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
+        if( $this->WiderRegionData !== null && property_exists( $this->WiderRegionData, "LitCal" ) ) {
+            foreach( $this->WiderRegionData->LitCal as $row ) {
+                if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
+                    if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
+                        continue;
+                    } else {
+                        //if either the property doesn't exist (so no limit is set)
+                        //or there is a limit but we are within those limits
+                        switch( $row->Metadata->action ) {
+                            case "makePatron":
+                                $festivity = $this->Cal->getFestivity( $row->Festivity->tag );
+                                if( $festivity !== null ) {
+                                    if( $festivity->grade !== $row->Festivity->grade ) {
+                                        $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
+                                    }
+                                    $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
+                                } else {
+                                    $this->handleMissingFestivity( $row );
+                                }
+                                break;
+                            case "createNew":
+                                $this->createNewRegionalFestivity( $row );
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if( $this->NationalData !== null && property_exists( $this->NationalData, "LitCal" ) ) {
+            foreach( $this->NationalData->LitCal as $row ) {
+                if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
+                    if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
+                        continue;
+                    } else {
+                        switch( $row->Metadata->action ) {
+                            case "makePatron":
+                                $festivity = $this->Cal->getFestivity( $row->Festivity->tag );
+                                if( $festivity !== null ) {
+                                    if( $festivity->grade !== $row->Festivity->grade ) {
+                                        $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
+                                    }
+                                    $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
+                                } else {
+                                    $this->handleMissingFestivity( $row );
+                                }
+                                break;
+                            case "createNew":
+                                $this->createNewRegionalFestivity( $row );
+                                break;
+                        }
+                    }
+                }
+            }
         }
 
-        //The Sanctorale in the 2020 edition Messale Romano is based on the Latin 2008 Edition,
-        // there isn't really anything different from preceding editions or from the 2008 edition
+        if( $this->NationalData !== null && property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData->Metadata, "Missals" ) ) {
+            $this->Messages[] = "Found Missals for region " . $this->NationalData->Metadata->Region. ": " . implode(', ', $this->NationalData->Metadata->Missals);
+            foreach( $this->NationalData->Metadata->Missals as $missal ) {
+                $yearLimits = RomanMissal::getYearLimits( $missal );
+                if( $this->LitSettings->Year >= $yearLimits->sinceYear ) {
+                    if( property_exists( $yearLimits, "untilYear" ) && $this->LitSettings->Year >= $yearLimits->untilYear ) {
+                        continue;
+                    } else {
+                        if( RomanMissal::getSanctoraleFileName( $missal ) !== false ) {
+                            $this->Messages[] = sprintf(
+                                _( 'Found a sanctorale data file for %s' ),
+                                RomanMissal::getName( $missal )
+                            );
+                            $this->loadPropriumDeSanctisData( $missal );
+                            foreach ( $this->tempCal[ $missal ] as $row ) {
+                                $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                                if( !$this->Cal->inSolemnitiesOrFeasts( $currentFeastDate ) ) {
+                                    $festivity = new Festivity( "[ {$this->NationalData->Metadata->Region} ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
+                                    $this->Cal->addFestivity( $row->TAG, $festivity );
+                                }
+                                else{
+                                    $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
+                                    $this->Messages[] = sprintf(
+                                        /**translators:
+                                         * 1. Festivity grade
+                                         * 2. Festivity name
+                                         * 3. Festivity date
+                                         * 4. Edition of the Roman Missal
+                                         * 5. Superseding festivity grade
+                                         * 6. Superseding festivity name
+                                         * 7. Current year
+                                         */
+                                        $this->NationalData->Metadata->Region . ": " . _( 'The %1$s \'%2$s\' (%3$s), added to the national calendar in the %4$s, is superseded by the %5$s \'%6$s\' in the year %7$d' ),
+                                        $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
+                                        '<i>' . $row->NAME . '</i>',
+                                        $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
+                                        RomanMissal::getName( $missal ),
+                                        $coincidingFestivity->grade,
+                                        $coincidingFestivity->event->name,
+                                        $this->LitSettings->Year
+                                    );
+                                }
+                            }
+                        } else {
+                            $this->Messages[] = sprintf(
+                                _( 'Could not find a sanctorale data file for %s' ),
+                                RomanMissal::getName( $missal )
+                            );
+                        }
+                    }
+                }
+            }
+        } else {
+            $this->Messages[] = "Did not find any Missals for region " . $this->NationalData->Metadata->Region;
+        }
     }
 
     private function makePatron( string $tag, string $nameSuffix, int $day, int $month, string $color, string $EditionRomanMissal = RomanMissal::EDITIO_TYPICA_1970 ) {
@@ -1680,83 +1954,6 @@ private function makePatron( string $tag, string $nameSuffix, int $day, int $mon
         }
     }
 
-
-    //Insert or elevate the Patron Saints of Europe
-    private function applyPatronSaintsEurope() : void {
-
-        //Saint Benedict, Saint Bridget, and Saint Cyril and Methodius elevated to Feast, with title "patrono/i d'Europa" added
-        //then from 1999, Saint Catherine of Siena and Saint Edith Stein, elevated to Feast with title "compatrona d'Europa" added
-        $this->makePatron( "StBenedict",        pgettext("Male singular", "patron of Europe"),   11, 7, LitColor::WHITE );
-        $this->makePatron( "StBridget",         pgettext("Female singular", "patron of Europe"), 23, 7, LitColor::WHITE );
-        $this->makePatron( "StsCyrilMethodius", pgettext("Male plural", "patrons of Europe"),    14, 2, LitColor::WHITE );
-
-        //In 1999, Pope John Paul II elevated Catherine of Siena from patron of Italy to patron of Europe
-        if( $this->LitSettings->Year >= 1999 ) {
-            if( $this->LitSettings->NationalCalendar === "ITALY" ) {
-                $name = "patrona d'Italia e d'Europa";
-            } else {
-                $name = pgettext("Female singular", "patron of Europe");
-            }
-            $this->makePatron( "StCatherineSiena", $name, 29, 4, LitColor::WHITE );
-            if( $this->LitSettings->Year >= 2002 ) {
-                $this->makePatron( "StEdithStein", pgettext("Female singular", "patron of Europe"), 9, 8, LitColor::WHITE, RomanMissal::EDITIO_TYPICA_TERTIA_2002 );
-            } else {
-                //between 1999 and 2002 we have to manually create StEdithStein
-                //since the makePatron method expects to find data from the Missals,
-                //we are going to have to fake this one as belonging to a Missal...
-                //let's add it to the future Missal that doesn't exist yet
-                $EdithStein = new stdClass();
-                $EdithStein->NAME       = _("Saint Teresa Benedicta of the Cross, Virgin and Martyr");
-                $EdithStein->MONTH      = 8;
-                $EdithStein->DAY        = 9;
-                $EdithStein->TAG        = "StEdithStein";
-                $EdithStein->GRADE      = LitGrade::MEMORIAL_OPT;
-                $EdithStein->COMMON     = LitCommon::AB( [LitCommon::PRO_VIRGINE_MARTYRE,LitCommon::PRO_UNA_VIRGINE] );
-                $EdithStein->CALENDAR   = "GENERAL ROMAN";
-                $EdithStein->COLOR  = "white,red";
-                $this->tempCal[ RomanMissal::EDITIO_TYPICA_TERTIA_2002 ][ "StEdithStein" ] = $EdithStein;
-                $EdithStein->DATE = DateTime::createFromFormat( '!j-n-Y', $EdithStein->DAY . '-' . $EdithStein->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-                if( !$this->Cal->inSolemnitiesFeastsOrMemorials( $EdithStein->DATE ) ) {
-                    $this->Cal->addFestivity( $EdithStein->TAG, new Festivity( $EdithStein->NAME, $EdithStein->DATE, $EdithStein->COLOR, LitFeastType::FIXED, $EdithStein->GRADE, $EdithStein->COMMON ) );
-                    $this->makePatron( "StEdithStein", pgettext("Female singular", "patron of Europe"), $EdithStein->DAY, $EdithStein->MONTH, $EdithStein->COLOR, RomanMissal::EDITIO_TYPICA_TERTIA_2002 );
-                }
-            }
-        }
-    }
-
-    //Insert or elevate the Patron Saints of Italy
-    private function applyPatronSaintsItaly() : void {
-        if ( $this->LitSettings->Year < 1999 ) {
-            //We only have to deal with years before 1999, because from 1999
-            //it will be taken care of by Patron saints of Europe
-            $this->makePatron( "StCatherineSiena", "patrona d'Italia", 29, 4, LitColor::WHITE );
-        }
-        $this->makePatron( "StFrancisAssisi", "patrono d'Italia", 4, 10, LitColor::WHITE );
-    }
-
-    private function applyMessaleRomano1983() : void {
-        //we have no solemnities or feasts in this data, at the most memorials
-        foreach ( $this->tempCal[ RomanMissal::ITALY_EDITION_1983 ] as $row ) {
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-            if( !$this->Cal->inSolemnitiesOrFeasts( $currentFeastDate ) ) {
-                $festivity = new Festivity( "[ ITALIA ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
-                $this->Cal->addFestivity( $row->TAG, $festivity );
-            }
-            else{
-                $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
-                $this->Messages[] = sprintf(
-                    "ITALIA: la %s '%s' (%s), aggiunta al calendario nell'edizione del Messale Romano del 1983 pubblicata dalla CEI, è soppressa dalla %s '%s' nell'anno %d",
-                    $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
-                    '<i>' . $row->NAME . '</i>',
-                    $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
-                    $coincidingFestivity->grade,
-                    $coincidingFestivity->event->name,
-                    $this->LitSettings->Year
-                );
-            }
-        }
-    }
-
     private function applyCalendarUSA() : void {
 
         //The Solemnity of the Immaculate Conception is the Patronal FeastDay of the United States of America
@@ -2288,7 +2485,6 @@ public function Init(){
                     case 'ITALY':
                         $this->loadNationalCalendarData();
                         $this->applyNationalCalendar();
-                        //$this->applyCalendarItaly();
                         break;
                     case 'USA':
                         //I don't have any data before 2011
diff --git a/nations/Europe.json b/nations/Europe.json
index 14098228..056afa0f 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -6,11 +6,11 @@
                 "color": "white",
                 "grade": 4,
                 "day": 11,
-                "month": 7,
-                "sinceYear": 1964
+                "month": 7
             },
             "Metadata": {
                 "action": "makePatron",
+                "sinceYear": 1964,
                 "decreeURL": "https://www.vatican.va/content/paul-vi/%s/apost_letters/documents/hf_p-vi_apl_19641024_pacis-nuntius.html",
                 "decreeLangs": {
                     "IT": "it",
@@ -25,11 +25,11 @@
                 "color": "white",
                 "grade": 4,
                 "day": 14,
-                "month": 2,
-                "sinceYear": 1980
+                "month": 2
             },
             "Metadata": {
                 "action": "makePatron",
+                "sinceYear": 1980,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/apost_letters/1980/documents/hf_jp-ii_apl_31121980_egregiae-virtutis.html",
                 "decreeLangs": {
                     "ES": "es",
@@ -45,11 +45,11 @@
                 "color": "white",
                 "grade": 4,
                 "day": 23,
-                "month": 7,
-                "sinceYear": 1999
+                "month": 7
             },
             "Metadata": {
                 "action": "makePatron",
+                "sinceYear": 1999,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
                 "decreeLangs": {
                     "DE": "de",
@@ -68,11 +68,11 @@
                 "color": "white",
                 "grade": 4,
                 "day": 29,
-                "month": 4,
-                "sinceYear": 1999
+                "month": 4
             },
             "Metadata": {
                 "action": "makePatron",
+                "sinceYear": 1999,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
                 "decreeLangs": {
                     "DE": "de",
@@ -92,7 +92,6 @@
                 "grade": 4,
                 "day": 9,
                 "month": 8,
-                "sinceYear": 1999,
                 "common": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
                 "readings": {
                     "FIRST_READING": "",
@@ -103,7 +102,8 @@
                 }
             },
             "Metadata": {
-                "action": "create",
+                "action": "createNew",
+                "sinceYear": 1999,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
                 "decreeLangs": {
                     "DE": "de",
@@ -122,11 +122,11 @@
                 "color": "white",
                 "grade": 4,
                 "day": 9,
-                "month": 8,
-                "sinceYear": 2002
+                "month": 8
             },
             "Metadata": {
                 "action": "makePatron",
+                "sinceYear": 2002,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
                 "decreeLangs": {
                     "DE": "de",
diff --git a/nations/ITALY/ITALY.json b/nations/ITALY/ITALY.json
index e69de29b..12e00f16 100644
--- a/nations/ITALY/ITALY.json
+++ b/nations/ITALY/ITALY.json
@@ -0,0 +1,53 @@
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "StCatherineSiena",
+                "name": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia",
+                "color": "white",
+                "grade": 4,
+                "day": 29,
+                "month": 4
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1939,
+                "untilYear": 1999,
+                "decreeURL": "https://www.vatican.va/content/pius-xii/it/briefs/documents/hf_p-xii_brief_19390618_patroni-italia.html"
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StFrancisAssisi",
+                "name": "San Francesco d'Assisi, patrono d'Italia",
+                "color": "white",
+                "grade": 4,
+                "day": 29,
+                "month": 4
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1939,
+                "decreeURL": "https://www.vatican.va/content/pius-xii/it/briefs/documents/hf_p-xii_brief_19390618_patroni-italia.html"
+            }
+        }
+    ],
+    "Settings": {
+        "Epiphany": "JAN6",
+        "Ascension": "SUNDAY",
+        "CorpusChristi": "SUNDAY",
+        "Locale": "IT"
+    },
+    "Metadata": {
+        "Region": "ITALIA",
+        "WiderRegion": {
+            "name": "Europe",
+            "jsonFile": "nations\/Europe.json",
+            "i18nFile": "nations\/EUROPE\/it.json"
+        },
+        "Missals": [
+            "ITALY_1983",
+            "ITALY_2020"
+        ]
+    }
+}

From ccff7302a5db05eb69a441dd373f77573fd88e57 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 13:18:00 +0000
Subject: [PATCH 033/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 164 ++++++++++++++++++++++++++++++------------------
 1 file changed, 103 insertions(+), 61 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 3a24c909..d392254e 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,89 +24,99 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +136,23 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,25 +368,30 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -377,31 +400,50 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, php-format
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, php-format
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."

From 8805753c725964514960ff5d4dd603a4e5b0c866 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 7 Feb 2022 14:18:05 +0100
Subject: [PATCH 034/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 164 +++++++++++++++++-----------
 i18n/es/LC_MESSAGES/litcal.po | 164 +++++++++++++++++-----------
 i18n/fr/LC_MESSAGES/litcal.po | 164 +++++++++++++++++-----------
 i18n/it/LC_MESSAGES/litcal.po | 197 +++++++++++++++++++++++-----------
 i18n/la/LC_MESSAGES/litcal.po | 197 +++++++++++++++++++++++-----------
 i18n/pt/LC_MESSAGES/litcal.po | 164 +++++++++++++++++-----------
 6 files changed, 676 insertions(+), 374 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index d419f226..e5137a72 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -24,89 +24,99 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +136,23 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,25 +368,30 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -377,31 +400,50 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, php-format
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, php-format
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index e6ea879a..0e382af5 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -27,18 +27,28 @@ msgid ""
 msgstr ""
 "Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s día antes de la Epifanía"
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s día después de la Epifanía"
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -47,71 +57,71 @@ msgstr ""
 "La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
 "celebración ha sido trasladada a %s (%s) según el %s."
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr "Sábado anterior al Domingo de Ramos"
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -131,15 +141,23 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -150,7 +168,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -165,12 +183,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -185,7 +203,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -203,7 +221,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -216,14 +234,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -235,7 +253,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -250,7 +268,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -265,7 +283,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -278,14 +296,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -299,7 +317,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -316,21 +334,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -338,7 +356,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -346,7 +364,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -355,25 +373,30 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -382,31 +405,50 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, php-format
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, php-format
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 492c96e0..e351f6e9 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -24,89 +24,99 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +136,23 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,25 +368,30 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -377,31 +400,50 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, php-format
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, php-format
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 26663609..730a43ab 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -28,18 +28,28 @@ msgstr ""
 "Sono supportati anni dal 1970 in poi soltanto. Tu invece hai provato a "
 "richiedere l'anno %d."
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s giorno prima dell'Epifania"
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s giorno dopo l'Epifania"
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -48,30 +58,30 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
 "celebrazione è stata trasferita al %s (%s) in accordo con il %s."
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabato che precede la Domenica delle Palme"
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "lunedì che segue la Seconda Domenica di Pasqua"
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr "lunedì seguente"
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -80,7 +90,7 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -89,7 +99,7 @@ msgstr ""
 "Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
 "nell'anno %d, la prima è stata anticipata di un giorno come da %s."
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -98,27 +108,27 @@ msgstr ""
 "'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
 "viene celebrata il %s anziché la Domenica dopo Natale."
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "della %s Settimana dell'Avvento"
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "%s Giorno dell'Ottava di Natale"
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "della %s Settimana di Quaresima"
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr "dopo il Mercoledì delle Ceneri"
 
@@ -138,8 +148,16 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -148,7 +166,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -161,7 +179,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -179,12 +197,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "La %1$s '%2$s' è soppiantata dalla %3$s '%4$s' nell'anno %5$d."
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr "Costituzione Apostolica Missale Romanum"
 
@@ -199,7 +217,7 @@ msgstr "Costituzione Apostolica Missale Romanum"
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -220,7 +238,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -235,7 +253,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -244,7 +262,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -256,7 +274,7 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -273,7 +291,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -290,7 +308,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -305,7 +323,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -314,7 +332,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -328,7 +346,7 @@ msgstr "e Dottore della Chiesa"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -347,7 +365,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -356,7 +374,7 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -365,7 +383,7 @@ msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -376,7 +394,7 @@ msgstr ""
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -387,7 +405,7 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -400,25 +418,30 @@ msgstr ""
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -427,7 +450,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -436,25 +459,54 @@ msgstr ""
 "La %1$s '%2$s', celebrata solitamente il giorno %3$s, è soppressa dalla %4$s "
 "'%5$s' nell'anno %6$d."
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
-msgstr "patrono d'Europa"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, fuzzy, php-format
+#| msgid ""
+#| "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year "
+#| "%3$d. They are both reduced in rank to optional memorials (%4$s)."
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
+msgstr ""
+"La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
+"e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
-msgstr "patrona d'Europa"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
+msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
-msgstr "patroni d'Europa"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, fuzzy, php-format
+#| msgid ""
+#| "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
+#| "superseded by the %6$s '%7$s' in the year %8$d."
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
+msgstr ""
+"La %1$s '%2$s', aggiunta nel giorno %3$s sin dal %4$d (%5$s), è tuttavia "
+"superata dalla %6$s '%7$s' nell'anno %8$d."
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
-msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
+msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
@@ -779,6 +831,21 @@ msgstr "SOLENNITÀ"
 msgid "celebration with precedence over solemnities"
 msgstr "celebrazione con precedenza sulle solennità"
 
+#~ msgctxt "Male singular"
+#~ msgid "patron of Europe"
+#~ msgstr "patrono d'Europa"
+
+#~ msgctxt "Female singular"
+#~ msgid "patron of Europe"
+#~ msgstr "patrona d'Europa"
+
+#~ msgctxt "Male plural"
+#~ msgid "patrons of Europe"
+#~ msgstr "patroni d'Europa"
+
+#~ msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#~ msgstr "Santa Teresa Benedetta della Croce (Edith Stein), vergine e martire"
+
 #~ msgid ""
 #~ "The Memorial '%s', added on %s since the year %d (%s), is however "
 #~ "superseded by a Solemnity or a Feast '%s' in the year %d."
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 0aad04a2..d411a0e2 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -27,18 +27,28 @@ msgid ""
 msgstr ""
 "Petere potes nisi ab annis MCMLXX et ultra. Tu anno %d conatus est petere."
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "Dies %s ante Epiphaniam"
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "Dies %s post Epiphaniam"
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -47,30 +57,30 @@ msgstr ""
 "Coincidet enim Sollemnitas <i>'%s'</i> cum <b>%s</b> in anno %d, ergo "
 "traslata est celebratio ad %s (%s) secundum %s."
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabbatum ante Dominicam in Palmis"
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "diem Lunæ post Dominicam Secundam Paschæ"
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr "diem Lunæ proximum"
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -79,7 +89,7 @@ msgstr ""
 "Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in anno %d. "
 "Oportet quaerere a Congregatione Cultu Divino quid facere!"
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -88,7 +98,7 @@ msgstr ""
 "Ex causa Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in "
 "anno %d, anticipata est ab uno die secundum %s."
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -97,27 +107,27 @@ msgstr ""
 "'%s' coincidet cum Dominica in anno %d, ergo Festum <i>'%s'</i> celebrentur "
 "die %s quam Dominica post Nativitate."
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "Hebdomadæ %s Adventus"
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "Dies %s Octavæ Nativitatis"
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "Hebdomadæ %s Quadragesimæ"
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr "post Feria IV Cinerum"
 
@@ -137,8 +147,16 @@ msgstr "post Feria IV Cinerum"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been added on %s since the year %d (%s), applicable to "
@@ -150,7 +168,7 @@ msgstr ""
 "%s <i>'%s'</i> aggregata est igitur in die <b>%s</b> ab anno %d (%s), ergo "
 "viget in anno %d."
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -161,7 +179,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -183,13 +201,13 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, fuzzy, php-format
 #| msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -204,7 +222,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added in the %s of the Roman Missal since the year %d (%s) "
@@ -227,7 +245,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -245,7 +263,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, fuzzy, php-format
 #| msgid ""
 #| "The Memorial '%s' coincides with another Memorial '%s' in the year %d. "
@@ -257,7 +275,7 @@ msgstr ""
 "Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
 "ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -269,7 +287,7 @@ msgstr "dies Lunae post Pentecostem"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -289,7 +307,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -309,7 +327,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -327,7 +345,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been raised to the rank of %s since the year %d, "
@@ -339,7 +357,7 @@ msgstr ""
 "%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
 "%d (%s)."
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -355,7 +373,7 @@ msgstr "Dedicationis ecclesiæ"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -377,7 +395,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s' has been suppressed by the Memorial '%s', added on %s since "
@@ -388,7 +406,7 @@ msgid ""
 msgstr ""
 "%s '%s' subplantata est ad Memoria '%s', aggregata in die %s ab anno %d (%s)."
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -397,7 +415,7 @@ msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -408,7 +426,7 @@ msgstr ""
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -419,7 +437,7 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -431,25 +449,30 @@ msgstr ""
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -458,7 +481,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
@@ -470,25 +493,54 @@ msgstr ""
 "%s '%s', celebrata plerumque in die %s, subplantata est ab %s '%s' in anno "
 "%d."
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
-msgstr "patronus Europae"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, fuzzy, php-format
+#| msgid ""
+#| "The Memorial '%s' coincides with another Memorial '%s' in the year %d. "
+#| "They are both reduced in rank to optional memorials (%s)."
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
+msgstr ""
+"Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
+"ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
-msgstr "patrona Europae"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
+msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
-msgstr "patroni Europae"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, fuzzy, php-format
+#| msgid ""
+#| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
+#| "a Sunday, a Solemnity or a Feast '%s' in the year %d."
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
+msgstr ""
+"%s <i>'%s'</i>, aggregata in die %s ab anno %d (%s), subplantata est ab "
+"Dominica, aut Sollemnitate, aut Festu <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
-msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
+msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
@@ -805,6 +857,21 @@ msgstr "SOLLEMNITAS"
 msgid "celebration with precedence over solemnities"
 msgstr "celebratio altioris ordinis quam sollemnitatis"
 
+#~ msgctxt "Male singular"
+#~ msgid "patron of Europe"
+#~ msgstr "patronus Europae"
+
+#~ msgctxt "Female singular"
+#~ msgid "patron of Europe"
+#~ msgstr "patrona Europae"
+
+#~ msgctxt "Male plural"
+#~ msgid "patrons of Europe"
+#~ msgstr "patroni Europae"
+
+#~ msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#~ msgstr "Sanctæ Teresiæ Benedictæ a Cruce, virginis et martyris"
+
 #~ msgid ""
 #~ "The Memorial '%s', added on %s since the year %d (%s), is however "
 #~ "superseded by a Solemnity or a Feast '%s' in the year %d."
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 1cbc1e2b..984efb11 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:15+0000\n"
+"POT-Creation-Date: 2022-02-07 13:17+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -24,89 +24,99 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:331 includes/LitCalAPI.php:370
+#: includes/LitCalAPI.php:259
+#, php-format
+msgid "Data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:265
+#, php-format
+msgid "Translation data for the sanctorale from %s could not be found."
+msgstr ""
+
+#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:383
+#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:535 includes/LitCalAPI.php:551
-#: includes/LitCalAPI.php:577
+#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
+#: includes/LitCalAPI.php:587
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:539
+#: includes/LitCalAPI.php:549
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:544 includes/LitCalAPI.php:560
-#: includes/LitCalAPI.php:586 includes/LitCalAPI.php:614
-#: includes/LitCalAPI.php:900 includes/LitCalAPI.php:1019
-#: includes/LitCalAPI.php:1075 includes/LitCalAPI.php:1234
-#: includes/LitCalAPI.php:1279 includes/LitCalAPI.php:1306
-#: includes/LitCalAPI.php:1415 includes/LitCalAPI.php:1427
-#: includes/LitCalAPI.php:1442 includes/LitCalAPI.php:1468
+#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
+#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
+#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
+#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
+#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:555
+#: includes/LitCalAPI.php:565
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:581
+#: includes/LitCalAPI.php:591
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:592
+#: includes/LitCalAPI.php:602
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:610
+#: includes/LitCalAPI.php:620
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:678
+#: includes/LitCalAPI.php:688
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:712 includes/LitCalAPI.php:736
+#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:789
+#: includes/LitCalAPI.php:799
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:806
+#: includes/LitCalAPI.php:816
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:830
+#: includes/LitCalAPI.php:840
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:835
+#: includes/LitCalAPI.php:845
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,15 +136,23 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:855 includes/LitCalAPI.php:1113
-#: includes/LitCalAPI.php:1290
+#. translators:
+#.  1. Grade or rank of the festivity
+#.  2. Name of the festivity
+#.  3. Day of the festivity
+#.  4. Year from which the festivity has been added
+#.  5. Source of the information
+#.  6. Current year
+#.
+#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:886 includes/LitCalAPI.php:978
+#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -145,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:932
+#: includes/LitCalAPI.php:942
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -160,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:954
+#: includes/LitCalAPI.php:964
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:974
+#: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -180,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:1006
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -198,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1032
+#: includes/LitCalAPI.php:1042
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -211,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1071
+#: includes/LitCalAPI.php:1081
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1092
+#: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -230,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1148
+#: includes/LitCalAPI.php:1158
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -245,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1170
+#: includes/LitCalAPI.php:1180
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -260,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1190
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -273,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1214
+#: includes/LitCalAPI.php:1224
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1222
+#: includes/LitCalAPI.php:1232
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -294,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1327
+#: includes/LitCalAPI.php:1337
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -311,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1355
+#: includes/LitCalAPI.php:1365
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1413
+#: includes/LitCalAPI.php:1423
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1425
+#: includes/LitCalAPI.php:1435
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -333,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1440
+#: includes/LitCalAPI.php:1450
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -341,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1466
+#: includes/LitCalAPI.php:1476
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -350,25 +368,30 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1490
+#: includes/LitCalAPI.php:1500
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1526 includes/LitCalAPI.php:1555
+#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1578
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1602 includes/LitCalAPI.php:1605
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
+#: includes/LitCalAPI.php:1623
+#, php-format
+msgid "Error retrieving and decoding National data from file %s."
+msgstr ""
+
 #. translators:
 #.  1. Grade of the festivity
 #.  2. Name of the festivity
@@ -377,31 +400,50 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1671
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1689
-msgctxt "Male singular"
-msgid "patron of Europe"
+#. translators:
+#.  1. Name of the first coinciding Memorial
+#.  2. Name of the second coinciding Memorial
+#.  3. Current year
+#.  4. Source of the information
+#.
+#: includes/LitCalAPI.php:1721
+#, php-format
+msgid ""
+"The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
+"They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1690 includes/LitCalAPI.php:1698
-#: includes/LitCalAPI.php:1702 includes/LitCalAPI.php:1721
-msgctxt "Female singular"
-msgid "patron of Europe"
+#: includes/LitCalAPI.php:1861
+#, php-format
+msgid "Found a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:1691
-msgctxt "Male plural"
-msgid "patrons of Europe"
+#. translators:
+#.  1. Festivity grade
+#.  2. Festivity name
+#.  3. Festivity date
+#.  4. Edition of the Roman Missal
+#.  5. Superseding festivity grade
+#.  6. Superseding festivity name
+#.  7. Current year
+#.
+#: includes/LitCalAPI.php:1883
+#, php-format
+msgid ""
+"The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
+"superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1709
-msgid "Saint Teresa Benedicta of the Cross, Virgin and Martyr"
+#: includes/LitCalAPI.php:1896
+#, php-format
+msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."

From 15f16c38cd4c1ba0ded4805760f8c369b9584b49 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 9 Feb 2022 21:04:06 +0100
Subject: [PATCH 035/152] create handleNationalCalendarRows method

---
 includes/LitCalAPI.php | 83 ++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 51 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index e788ccd8..6a02d781 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1785,67 +1785,48 @@ private function createNewRegionalFestivity( object $row ) : void {
                 $this->elaborateDecreeSource( $row ),
                 $this->LitSettings->Year
             );
-        } else {
+        }// else {
             //$this->handleCoincidenceDecree( $row );
+        //}
+    }
+    
+    private function handleNationalCalendarRows( array $rows ) : void {
+        foreach( $this->WiderRegionData->LitCal as $row ) {
+            if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
+                if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
+                    continue;
+                } else {
+                    //if either the property doesn't exist (so no limit is set)
+                    //or there is a limit but we are within those limits
+                    switch( $row->Metadata->action ) {
+                        case "makePatron":
+                            $festivity = $this->Cal->getFestivity( $row->Festivity->tag );
+                            if( $festivity !== null ) {
+                                if( $festivity->grade !== $row->Festivity->grade ) {
+                                    $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
+                                }
+                                $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
+                            } else {
+                                $this->handleMissingFestivity( $row );
+                            }
+                            break;
+                        case "createNew":
+                            $this->createNewRegionalFestivity( $row );
+                            break;
+                    }
+                }
+            }
         }
     }
 
     private function applyNationalCalendar() : void {
         //first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
         if( $this->WiderRegionData !== null && property_exists( $this->WiderRegionData, "LitCal" ) ) {
-            foreach( $this->WiderRegionData->LitCal as $row ) {
-                if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
-                    if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
-                        continue;
-                    } else {
-                        //if either the property doesn't exist (so no limit is set)
-                        //or there is a limit but we are within those limits
-                        switch( $row->Metadata->action ) {
-                            case "makePatron":
-                                $festivity = $this->Cal->getFestivity( $row->Festivity->tag );
-                                if( $festivity !== null ) {
-                                    if( $festivity->grade !== $row->Festivity->grade ) {
-                                        $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
-                                    }
-                                    $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
-                                } else {
-                                    $this->handleMissingFestivity( $row );
-                                }
-                                break;
-                            case "createNew":
-                                $this->createNewRegionalFestivity( $row );
-                                break;
-                        }
-                    }
-                }
-            }
+            $this->handleNationalCalendarRow( $this->WiderRegionData->LitCal );
         }
 
         if( $this->NationalData !== null && property_exists( $this->NationalData, "LitCal" ) ) {
-            foreach( $this->NationalData->LitCal as $row ) {
-                if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
-                    if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
-                        continue;
-                    } else {
-                        switch( $row->Metadata->action ) {
-                            case "makePatron":
-                                $festivity = $this->Cal->getFestivity( $row->Festivity->tag );
-                                if( $festivity !== null ) {
-                                    if( $festivity->grade !== $row->Festivity->grade ) {
-                                        $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
-                                    }
-                                    $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
-                                } else {
-                                    $this->handleMissingFestivity( $row );
-                                }
-                                break;
-                            case "createNew":
-                                $this->createNewRegionalFestivity( $row );
-                                break;
-                        }
-                    }
-                }
-            }
+            $this->handleNationalCalendarRow( $this->NationalData->LitCal );
         }
 
         if( $this->NationalData !== null && property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData->Metadata, "Missals" ) ) {

From 9de7519ecfacc6c574e2e4de833a0844c2f4923c Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:04:40 +0000
Subject: [PATCH 036/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index d392254e..4b1acfa4 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From e429bb449d9618d80bafc412cfd6462b79eec60a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 9 Feb 2022 21:04:45 +0100
Subject: [PATCH 037/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 10 +++++-----
 i18n/es/LC_MESSAGES/litcal.po | 10 +++++-----
 i18n/fr/LC_MESSAGES/litcal.po | 10 +++++-----
 i18n/it/LC_MESSAGES/litcal.po | 10 +++++-----
 i18n/la/LC_MESSAGES/litcal.po | 10 +++++-----
 i18n/pt/LC_MESSAGES/litcal.po | 10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index e5137a72..276126eb 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 0e382af5..aa4f8ca6 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -425,7 +425,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -439,14 +439,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index e351f6e9..2798651e 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 730a43ab..c276e9f1 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -450,7 +450,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -477,7 +477,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -503,7 +503,7 @@ msgstr ""
 "La %1$s '%2$s', aggiunta nel giorno %3$s sin dal %4$d (%5$s), è tuttavia "
 "superata dalla %6$s '%7$s' nell'anno %8$d."
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index d411a0e2..276443eb 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -481,7 +481,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
@@ -511,7 +511,7 @@ msgstr ""
 "Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
 "ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -525,7 +525,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, fuzzy, php-format
 #| msgid ""
 #| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
@@ -537,7 +537,7 @@ msgstr ""
 "%s <i>'%s'</i>, aggregata in die %s ab anno %d (%s), subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 984efb11..56686793 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 13:17+0000\n"
+"POT-Creation-Date: 2022-02-09 20:04+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1945
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1861
+#: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1864
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1896
+#: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From 5b27417ed32f782c50527f4d7a33df1318f60767 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 9 Feb 2022 21:06:16 +0100
Subject: [PATCH 038/152] create AllFestivities and Nat.l_Reg.l data scripts

---
 LitCalAllFestivities.php          |  53 +++++++++
 LitCalNationalAndRegionalData.php | 184 ++++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 LitCalAllFestivities.php
 create mode 100644 LitCalNationalAndRegionalData.php

diff --git a/LitCalAllFestivities.php b/LitCalAllFestivities.php
new file mode 100644
index 00000000..89336674
--- /dev/null
+++ b/LitCalAllFestivities.php
@@ -0,0 +1,53 @@
+<?php
+
+include_once( 'includes/enums/LitLocale.php' );
+include_once( 'includes/enums/RomanMissal.php' );
+
+$requestHeaders = getallheaders();
+if( isset( $requestHeaders[ "Origin" ] ) ) {
+    header( "Access-Control-Allow-Origin: {$requestHeaders[ "Origin" ]}" );
+    header( 'Access-Control-Allow-Credentials: true' );
+}
+else {
+    header( 'Access-Control-Allow-Origin: *' );
+}
+header( 'Access-Control-Max-Age: 86400' );    // cache for 1 day
+header( 'Cache-Control: must-revalidate, max-age=259200' );
+header( 'Content-Type: application/json' );
+
+$FestivityCollection = [];
+
+$LatinMissals = array_filter( RomanMissal::$values, function($item){
+    return str_starts_with( $item, "VATICAN_" );
+});
+
+$LOCALE = isset( $_GET["locale"] ) && LitLocale::isValid( strtoupper( $_GET["locale"] ) ) ? strtoupper( $_GET["locale"] ) : "LA";
+
+foreach( $LatinMissals as $LatinMissal ) {
+    $DataFile = RomanMissal::getSanctoraleFileName( $LatinMissal );
+    if( $DataFile !== false ) {
+        $I18nPath = RomanMissal::getSanctoraleI18nFilePath( $LatinMissal );
+        if( $I18nPath !== false && file_exists( $I18nPath . "/" . strtolower( $LOCALE ) . ".json" ) ) {
+            $NAME = json_decode( file_get_contents( $I18nPath . "/" . strtolower( $LOCALE ) . ".json" ), true );
+            $DATA = json_decode( file_get_contents( $DataFile ), true );
+            foreach( $DATA as $idx => $festivity ) {
+                $key = $festivity[ "TAG" ];
+                $FestivityCollection[ $key ] = $festivity;
+                $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+            }
+        }
+    }
+}
+
+$responseObj = [ "LitCalAllFestivities" => $FestivityCollection ];
+
+$response = json_encode( $responseObj );
+$responseHash = md5( $response );
+header("Etag: \"{$responseHash}\"");
+if (!empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $responseHash) {
+    header( $_SERVER[ "SERVER_PROTOCOL" ] . " 304 Not Modified" );
+    header('Content-Length: 0');
+} else {
+    echo $response;
+}
+die();
diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
new file mode 100644
index 00000000..a38a3408
--- /dev/null
+++ b/LitCalNationalAndRegionalData.php
@@ -0,0 +1,184 @@
+<?php
+error_reporting( E_ALL );
+ini_set( 'display_errors', 1 );
+
+include_once( 'includes/enums/AcceptHeader.php' );
+include_once( 'includes/enums/RequestMethod.php' );
+include_once( 'includes/enums/RequestContentType.php' );
+include_once( 'includes/enums/ReturnType.php' );
+include_once( 'includes/APICore.php' );
+
+$allowedOrigins = [
+    "https://johnromanodorazio.com",
+    "https://www.johnromanodorazio.com",
+    "https://litcal.johnromanodorazio.com",
+    "https://litcal-staging.johnromanodorazio.com"
+];
+
+$LitCalDiocesanData = new LitCalNationalData();
+
+$LitCalDiocesanData->APICore->setAllowedOrigins( $allowedOrigins );
+$LitCalDiocesanData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
+
+$LitCalDiocesanData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
+$LitCalDiocesanData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
+$LitCalDiocesanData->Init();
+
+class LitCalNationalData {
+
+    private object $DATA;
+    private object $RESPONSE;
+
+    public APICore $APICore;
+
+    public function __construct(){
+        $this->APICore                              = new APICore();
+        $this->RESPONSE                             = new stdClass();
+        $this->RESPONSE->requestHeadersReceived     = $this->APICore->getJsonEncodedRequestHeaders();
+    }
+
+    private function handleGetPostRequests( array $REQUEST ) {
+        $this->APICore->validateAcceptHeader( true );
+        if( $this->APICore->getRequestContentType() === 'application/json' ) {
+            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
+        } else {
+            $this->DATA = (object)$REQUEST;
+        }
+        $this->retrieveNationalCalendar();
+    }
+
+    private function handlePutPatchDeleteRequests( string $requestMethod ) {
+        $this->APICore->validateAcceptHeader( false );
+        $this->APICore->enforceAjaxRequest();
+        $this->APICore->enforceReferer();
+        if( $this->APICore->getRequestContentType() === 'application/json' ) {
+            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
+            if( RequestMethod::PUT === $requestMethod ) {
+                $this->writeNationalCalendar();
+            } elseif( RequestMethod::DELETE === $requestMethod ) {
+                $this->deleteNationalCalendar();
+            }
+        } else{
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 415 Unsupported Media Type", true, 415 );
+            die( '{"error":"You seem to be forming a strange kind of request? Only \'application/json\' is allowed as the Content Type for the body of the Request when using Request Methods PUT, PATCH, or DELETE: the Content Type for the body of your Request was '.$_SERVER[ 'CONTENT_TYPE' ].' and you are using Request Method ' . $_SERVER[ 'REQUEST_METHOD' ] . '"}' );
+        }
+    }
+
+    private function handleRequestedMethod() {
+        switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
+            case RequestMethod::GET:
+                $this->handleGetPostRequests( $_GET );
+                break;
+            case RequestMethod::POST:
+                $this->handleGetPostRequests( $_POST );
+                break;
+            case RequestMethod::PUT:
+            case RequestMethod::PATCH:
+                $this->handlePutPatchDeleteRequests( RequestMethod::PUT );
+                break;
+            case RequestMethod::DELETE:
+                $this->handlePutPatchDeleteRequests( RequestMethod::DELETE );
+                break;
+            case RequestMethod::OPTIONS:
+                //continue;
+                break;
+            default:
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 405 Method Not Allowed", true, 405 );
+                $errorMessage = '{"error":"You seem to be forming a strange kind of request? Allowed Request Methods are ';
+                $errorMessage .= implode( ' and ', $this->AllowedRequestMethods );
+                $errorMessage .= ', but your Request Method was ' . strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) . '"}';
+                die( $errorMessage );
+        }
+    }
+
+    private function retrieveNationalCalendar() {
+        if( property_exists( $this->DATA, 'category' ) ) {
+            $category = $this->DATA->category; //nationalCalendar or widerRegionCalendar
+            if( property_exists( $this->DATA, 'key' ) ) {
+                $key = $this->DATA->key;
+                if( $category === "widerRegionCalendar" ) {
+                    $calendarDataFile = "nations/{$key}.json";
+                }
+                else if( $category === "nationalCalendar" ) {
+                    $calendarDataFile = "nations/{$key}/{$key}.json";
+                }
+                if( file_exists( $calendarDataFile ) ) {
+                    $response = json_decode( file_get_contents( $calendarDataFile ) );
+                    $uKey = strtoupper( $key );
+                    if( $category === "widerRegionCalendar" ) {
+                        $response->isMultilingual = is_dir( "nations/{$uKey}" );
+                        $locale = strtolower( $this->DATA->locale );
+                        if( file_exists( "nations/{$uKey}/{$locale}.json" ) ) {
+                            $localeData = json_decode( file_get_contents( "nations/{$uKey}/{$locale}.json" ) );
+                            foreach( $response->LitCal as $idx => $el ) {
+                                $response->LitCal[$idx]->Festivity->name = $localeData->{$response->LitCal[$idx]->Festivity->tag};
+                            }
+                        }
+                    }
+                    $responseStr = json_encode( $response );
+                    echo $responseStr;
+                    die();
+                }
+            }
+        }
+    }
+
+    private function writeNationalCalendar() {
+        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
+            die( '{"error":"Required parameters were not received"}' );
+        } else {
+            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
+            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
+            $CalData = json_decode( $this->DATA->calendar );
+            if( json_last_error() !== JSON_ERROR_NONE ) {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
+                die( '{"error":"Malformed data received in <calendar> parameters"}' );
+            }
+            if( property_exists( $this->DATA, 'overrides' ) ) {
+                $CalData->Overrides = $this->DATA->overrides;
+            }
+            $this->RESPONSE->Calendar = json_encode( $CalData );
+            if( property_exists( $this->DATA, 'group' ) ) {
+                $this->RESPONSE->Group = strip_tags( $this->DATA->group );
+            }
+            $path = "nations/{$this->RESPONSE->Nation}";
+            if( !file_exists( $path ) ){
+                mkdir( $path, 0755, true );
+            }
+
+            file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
+
+            //$this->createOrUpdateIndex( $path );
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
+            die( '{"success":"Diocesan calendar created or updated for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
+
+        }
+    }
+
+    private function deleteNationalCalendar() {
+        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
+            die( '{"error":"Required parameters were not received"}' );
+        } else {
+            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
+            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
+            $path = "nations/{$this->RESPONSE->Nation}";
+            if( file_exists( $path . "/{$this->RESPONSE->Diocese}.json" ) ){
+                unlink($path . "/{$this->RESPONSE->Diocese}.json");
+            }
+
+            //$this->createOrUpdateIndex( $path, true );
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 200 OK", true, 200 );
+            die( '{"success":"Diocesan calendar deleted for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
+
+        }
+    }
+
+    public function Init() {
+        $this->APICore->Init();
+        $this->APICore->setResponseContentTypeHeader();
+        $this->handleRequestedMethod();
+    }
+
+}

From 1247b98d309a7d7eb936740a4094213b826a9ef5 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 9 Feb 2022 21:10:22 +0100
Subject: [PATCH 039/152] refactor references to Diocese, to Nation references

---
 LitCalNationalAndRegionalData.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index a38a3408..8ea4bfed 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -15,14 +15,14 @@
     "https://litcal-staging.johnromanodorazio.com"
 ];
 
-$LitCalDiocesanData = new LitCalNationalData();
+$LitCalNationalData = new LitCalNationalData();
 
-$LitCalDiocesanData->APICore->setAllowedOrigins( $allowedOrigins );
-$LitCalDiocesanData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
+$LitCalNationalData->APICore->setAllowedOrigins( $allowedOrigins );
+$LitCalNationalData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
 
-$LitCalDiocesanData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
-$LitCalDiocesanData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
-$LitCalDiocesanData->Init();
+$LitCalNationalData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
+$LitCalNationalData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
+$LitCalNationalData->Init();
 
 class LitCalNationalData {
 
@@ -151,7 +151,7 @@ private function writeNationalCalendar() {
 
             //$this->createOrUpdateIndex( $path );
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
-            die( '{"success":"Diocesan calendar created or updated for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
+            die( '{"success":"National calendar created or updated for nation \"'. $this->RESPONSE->Diocese .'\""}' );
 
         }
     }
@@ -170,7 +170,7 @@ private function deleteNationalCalendar() {
 
             //$this->createOrUpdateIndex( $path, true );
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 200 OK", true, 200 );
-            die( '{"success":"Diocesan calendar deleted for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
+            die( '{"success":"National calendar deleted for nation \"'. $this->RESPONSE->Diocese .'\""}' );
 
         }
     }

From 4c595c17e1bbf41e6c87e25aa043b97664cbb577 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Sun, 13 Feb 2022 12:52:57 +0100
Subject: [PATCH 040/152] better validation for common string

---
 includes/enums/LitCommon.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/includes/enums/LitCommon.php b/includes/enums/LitCommon.php
index 53ec55e6..676daa58 100644
--- a/includes/enums/LitCommon.php
+++ b/includes/enums/LitCommon.php
@@ -261,6 +261,10 @@ public static function POSSESSIVE( string $value ) : string {
     ];
 
     public static function isValid( string $value ) {
+        if( strpos($value, ',') || strpos($value, ':') ) {
+            $values = preg_split('/[,:]/', $value);
+            return self::areValid( $values );
+        }
         return in_array( $value, self::$values );
     }
 

From b2b0795eac408c67586cfda71d7f69f5bfd58894 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 13 Feb 2022 11:53:23 +0000
Subject: [PATCH 041/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 4b1acfa4..5bab64e6 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -448,7 +448,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr ""
 

From 11a9a94598953d0b39bd42a63a9411f7364e1c56 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 13 Feb 2022 12:53:27 +0100
Subject: [PATCH 042/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 6 +++---
 i18n/es/LC_MESSAGES/litcal.po | 6 +++---
 i18n/fr/LC_MESSAGES/litcal.po | 6 +++---
 i18n/it/LC_MESSAGES/litcal.po | 6 +++---
 i18n/la/LC_MESSAGES/litcal.po | 6 +++---
 i18n/pt/LC_MESSAGES/litcal.po | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 276126eb..868b15ad 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -448,7 +448,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index aa4f8ca6..2529f141 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -453,7 +453,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr ""
 
@@ -717,7 +717,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 2798651e..6612fdc8 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -448,7 +448,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index c276e9f1..94e7aa49 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -510,7 +510,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr "oppure"
 
@@ -787,7 +787,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr "del"
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr "Dal Comune"
 
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 276443eb..97b7747f 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -544,7 +544,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr "vel"
 
@@ -813,7 +813,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr "De Commune"
 
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 56686793..b3661053 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-09 20:04+0000\n"
+"POT-Creation-Date: 2022-02-13 11:53+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -448,7 +448,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:331
 msgid "or"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:323
+#: includes/enums/LitCommon.php:327
 msgid "From the Common"
 msgstr ""
 

From c3d2492f926faeaca5819e27e0b829369669b16a Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Sun, 13 Feb 2022 13:36:48 +0100
Subject: [PATCH 043/152] better validation

---
 includes/enums/LitColor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/includes/enums/LitColor.php b/includes/enums/LitColor.php
index e185b415..1d46d868 100644
--- a/includes/enums/LitColor.php
+++ b/includes/enums/LitColor.php
@@ -10,6 +10,9 @@ class LitColor {
     public static array $values = [ "green", "purple", "white", "red", "pink" ];
 
     public static function isValid( string $value ) {
+        if( strpos($value, ',') ) {
+            return areValid( explode(',', $value) );
+        }
         return in_array( $value, self::$values );
     }
 

From ca5954d8949b5e16361b6ac12eccb47ebe2e5ee4 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 13 Feb 2022 12:37:11 +0000
Subject: [PATCH 044/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 5bab64e6..9fb2dac9 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -495,27 +495,27 @@ msgid ""
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr ""
 

From d28acd0d244d2f8cc03e35c199d4043807424975 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 13 Feb 2022 13:37:16 +0100
Subject: [PATCH 045/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/es/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/fr/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/it/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/la/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/pt/LC_MESSAGES/litcal.po | 12 ++++++------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 868b15ad..555ff43e 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: German\n"
@@ -495,27 +495,27 @@ msgid ""
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr ""
 
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 2529f141..fbaef9bd 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2022-02-05 02:15+0000\n"
 "Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -500,27 +500,27 @@ msgid ""
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr ""
 
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 6612fdc8..a45d32f9 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2021-12-14 00:20+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: French\n"
@@ -495,27 +495,27 @@ msgid ""
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr ""
 
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 94e7aa49..def49601 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2022-01-30 15:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -570,27 +570,27 @@ msgstr ""
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr "verde"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr "viola"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr "bianco"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr "rosso"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr "rosa"
 
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 97b7747f..5a0c9d88 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2021-12-25 23:32+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -596,27 +596,27 @@ msgstr ""
 "Congregatione Cultu Divino quid facere!"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr "viridis"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr "purpura"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr "albus"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr "ruber"
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr "rosea"
 
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index b3661053..b3963c1f 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 11:53+0000\n"
+"POT-Creation-Date: 2022-02-13 12:37+0000\n"
 "PO-Revision-Date: 2021-12-14 00:21+0100\n"
 "Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese\n"
@@ -495,27 +495,27 @@ msgid ""
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:24
+#: includes/enums/LitColor.php:27
 msgid "green"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:27
+#: includes/enums/LitColor.php:30
 msgid "purple"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:30
+#: includes/enums/LitColor.php:33
 msgid "white"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:33
+#: includes/enums/LitColor.php:36
 msgid "red"
 msgstr ""
 
 #. translators: context = liturgical color
-#: includes/enums/LitColor.php:36
+#: includes/enums/LitColor.php:39
 msgid "pink"
 msgstr ""
 

From f432f8ba438db1d1c413348ddaf84fa5c38e6360 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Feb 2022 09:38:36 +0000
Subject: [PATCH 046/152] Translated using Weblate (German)

Currently translated at 2.8% (3 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/de/
---
 i18n/de/LC_MESSAGES/litcal.mo | Bin 0 -> 617 bytes
 i18n/de/LC_MESSAGES/litcal.po |  20 +++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 i18n/de/LC_MESSAGES/litcal.mo

diff --git a/i18n/de/LC_MESSAGES/litcal.mo b/i18n/de/LC_MESSAGES/litcal.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d9bbf1f2b013ec7043abdf54ad762584e87e7303
GIT binary patch
literal 617
zcmYL`%Z}496ow593nGLBYZiwcXyjyySd7vZ5gKO_ku+730S3*+)0i}))Xvy0w>Myo
zcoUw7XW=A8Q%j$J+sBvlAOC%F^qXKiLY^Ws<UVqV46R3o`3>?I`HDP1ej<PF5b_Ik
zI2+$3<PmCy`VjRJ6~hE&jH8fyLl?22toA+R5mYgQG%rF@<|)gTNp(S1T3w5^rAbZS
z3vF5@eK-?(%OyNdTf5UuyXGA%cqe4d^$VvEz0#IurfF;XcGnnMDIc6wP7Cp+9WJ0D
zx59@D78EqgX&6A9`&n}QDPJ-t<;K!Vb7?wmmG&VzPg7V18G{+if+T$tgkizT@-=Ri
z&5k#MR)TMDvzl$J?Tznw_Wvcqy;d8k6{f6erTLFmxofrc`n@ybb+<MsS{ZG4yl<(o
zx|NObYT+Fo^Pv__mSpTuj){BXER?iDV&>m_v}VOO>-8OP<rLN%u8pws^D3gJhkZkG
zpM|DOu2qfC_;7mFT4&YmH1BAn^w#(w`*CXKFQ>2{&LupX!({4wq-R13y|2*+afQ_q
h@XDQ>xDy9Ibo|w_f{>LEv!YmzYiY8G-?5}3{{S5gt6Bg6

literal 0
HcmV?d00001

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 555ff43e..34cf5b6d 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -6,16 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2021-12-14 00:21+0100\n"
-"Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
-"Language-Team: German\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
+"Language-Team: German <https://translate.johnromanodorazio.com/projects/"
+"liturgical-calendar/api-strings/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: includes/LitCalAPI.php:224
 #, php-format
@@ -739,17 +741,17 @@ msgstr ""
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110
 msgid "FEAST"
-msgstr ""
+msgstr "FEST"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:115
 msgid "FEAST OF THE LORD"
-msgstr ""
+msgstr "FEST DES HERRN"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:120
 msgid "SOLEMNITY"
-msgstr ""
+msgstr "FESTLICHKEIT"
 
 #. translators: liturgical rank. Keep lowercase
 #: includes/enums/LitGrade.php:125

From 61a0c38d2d585f0c4ffbe947f4e3e27c27b339a7 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Feb 2022 09:55:34 +0000
Subject: [PATCH 047/152] Translated using Weblate (Spanish)

Currently translated at 8.4% (9 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/es/
---
 i18n/es/LC_MESSAGES/litcal.mo | Bin 1300 -> 1426 bytes
 i18n/es/LC_MESSAGES/litcal.po |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/es/LC_MESSAGES/litcal.mo b/i18n/es/LC_MESSAGES/litcal.mo
index 9b46a18bcf5c52ee005b38e96a462eb1be105978..314aa4bb3228e7f4446e6bda79345e4f55e8c64f 100644
GIT binary patch
delta 350
zcmX}mze>bF5XbS!8SlJ^g^GW`KMbPSDEJD2Z17;sVv@%4@DvNLQ4uWUDr-5TZ(*kh
zg4hT?h1lBa8~EMxaNw8EW*KJoHo6(_eNKgULPcbe9Fqz1LVSIb8S+DBNh1*1#AO^s
zi<6k6!wxp_5xe+`E4Wb;dGbA|{MSQ~C6S)2bJ*g-U>(oV54=Q+*XSSjfmis2tJq~b
z^9GOL>c9MQ-`^PCjNlmYv)L`OcB-BBg|-jR4o<ZHp3S8uE=n1E)umc)8?`P^s_9_2
rSvYHUvR1kGupd0v=F^rb%2@u;#8@rNTi@l?LYPIv-Xu<{qwxM0fN(H;

delta 207
zcmXZWu?j&^9LMqBxemA7O_;8_$*N4Af*9<UyBIvfooq@Ro`Oy3TD*aj2QV^7CcCeb
ze|`F%|EW`F6|KwJtztJ~Lc|y$!W_TJQNs~+T+qfH15}MPr73OFD?Q+Ygnd_#8uUy%
v^htX(w$e=MYQmw##hdcRe}stDPwC%)^43pr`5L>_4EHCK2X0~e?qRoImIoR(

diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index fbaef9bd..04470146 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2022-02-05 02:15+0000\n"
-"Last-Translator: padrecedano <padre.cedano@gmail.com>\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/es/>\n"
 "Language: es\n"
@@ -744,17 +744,17 @@ msgstr ""
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110
 msgid "FEAST"
-msgstr ""
+msgstr "FIESTA"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:115
 msgid "FEAST OF THE LORD"
-msgstr ""
+msgstr "FIESTA DEL SEÑOR"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:120
 msgid "SOLEMNITY"
-msgstr ""
+msgstr "SOLEMNIDAD"
 
 #. translators: liturgical rank. Keep lowercase
 #: includes/enums/LitGrade.php:125

From 887412d29e71e495567ca750f06b9331159239f2 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Feb 2022 09:34:01 +0000
Subject: [PATCH 048/152] Translated using Weblate (French)

Currently translated at 3.7% (4 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/fr/
---
 i18n/fr/LC_MESSAGES/litcal.mo | Bin 0 -> 731 bytes
 i18n/fr/LC_MESSAGES/litcal.po |  22 ++++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 i18n/fr/LC_MESSAGES/litcal.mo

diff --git a/i18n/fr/LC_MESSAGES/litcal.mo b/i18n/fr/LC_MESSAGES/litcal.mo
new file mode 100644
index 0000000000000000000000000000000000000000..77bace1cb851cd7a77f17b32c985f463363d3e52
GIT binary patch
literal 731
zcmYL{&2G~`5XTJ^A$)@~hdF}E#tq_7IZcIIZ`w$993>7=ZX0KsY~}2l-A(y;0*a83
zkaz$jE)fR~JVIWA6VJjpfo7!Nj@SNs=VRy3{hhBK*=^zh5fgWalBn$iQGdH4?h&7f
zyTmu*G4X@=b;I+1ldpB3Zf<m6$osVaPJWmCPx2)5c8J<;5w)IPZ>+<kVeYM0$U2ap
za!9g4><zPor@d}|<`r1t*a#=Jf;ZC5pfXtC1XY2cFVTS2CC-&}60O%a`T`5bx)b&s
zjirA==or$@;9(-&!c1i$N;noJs);a<`~g<lIF{O}oUo(C)UsTM;P*2&z)M*lz+&Mr
zgfkuuSemgog3~NaySuNl9`_Sr9m|bSwiHeq3N}g-=tU`q1D;0R<XIHQ13nxcl2lC>
zVu~zBF~830VCGz9!ys_~4#CESo++c}Lg|S%;=R<3LeGP0Q<)9Q>oORXvMwVKm1Nc#
zsirnKH^DYo2<OI6yD8tcquJQ=kF|2BDD!s}mFDoR3#w8`)q-Lsj78TT<sG)a)z!(J
zqhVYXdO~4B*dI&h_sfM5CF^K2w;`x%y|wKpE!aG^6&ymd<-cSnsE{tPZqW-IQ?n4B
zHkx~lrtfuDA9KE0As)eycTakJG+2*7k49j1<rS-Cxmy08g4YX4Lm=k}c444IyB+~W
JBd}Up?=O_d)hqx2

literal 0
HcmV?d00001

diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index a45d32f9..e3c1c701 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -6,16 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2021-12-14 00:20+0100\n"
-"Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
-"Language-Team: French\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
+"Language-Team: French <https://translate.johnromanodorazio.com/projects/"
+"liturgical-calendar/api-strings/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: includes/LitCalAPI.php:224
 #, php-format
@@ -739,19 +741,19 @@ msgstr ""
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110
 msgid "FEAST"
-msgstr ""
+msgstr "FÊTE"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:115
 msgid "FEAST OF THE LORD"
-msgstr ""
+msgstr "FÊTE DU SEIGNEUR"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:120
 msgid "SOLEMNITY"
-msgstr ""
+msgstr "SOLENNITÉ"
 
 #. translators: liturgical rank. Keep lowercase
 #: includes/enums/LitGrade.php:125
 msgid "celebration with precedence over solemnities"
-msgstr ""
+msgstr "célébration qui prime sur les solennités"

From 1e6fbe6ad8713d2d64bbbcb0c99d0a7765770953 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Feb 2022 09:46:18 +0000
Subject: [PATCH 049/152] Translated using Weblate (Italian)

Currently translated at 100.0% (107 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/it/
---
 i18n/it/LC_MESSAGES/litcal.mo | Bin 13482 -> 14523 bytes
 i18n/it/LC_MESSAGES/litcal.po |  32 ++++++++++++++------------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/i18n/it/LC_MESSAGES/litcal.mo b/i18n/it/LC_MESSAGES/litcal.mo
index 051216de371fab5292e6c07ffd388206685f4916..556d2a86459d2d070c00328b64da27005d638a18 100644
GIT binary patch
delta 3386
zcmb8xYitx%6u|LY=!*g^Ezk!@nZhnDPzvQ$EKs1d1p!+vg(3=c+TE6s?QYrKB0_bM
zNFa!YbfOU=F;P(T0|~UEfIJKm4F-cBFo*~r5MM+wgcyku{h!%e(kNn>aP~KMX6N2J
z=bpReUF*o|$fdN{mlcPPcz|f@sgzu}7|#dCxL!)-U?C2~g_w>OuEY)aEdGdvxH3tp
zWZbEJNBe>H6CA<)FR{N;5p|oBzFbJ{tyDe^#R<3o$KVE(0rz17p27$53{J;{K1#)5
zIi})#l>U}sCayx6(DT?2ZIu3YV+!M|Bl-)UVHP(o==M#Nj(YMT9i*bP4L$~70rCcF
zHfCe3Zm+>K+FNyd7s?y&N4iw!F$1q+6634eoRB@0$S5R3rJ-~@1m%H39F8TJg7qi^
z1Tlo0P%?816ETJ_RbdiJMwX)7_o1w67-hWm7|G{k6DP8U2e1_j$<urIHm<;B^wNw+
z(TAfMy%b-?-S{=iL^d#MdHyEKb5D|{@9{Kl!2=Y~b2yd!zlcZE$-i_wpM1Q9hwvKK
zv2Z`*0@kA)iw8v~a0V~Xo;sL9#dIq6EZR5&JwudQjJr`X`3K6I$Fn}Mn2gL#^+&0V
z+-&kM8JNihDWYb5Bc$DiQY?FLD1L}N@FGfwmr+vsEwXXcHDr$JI*!969vX&IQEFy6
z%7j8F<E@WyaxjLpApg`9_L>yo5@hl!h_cPL<3_xN)3J?SrGvvL1E0|Ck9GSr=5qaW
zlsEnjDG!xIAx*<9oQRRdoQ&n<1(bo0pv?3f&cUCs7RS4y18zkrs_oi0knF2Ylw$n?
zDI0YOCB@fuJJB7TKo&}d@}ljCn$3wkSdG-5TA>Xfb)_OG9kwIOuHMw`<0x-*R<|!B
z$x*-R>uKyc>P_WfUo1lTemU~fp=vNg_J18GGJ&-yYqklccn+eZ?ju}{=TO#e4tW);
z@CmF%`Cg~K{;BpXN<Zh(z$^F?#^x#Y6x!Iy_^S6v_9UJ_3nz_Y>)`7+1CvJc);JGk
zd;Nm)eGirE!LRTJmW)wqGZq%G74Z=6#A4QW8=k{sSkGJjjyZ*7_b*NcjaTXwaYA%|
z@5gUwXHy~1;Gg&%uA9WK9h#G)HL(Zf&2M7@rWQqaMHUXFosH>Og3M7Z!Z_Th?{6t0
z|57}A^@USNmeo~^$39b{9rj0gFjJe2vO8QT#aoIbO9fGCWf#i#_o4LDi7`kmI}<I%
zxkP_ie>tWSvCf%NUX;R-H|2$$KSr`;mJ%$Xv!7+sC4?MhgbX4}Cxbsu7=$dLOiGG&
z6~Rw}Dkl~bax@V0_4v*O`B+Z$Bz(jSLejW|kfVZFK`fI7M`jddVlmN+Xe8>0?gy*m
zY;D;Ea*QCPZsdq8;A5to>4Q>m_GhAQQ$x-{v8oz^QgF6el5;isr+AS*?@k7dKKeov
z%KFRkXcXtSrIzuXrWA=B)lr;ZIDP8;+`4q59w~nHFfosKjF96ILVlDUA_fpE38{-J
zB8^x`bRCp}v;QeE{=-6!rI5OgN=|0!MhYeqZh{?i=a4-w#Wj)`({U>CMoiu8K&#JV
z_yb|1(eir?(+HXVhHxNg`n-n644Yi$tT7NY+#yxwT;M#s(%b!ujln=O_l<@-oz=@T
zt$t5|eK4sqQXUNQP|zC=THZC5zsWEe%HwSac%)HjhOL0#^y%@WFK1A9s6gHO$y&?f
z4I0(nCZ50B(-q~j7S^bWeu7a|VbshmHx^V?mvv0*eI;g?%<tYWY!B(X)4thvoBe+B
z;R$)}39it{e8cp3ydEPQaFXEfntKBY^LxyoVfmdK?uo8YzHO#v44&i)8M*Gsu262*
zy{El=&t2s5bkwEnh_hP;wDl}dHTL!7Qu}abRmbLm1LLRH1WkX)=k%`M>^{=ov19Ps
zxJV^QIl0#eg-w}kFtA2!^+%K2z)eef=ELig#q3&it5}v=9u5Wk0q1c`Kdv8WA?en?
zpD9pf-Ub#qAU*m_J3FU3y7FGbFBc4-HymyannpmkqZQC-HJCi1`>r(CImIAN-#_Z$
ze)^F)GNdjJuhC+iJY<;7Ef!;S>(~zDWOeMwxe_z3<}L|x((@m0Yp);PZjW`nW~aE1
z7v8CjrY5V^&#qyJu8OdDUHwwd3m8%w_NBb6Y{`kcTX{&9a!o%;cZ%bf`#_xi!>G27
fRij5Hl>Xm>&{sHUdRirYY~8!8X-E6`%pQLOE9y7D

delta 2663
zcmaLXX>3$g6u|M*(uD%uC_+VOA5v-2ma++0!CL5)r7eX{Eh=bzb{=$KI&EjB5E5V%
zo3sYd;8;b04+5Gf(HMrMaU~=whA$?fCPe(eA{x|$8WZ9I{?D6R<dZjZ=6CO%H}7ue
zy$`$I@kf6cozgFqHev#?W|+th+?U1|<@9ioN%$q+fmd-XCS@f4laJeIKZ`R^Mu=p=
zOk<UCg|P*v@Ou#RM55A9C6kV~u?$b34saRM@o!AUl#wF2I07x4fcn1$n2)un1N$%s
z!>IS^!ED@Xem{(N(*D40M@7z3(HmVf7hE%K86`4?{w!psG8qeSu4y;pXxi&ddn@Y7
zb|W7d;A<RyhO9x(Bby{Ynf4&&F~0mmg^%Pi3!P~J>W!yi7^`q19z&hL*Qh%)h@6J}
zi48c6<?9Z4QGa((Pq7_!;0VsaZCHxOFsf&Ffyyzo8NCI^v48Ej2?KZ;7h)rKKZO0L
z6RTjB-S{5r|BBeAE7*g57-0K$;UB2?dyWKp3$Ni-+%uN*|CLG)`}7iqI7q!Pl><75
zVcdet$BTT0XRsOf-IdtV-%(e315+@K3}$Q@iJB9Is4Ja^nnRB1-(c*S!2WBJ?5Cp;
zk76>OMZMv7s9X3w@?gkCWDar#r(-hbayQOG&6Q@<32i_fFpS5OL^h+|e>z{9d@GPH
zSs$g+Mx_t8<277>5i4<nBd7xpnD$4eeF}@|{~UG2zagh6$vms&n2S1473#!RqfV$3
zHAglgrz+7t)A1UzC^?LpjHk^7-=J>gkEVSSb)X!UtvgYO+O9zT-%=!vq}jL@HJLY}
z4){EBTJn0L9hKu$^afv;3%*6hkSnG?V{+oflaHD7PeZ+aKJuhWE$U;o3UvY<sE^wg
z)Sc<YF5HVcfy|<W1(;6$Nx56$xyChIP>K4-eWw3?;{fW7PvRmxgBE7rBk}@H$D{Zu
zMliz5z>h!Udh~K$mG}uB#2eVn_;R2m@rV4WyuE1e!a*FwUc7uS+lB4-iR{GTrQ8Jj
z@j5n@iQL5cX(F$vBtQT!;dxw1rf$XZ85|?Ni>vVEnVi3_^cO1WD6<k-KO75bW}-eF
zWyn}kjhaMV=J!pgIrFM%A4L``XE6=`!W2xNo%mn6F%u`!pEsNR*KD0Z2a6ON^^A6!
z3-_bm=pZKH?d5SAx?B4Hp|YHchgfJj^a)_ogrgVM=;ntW;aWl`P^IUuMF-Utw-8Sd
z_Y>K~3PQ7gs4x#VIdzqqE2|0Jp$1~8JVvFK&{wsVxr8RD7EZ`5bByzKe9dZok82?(
zWQki7A&+Dop*x_vb9<?$G0${7guGGRl4l&^0aJMd^@w?>#38B)(o3S62t~wFLQ68C
zXF80~7sUc1iy(*Gvm{sD#}3@*Sk=N&yDzdw-ImD1_$2WlVG~-G5gEivqLJ|G+q{{|
z(}YDVCN$AT6Iw`Y_fgZNYb8irw>0ssFP|Esj(CcwAhe7jD&u7tgGsSxM%K@(@l<)6
z#QnA!YOJOu9;>dQv07@Jc01r$VSjL4cfby%blQ<nN6_k6Yk9gu9i2{m&8Uk>vDU0T
z6<pOB=nmNdb4~cai=_U4?-9G6_2O)QFk&@1At!8G3!R|j^S4H9y+fqUu@;3o!r@Y@
z*&kZx4_bE6XVu%G$mUS2C;Q|0iJZRF*s1KwBjbE&@k0~4Q)4?Ox0KX)yiHZChi|Le
zQ)hXXE?(Zy=#j+yZOd2e&fku|QFJLOc6`e2Nr_+lw|+5~cHHWS)fDev<h6s$>-LE{
z5juQMAYkh}TOF&!<MT(_EN{f|2d9==8y%gsV>wnkllF(4*oESg@$pj+q{ebfmc@I^
M&!xrRoHI80U&{hku>b%7

diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index def49601..0bcb34e7 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2022-01-30 15:15+0000\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/it/>\n"
@@ -31,12 +31,12 @@ msgstr ""
 #: includes/LitCalAPI.php:259
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
-msgstr ""
+msgstr "Non sono stati trovati dati per il santorale di: %s."
 
 #: includes/LitCalAPI.php:265
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
-msgstr ""
+msgstr "Non sono stati trovati dati per la traduzione del santorale di: %s."
 
 #: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
 #, php-format
@@ -436,11 +436,13 @@ msgstr "Memoria di Santa Maria in sabato"
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
+"Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
+"dal file %s."
 
 #: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
-msgstr ""
+msgstr "Errore nella lettura o nella decodifica dei dati Nazionali dal file %s."
 
 #. translators:
 #.  1. Grade of the festivity
@@ -466,21 +468,18 @@ msgstr ""
 #.  4. Source of the information
 #.
 #: includes/LitCalAPI.php:1721
-#, fuzzy, php-format
-#| msgid ""
-#| "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year "
-#| "%3$d. They are both reduced in rank to optional memorials (%4$s)."
+#, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
-"e due sono ridotte al grado di memorie facoltative (%4$s)."
+"e due sono ridotte al grado di memorie facoltative."
 
 #: includes/LitCalAPI.php:1842
 #, php-format
 msgid "Found a sanctorale data file for %s"
-msgstr ""
+msgstr "Trovato un file con dati per il santorale di: %s"
 
 #. translators:
 #.  1. Festivity grade
@@ -492,21 +491,18 @@ msgstr ""
 #.  7. Current year
 #.
 #: includes/LitCalAPI.php:1864
-#, fuzzy, php-format
-#| msgid ""
-#| "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
-#| "superseded by the %6$s '%7$s' in the year %8$d."
+#, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
-"La %1$s '%2$s', aggiunta nel giorno %3$s sin dal %4$d (%5$s), è tuttavia "
-"superata dalla %6$s '%7$s' nell'anno %8$d."
+"La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
+"superata dalla %5$s '%6$s' nell'anno %7$d"
 
 #: includes/LitCalAPI.php:1877
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
-msgstr ""
+msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153

From 418a102163470a39c3355935b9b25b044468c09a Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Tue, 15 Feb 2022 08:45:46 +0000
Subject: [PATCH 050/152] Translated using Weblate (Latin)

Currently translated at 72.8% (78 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/la/
---
 i18n/la/LC_MESSAGES/litcal.mo | Bin 10747 -> 8358 bytes
 i18n/la/LC_MESSAGES/litcal.po |  19 ++++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/i18n/la/LC_MESSAGES/litcal.mo b/i18n/la/LC_MESSAGES/litcal.mo
index e81d530f534341dec3ab0772604438df27e28b94..5b5840eea61bfa98dc223e46a0efc02be2faca14 100644
GIT binary patch
delta 2039
zcmZwHZA@EL9LMoP8894<6($H1xUd$OGUQ<lnYt$dhYV)i2vMU+rA=vsqO{D6OuN0%
z#W-K+opUbH?9GrDW=&QTw>V>T4<SaAnJhChGfbRfqI-c4iHR=p`@0+$O+4wppL^~-
zJ@-8PPygIGwIy}6XvrIfvV*vTIOH?tX)MU$i*hR0m})$Yx8W5m!3BH)m*yGMj0dn7
zPvfol1+K*_sP_3wjp5QbsIKeLZ%oQGa-kn=#@n$Umtz!H;BHh02e1&|vCmIn8TF5B
z{VP;IKiK+jww|4D%u4S2Q3I^SO5EVpQ^q{XMG-efZG(MSOZ^ZQ;D=a>Gk6Pri+s#a
zw*EV+V?9*+m8gMMqxx+|&AbyCli7}1?E&=jeskP5_yAc|^D*iL7q9^@qL%swPT<~U
z#?0d{_$tow)=?a0`q%L?zK-Wu##tO>G<&gy<-CY#q${&e>#vc$!o?DFQ8PJ$dhvUx
zz4{upHFMTKP+Q_>dR17Dq>b5z>Zcbqk%uuG2eBL<$0pp3HTZ53`>(zEj2jxr9O{Mh
zcruIG;413JXrwJTW4(mWQvVq{@JTXL13H4*f;86S8GHYGq$~3mYG8#lW|2%u3G2^l
zm;g7F{cWg@9^p&(W2ga4B9k_UQF}XW@1L^uOQ@v1X6wJ&dN!k0k`|#R(7;y!J8eCd
z;(|$-{r1LTyo>q?)J$ekOE-^fxACzLaycrQ%28Xk8nvhG)~(1GOdqOU7}ahRAHw~p
z6-j+=8_ZdMM7>}Eb?$HABvvtvC?3U6(Z{G>#Pc|Ty)4sr_z5QQILmn%%PSWDPZsb3
z^(Q!c-inhr3@l~ZxX_+&M7GCtVk16=%88dzGkFd9m}$PWB{S&YHB^%2P*FemsNWUZ
zdMT=X1>T7rsELKKnD?8PxX=%eT908Cb)C_B30B_whwH*lLd&SFSx2b!5nG9NLZ?Q>
zAyyO0iCW@*;@?H5Wi64*`@MwNVxMlbihe@Lvz^cYHTnmL9zsP&sGitBD2G@G^B|$w
zs?-r$NhPj|j^;l_xuW8of412BOVkNa*+gi`wH+$0i<mXm`%pR3ZR_H0qK#NjD6v|I
zZG;Lb;w3fv?G+t86}GL?%SQd%DJiOTmqM<Xdx#GA%iLmrFISt1CPIfVm^q(!Fe@{j
zpW}1iUv|)at{|Oi4kVnqU`rrT=hO#V1Bo>aPAD9Xgq`G=lN^pX@lY~077vX$L!psK
zJRBN#VsY<5a9tqL;KUM6V&a*|cp{?TJhf->QJdH4dUa}B?}_lsV0$2JcF}2fB$P<<
z+C-f@u;QwFvS3qYtmyeXUvpFDdf9MRmD4peG!jX~&Q6)`uARFE`YcZ8j=rA$p3LN`
z=`7#bDK}8@ru$9BTW-4Y?T+C8%_JHfk3>Vs(9O}u#%|6irm-;#x3Q+Q^uHqx#p7e%
SXx+h@b8b3NmT3*l<opdGcJnd-

delta 4048
zcmb7_YiwLc701VUI%yJ<rgj|X(Mi)yT(Ys_V$!;GY!W9a4RJ!_kXIq<?CxZJ$?o3G
zeYkRpSfsRksM;d9LTw5ZRH2r9K%udap#4&{fLZ}+!v|CWEl8-mN~j_zQh5K)y>~b3
zBrP!V>~H4I%$YO)b7uV1mcNhH-ne$w7Zv4h>I&*#W++vIKbp-C<)yhwt%fhdcK8<T
zfGw>`eHwPcKKLkH0$+v;;p=b%d<)9_W%HC`soDs|^sR8QY&Aqf^WmdV79NM4um%^w
z$Kd<m(@+e32e!di((zxyW%U1)_FLyCc9ud}pGo`u@H+Zip*VT~u9Bl3OFujauVvtg
zwEqlTOaJ?D0sJFe3NJ$b)Z%NDVo$XKN`EaB!+lWZZ-?UOUMO~Ra3u`kDj31JBK27s
zsHC2Sd*F)@Y19&|h-4W!2X26}VL#jihhP?lP(tw}JOfuF;}|>#?|~U)I0QcnzW{#)
zWnUlfYBKT9G=2;3K<CfEUUt6^ehWSfv$$V|&%*Ptn`4Th4)pvPJPkhu?<YZCg)PKM
z6!{611H2Ar!8f5O^am)8|EmK(BpKGDtHiu7<xa>Pm50~E6Og=Ak3%u^6)1{431`C7
zunT?@ZiFwv8{kDKF<*gkaikB*egp8C7Nv$e(P23sE|5XYRSU5q%)sMtGaP_tpg8n<
zh|2MzZm^KW@_iGO5RO7|Y(GSO^$Cc$>KK$Hz7NVRdkD(9)3tQqdB~qS$B)GRJd}n1
zPQSOYO8V=eWcBT7e`nf14CNL$P!4bs-Uz>x_MeBM#A|8)JX}w|Hk*``6ZJt3r-mT;
zrw*mGP)>FnO6*QRiR~jPPeD1!*P%H09F&v(5X!n=Kw0-D+zBs2(nxLN3NT(%2a<-m
z2g=3{6v;y<56>BR0-l4X;Vu&5<M6L=4324Jhfl+Y;XCjFc#_4t;XD%I1$Ypigv-|?
z_Pz=qkbBUDP9XzdgTICy8KnaFH~3TNt|fkO$2z5c0M9}>;beDm!Uv%wRRraQJOz8;
z87N8j1{8&U1Myk?6H2I8-o(Sl{%U~6On4ZIp(9Wh7SetR$^s9*A3g#_neRf8_UBO6
zy`AzMNOG&aR0-)FR4KP5h*jP|TU4&i;79J_JnB~JVd`DfKB^>;6b>9aAc^@A>K^LN
z)Pqz+QbW{wL995w(w9VSl?Fu|mm;|)i6{qN&spPar5z`SWbhWM$S7qbf!Yt(Q00^&
z{XVJ`k~l6O;`dhSM(Q@ITs<k9qtDM-QtPKBDLY7&jH#Dl8lt0=I}@l6LeXBzA?gR>
zR`TzW1d1PU`6QWz%<*L>o{h4-(c(WE?Ou7fHi;Xfk^`FhVXEW@Z%~}LKpmjoPL*(e
zjJk_@3ss8TD#@E!(xGq<)Q+id&v~fjdRsOnt9_?Z3`@qFRW*U<R<wImZx21UYNv)<
z=gzo|8P!tgnNm9LUz(ss-*bI5GXHb^P9@O$tY>|rx7vy=IQhVcg<#z35zqDgtlsZ<
zMW>=orJzTR7fgE5EA!9Re7!E?uhZ6Hrl*gZQpwjj8{BJcMfcsJx7mD8yyWKoxSiFm
zrwgISVPe~R*k{7ZP9x)<;|FEKPE6r|vNdLo70hIO80qh_l>o!OH9j-&=7@Zqw8qn!
zLRNdGa!h-+5aw+`2d*A*%Vk@3Jrg)?rAO^!ZYFhj+=!ppGKB(@vBn4*=WV=kYBD;q
z_=e%DF7u4zC!2@|@x~nDsy3c$>#7xWcgDZzU0m?PY8C0lUT!kpepI}6Oeq#O``$iY
zX}P`teZ)DOI+TWTuUj@1J?i*Awy!vCY$=Xb=!ZmdQs-^S=8&(hP*yvr)a-6_VbO}g
zW@YP}zl);r9<iBm_g*_;z36vsHy)Ib8@+?D21!1puBTy`rdwA3f8IqGt~uXY7c_c%
zVSCL~Ty*ht{o_@))P#Lf8_((-vm053V{x#_F1IRag^+QM5iP$d6w_=^*W~W23*Rh?
zXly+aB1s9O$J~-FSDaw-zbG~J+JYD6whT;t`MU9zXi-N;Tk=|%<gGAvYE8#CT4op<
z{dno4IvI27V=C!~e*Hs~?|gh<%vAEhi%%u5gF~bKKF~D04cxV?o`~NDa>E9?96t_@
zAN`~AiQ1NY-YGbN<lvw)Bu~X)uQQ}g7;t-!dZzJ4urPfhng-+7!IbrGF7SjC@as2?
z9<^K%U*8p)f@g}>cgn`fn_wyxH+~MR_sOE0L@wY|mgFjWra;paroRog+@mgcu~_tM
z(eMn)I;ZFap(oZ0j@5&?p^QJ+o8ut4`gYOqs#UeiY;b!f8Wt+a<|4(VRatF4d^FW+
z$;lhp0@u<5q}jy$_=)wyT(x8>sF1kC#5Bq3uSBs{cRBTQ+E$m$O^Zb1n5<!b@;0Dz
z{8TtiuEy&nz}1rV!t(LZHl7EQ3NsT6k<;GWkD;bbNdM+tM8PXP%SNYGZjMg2x9?_5
z4xDW=e`(9c$+Fy$%LK`Z*;p%Pr6Tr3EnVN6n+g@Z+O>RvDLJODTvTiCtm*A>2+BE^
zC$Sus;*25blX%A&lg^ivFX)n!BN@u6p7j_so%eq_Zo~c6jezFlnkV<1CpXUY9VB0f
Rm&>B=Wp_?3TK?GV{{T#4U=IKQ

diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 5a0c9d88..374b9d72 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2021-12-25 23:32+0000\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/la/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.9.1\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: includes/LitCalAPI.php:224
 #, php-format
@@ -526,16 +526,13 @@ msgstr ""
 #.  7. Current year
 #.
 #: includes/LitCalAPI.php:1864
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
-#| "a Sunday, a Solemnity or a Feast '%s' in the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
-"%s <i>'%s'</i>, aggregata in die %s ab anno %d (%s), subplantata est ab "
-"Dominica, aut Sollemnitate, aut Festu <i>'%s'</i> in anno %d."
+"%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
+"ab %5$s '%6$s' in anno %7$d"
 
 #: includes/LitCalAPI.php:1877
 #, php-format
@@ -647,7 +644,7 @@ msgstr "Pastorum"
 #. translators: context = from the Common of nn
 #: includes/enums/LitCommon.php:67
 msgid "Doctors"
-msgstr "Doctorum"
+msgstr "Doctorum Ecclesiæ"
 
 #. translators: context = from the Common of nn
 #: includes/enums/LitCommon.php:69
@@ -777,7 +774,7 @@ msgstr "Pro religiosis"
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:120
 msgid "For Those Who Practiced Works of Mercy"
-msgstr "Pro iis qui opera misericordiae exercuerunt"
+msgstr "Pro iis qui opera misericordiæ exercuerunt"
 
 #. translators: context = from the Common of nn: nn
 #: includes/enums/LitCommon.php:122

From 6bffddba403e95156947a7be1393634e9c36adde Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Feb 2022 09:37:42 +0000
Subject: [PATCH 051/152] Translated using Weblate (Portuguese)

Currently translated at 2.8% (3 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/pt/
---
 i18n/pt/LC_MESSAGES/litcal.mo | Bin 0 -> 627 bytes
 i18n/pt/LC_MESSAGES/litcal.po |  18 ++++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 i18n/pt/LC_MESSAGES/litcal.mo

diff --git a/i18n/pt/LC_MESSAGES/litcal.mo b/i18n/pt/LC_MESSAGES/litcal.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6b71bb71c5b3a741d5e0fa7202b885f3e0edeb3d
GIT binary patch
literal 627
zcmY+B&2H2%5XTLa1GykLa~N)|kdrRrP-S-!Y2&bw^07)%Xb~58W3s8TcCa13-heaW
zb$Aq>g~<l7!qRX4wmcfofBgIL(NBWw2zi1mko(AcWL!Nmo<Aawkk7~i<U8`~4k15K
z$NS<gArDcnP#x4QDqa(meQgwSZwwI&%4&*`M^LR8BzX~%GEZ2V#nm-gYjrC&mc})G
zBeZFi^kJ>E9hyNH0mn&e2i>$A-oXX$gsizfaSG963QbMZ*7SU646T$8&N`=s_|%R?
zXvnSb;hF^nO>-Isu*&^3e)cZUn3Hg0X{EU|9k)vR5M3q-WI@Vc!O|d3UIk%Tu(EuK
zsj?Y(BWNY~?!V3!TWfpcd!GGUNVvCZE4A8jscNP9w^q3uwe$MPq4BzZRw&xpTk&|`
zQe$;18{_rXJ3Qz^Z=Ezw*<ma*_td#i(h7;)f9=tp6<@5^cf6Hz*lf8r!Y(hXh@Ktt
z#^yc<O_|)N8lUmu?54HOx*Ig_Xr%Pc_#pfJ(JY_OVcIT_B|Kfi>}2j-(bqx>Jx%JZ
jxWSnTc;U`Y-I;@5TUNmoA<Us<*(xvg-<!o@5Hj)y;YP2Z

literal 0
HcmV?d00001

diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index b3963c1f..db134196 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -6,16 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2021-12-14 00:21+0100\n"
-"Last-Translator: Ubuntu <priest@johnromanodorazio.com>\n"
-"Language-Team: Portuguese\n"
+"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
+"Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
+"liturgical-calendar/api-strings/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: includes/LitCalAPI.php:224
 #, php-format
@@ -739,17 +741,17 @@ msgstr ""
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110
 msgid "FEAST"
-msgstr ""
+msgstr "FESTA"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:115
 msgid "FEAST OF THE LORD"
-msgstr ""
+msgstr "FESTA DO SENHOR"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:120
 msgid "SOLEMNITY"
-msgstr ""
+msgstr "SOLENIDADE"
 
 #. translators: liturgical rank. Keep lowercase
 #: includes/enums/LitGrade.php:125

From 3becbde1d7a9983e07c352e15a58e4a46074276e Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 2 Mar 2022 15:31:11 +0000
Subject: [PATCH 052/152] Translated using Weblate (Latin)

Currently translated at 85.9% (92 of 107 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/la/
---
 i18n/la/LC_MESSAGES/litcal.mo | Bin 8358 -> 11793 bytes
 i18n/la/LC_MESSAGES/litcal.po | 124 ++++++++++++----------------------
 2 files changed, 42 insertions(+), 82 deletions(-)

diff --git a/i18n/la/LC_MESSAGES/litcal.mo b/i18n/la/LC_MESSAGES/litcal.mo
index 5b5840eea61bfa98dc223e46a0efc02be2faca14..5c0345da2f981953e65ec302ade4606fcaae0c64 100644
GIT binary patch
literal 11793
zcmchddyHJyUB^!wH-Sw<X+jEZp*b$z+9o@*UfYT7wPU*8N4#ZU_O9(XBr11i&d%I=
z=HAJDtg{hqMN1{~M}f8~5>@}8P*nnfDg{-D3JGY-LkI*YQYoPJ5BQ@k52;0!5D2M!
ze&?L~nAx>c$YbQQ-?{gmd(Q9t-oM}YYxf`cxZ?9P<3||>?o#Ug;J>|&KYYG%k5UK0
zZ-Nhk_kN#JZvqd3J@7R6KJZiE45+_fsRzKz;C<jW*Z?z7-urcsrPS|(vc(^RZv_7g
zl=*)T{s{PW@CQIOq0|ooZvf?e4ZZ<91<Lcs!8e0f{q+!(b>8o<KkTnR3H}iGe+v})
z{t$c{_=3Ow5Ac4j@4nYPe>3<Ft{dR%!7cEI!2o2c+65s|{k*^aMNroLRZ!;t4k&bf
z9+Y+e0!+cLf^z;#OoC<VI=BwDK;gslpgjK)csKZ$pzQMkI0b$c6n;-|$Q=9y@N?jI
z!FPk7gDC^>K{oG$9|SLe-vU1ko`9J`$5%jke}zruy)S@Y2j32{x4;Pw^K;<Gzz>5D
z!aP~`H^6@f--t4N6#OnI_dkko{s9yw{Ved0;NO5xAWY%cQG_JtItd;C&w(th=0G{u
z6;Sly1E9$Nmd8(lBKOaO4}pIRz83s8DC>L&6h8eIi0Uf!7W+>f0FQC`5cqa*0~GnE
zpwMv(l>L4geEu~`{R;S2u9q<ak+bpmUhqk-KMp<vehWMUwtmdf^+^zssNV&TfPdug
ze-jkBi;@X_4}kZ9ZvkPwIs&qkIs?l2uKN1}Q0RCcDEjaT5YegM_V@q5Uw;J@{r`r)
z{!f2>4@`m;>P?`W;~01dyy&k7pzz^C{`wQ(!(2ZP$~nFU!V2}TAgZeF)(-CnMPJ_r
zirfx^BG<DXmq0nkC9nhbK$-tnpv?a=_%85YK;g?HI2Cz*(c>jh_IncKpW5cnbKoto
z3*LngKMURf1Msasj&6bP_4sA*G}qG{_9I{q6gvLf<GUxF9KQs9f%^}=gLlDy0(Zcl
zISfz0zXQcCo<^Ae488zn;O`xE`%V1>XW{xo;0^Gphn4zM@XtY!>o1|qa;{$kMZbO%
z#6;9*!6x`8;631XK;hT_fUsIU&~S1;0cx(-!MngADC=aPy!V{H{s1U?atnkM^=S}R
zslNt=-`@u1z1Oj+;Jx5$z%7QzS3a{2?BCb(7gFr!wftRXOt?$+6u8L{dxD+nDg!pz
z{Y6Jt8J8F{4Eanlev)xcF8IJ=D|4X(@mYTcSh_ER_c25#<-GC{y_L@jLv&d_!bABy
z>A=b!kz3mmzCXg4V~9-^A4H<28H)_Dm3J~07*8{b&!hg!y&kW4TmmmJgs1ZPDF^BV
zDDsuhPcx1)))?m*^9;=1em3}v%2=79Le^)<gU98M|2zgF7Im_?QA5!U&3G3BQCgq4
z4vLOnXPjk-oUbuXF^Z4)3el$n{swMAU6k*Wsa^<nb-b;!p3&>=EZ8w}HQ!6ZG#dn|
z%;+#9*v?F%7l+}n7eu?o-Im#o6I0zjJUMeHJ*;~{s$0fHx?|e?ATb>s=!LkQ#YwT#
zd@oPhJ)MS8+t{slO_1ox<A*v^Iv5W7VLNE`c@ozio;cLeM<!1mN{=?x;YqgH4*LC6
z#}TV<=8;etMz#4Y#i0^Mq8x9@1Zk%2t6{3!rf*tFkU<?wa7?~4op*vr?#LT{S$Fu7
zCw_a@Nb{jdQqy6L)~<bnb=(Fclr+_azDb#=uZBq%Dp!MKSIx(Rff>Z?8^)1ZFzv)x
z=F86Wanwyr*FMrPSucb;VPy2RI7xfqkl7u0Brgg}0|X`vRgTN4T3Vdj+;V^Q`jXzd
zxTsgwFE6MiR$A=jyvaKDYAJ?w9Aab{nRYSm@3P&%M0Vb4n5OI&B%yIHmN$0gG}*3S
zZyh52n)W@pcF(KJVyWWI^2r7Qij(qkGYF%symG9wmzPaH?1pjfDA_bSCJFkwIEtN8
z+^o}9-Ww-ibR9><=sioy=q*Q&ySLSgQ-srt^+po3v#^b*5!DUL)>V_VcP&wYz7VFp
zc<3(*7Nc-A76p1Wj&ArVYq?{8pf}>7@i!|ag6-~Jq~}_#7-l8$z$&6B7g}YvSj7~B
zNGK9%F4t9aMl4Pg4%-veJuzax==U&jid*P6_Q$kGn1-cxMDxXZ9_8-1F`u&bdfM7+
zA%#`Z_b}+I^$6_}qfhm=kUVqd)G<q=vo)NC7}qdPu+OHx9_Knk^Ex^)&*Ub}!l-Mh
zc5b87RO>^r1(d*Al<ZJQaU+3oiP~IWSzKLP-ny<fgDg+PTNK0;PH8_I-89DS6=Zh9
z&A4v{QJC#IGjGRuu&`rNeKX8@`^^}4NnuvG#~?ye!lCs+@HfU(tglTq6yuVbYD*-8
zPh~gca~S`JfQ}ZN_wF&Wet@&LgTBEJCWRjqXE~+!_ftraMUmU#Vz%QYQroku;cO7(
z{B6r*H^sNloYJ_grWM-pllJ?R#&2};q>#=&@x)H?-j!u;a9(R8qJk?X%2+tXO*3PJ
zarpiz9CUO81;Blw2%LSyf9~Z~8HFk}g?W3_^rTf&*dc7aP3U>_5Gpn<i*o&be3LL^
zNs?n&GI7cxs{MAm{WgzSQjiG|?zX!nK`4R5%l?(wY=4!J^BfkP8dDj_-a~JpqF#!Y
z7e33l91q0d;e%1xai>v9!zxyu<^=iO@n8*$3cVipPp2%Ac%3mK&)k7X@nE+R78d7J
z1D5oVGm&O2>IcsI9iC+8u{}?}QhSP;S)cp8?|K_fa_rl2vhwt!wpbcNEuXp>=lu?j
zjqI@{&Y>1KvL39nzU7EMe(cy8ebfsbPq-(8n<|;y@_yIo>yjFJ-I*K4X+~nW5#)VT
z%sEQSja1h?Yr@-UW*uuPIV9e@ALAZ%+vZ95>$YThK4{bx%=+*mh&Z(_<AhId$DDo;
z#ZZt`;l%suaR=7a*fg0mp^Zr0D?J(WtQBL?1wmyLOUsOxck4UYJp0uo#IfQfhQFr1
zMqKY%WeL(7me((m>FS#zJb2TIb<m1)3BzG}(E7(QYD#S)2_Ip;PjQNjUy|n1d1vrG
z-8PAL;JkWdGCew~TJG#uNjdu@YAGoTan5U<&GyFxQGYZ_i0A<3(3e7_qCN|5ppkeo
z0-K>CsuwP3_06zPUL(0MLtizi6dihb+2u=-#wkS-a)q=h_!Ua!gt}~p$;dW#9hBAC
zX+SMf9*Fal>%N?)eObjF1%t9aswYLIEZdZBT^Ac~=g+_Q;Je2biG8EhZC!P25^M9J
znd73Zb9uL^`8pQgaDc~AFmky&WE&(qP0BADY;exm-VClNcsWg_MmDty$|`qnoR)R1
z-RyTXVpqw>|Np`6bgVmWZuORqz&?SbsIaR*LatnJKr+tCkR%TihGF1d76cTcL=m}d
zY^tB`MJ4qj2dYd+73JXd#ktGMRWWmE4~N%@OiG%o>h8x@3zfm^*ya_!wvY;&;-6B@
zM?IX<HF9MMf^!{=J=^EOA}+-w`#g}WdY{|tNhhS5-_={;z$l9DVMx(A%#&f?D4d}Z
z4?-bo3liJ>*^u<SP5iAt+K&6AzeU2o$#d#V-!_3<PnE1ymR;`H^2$cgANa|3&1x~X
zvGNsy!lz|MQOUi>w6n%?r*Rdfz>Ux96>6VIA6W^h>AG}8`g-0MK}RPp8>t@~t7$jv
zG%n=bw6PV>>WPi@#$~e;%KME4QiNG8B5SO!Hx}mf#r4_M<%geKUt645fuoHr2@ic~
zm(1#=D=RB{ZEkf@pIcm=TV8qR+`_`;#m&w0OpUsE&^3)M6ATKX&h@fvn9fd5TZLl{
z(|k|di>P+V7&^3lo(tn<J046A-MP}~etC*UQOZpR!?2N3`$k=!2h-JFvqX`J)#cU2
ziWxJ_V-ti^iYN%*9dfeFJey4q`^1g2q&`&JCVTA4)>7kiHP6St#$wctQHk!XKHUnl
ziH&|vPo+U8Xpqk8XlO6f$Bv)X?(1WbKKPiPIXm%0<8c$wf3YmOW?FJkeX==otT{8G
z7SLtst=UTOi=WYJh-)V#F$>f3nWS_@3o#4^<$bE-vb8Apz5DIho+8^#2bxYm(O6t;
zw`sA3>=CpGj8W{ni6-fiIJmkF9ieC8pYCZV7C}7I?R>zpgD^s&B$IH<kww_Wme`dE
z=fd+6`_D~>=Y4qs+u5KKlAEXcnLMa1V$WC}-ZWMH?KE#8BBFcdPQ(FNpgyCbfli_c
zGEPZHMGot{4&1C4!*mDfB?^)C<cholP1EyvKg(S^F=k@XM&zj}Sm@h`ykByaUgGA~
zl~oUVVSROZZCNZ*OFb^a4_mb3<i@u2V*QO`%^=AK_F)=Cw8v6C$orwG-We1fxsapC
zBJ~^OKGI(-H^>ogv5EBxTJE?>wd-=pz0ZcW&sfd1RK<4VJPP!VZPL2OiEA~co-R>-
zA*3Xrq^f)}Ms0P!BuLIbdZcoaqipY@o^O`Ka<ZedoDA<!yO1gZa}*B3;C76kM^DVN
zG$C`7<OBmNwPBdH<DomVU7R<pOw0%;=^+N~o}0#Z8f&4WAs7bsi|5tIOF^rJ6F|9a
zizbf@JvYQ2qXgQJ_{xRVh~>hzY#XxPg4|;h9W9*)axmX|?7H^2wNGnu(t<2ae{b&*
z{quF4j$3q(t%h<0L)0{S7-u-Dh@jxtfR(HBt1C}DAp~PFNzl|=dEp5(VU8{$CW8YS
z+9jIh@_3kjhzk{sw|eGOf0%@Pp$+N!kaL^m3zi?1Nn`ArmV>cce3m*jPi>Ot`i>+s
zb;mI3vq*&eEIem@TID~;7>lN3>1@P$goUYTW4g#lI*;`PyX-oaOfSMy80(_@7>cKK
z9mhSw!=a7#8=Xg$UgKPw{wXP&-Oti2jZW)T1B$&c+D4a)UL&&btwvovw6O(eTe??d
zS3RY)3t`%&Jm@4u=rkMzq=<#y*}kIn>b9>~h_sso9i)pS>uxnN1J9Q+I!m^QI#5(e
z7+?#lmeN-$)w1et`B<_Ob~#f?j%}^fInQrYJ4IMvmZi(}s_JX{#rBJG^_JqRvhaSg
zA8i~u+1sXJouZ)RA_ukQn`;pwP1`XnER(=qu~Dp(gcZla&jMwaaMUU6N6~1P&{1SN
zgf)sVl{!gxmgat&h)1d#bZ!&d5`6VHDQb_P#;ux$PSLR2n}byTc1%Nk24q_wy}0eX
zV%6P~AB`v~Bm+q#AO+$syGf3f*E1`+92E4C&6G&TDU~xl7e&~eboWASdwp>~r16hk
zVN^ans<|nRhalJu!YsqBmB|JT7HRh3(Xn9P%NrEhL2`l_7qMWhrROLl$nhhb`>6^E
z+FxEu8@1K>qRlD?tr)5ao3@unP;++gtkk`aTd(3l+03if9_iz~vb#4`6(3$=6lv;p
z`_o(|!b8wRP=120{bWt#uceuy1Ra{aZ6+R6^Zqw8<Q0X~e`U}bBZ@$Du62GgJvZGt
zUnyXbg%gpbE^|SwP;bH!+$MRpJ-nKtAaMD;L6)&4JMv}LNbk-upNwAqYe6Y(Ix%$u
zITQheJUVc_x{QT-0Y8a(7fi~v6A=3~l`ydst#)lS2}zl_C`ZPQ?cwEvDQgh*4a9N+
z9m%hper}CqcYA{=^@WQ)U&<L@f;el=Ouww*sxXq8{SbGbvKIT4%MeDCpkt)rX8S(8
z!dKgaE8^rx=gmg^vDj<vdM%`TDwQ8zXdjnY6orHaJWnOJjFzq3v5rwPFQ~+OdMZn0
zk}XQlGkUDDl>EORNm^9<9q7gP!gxncxt(JqL{xZIoOI7Yad?F%#rTRhIHJTy&;Kbh
z>57jdC%V04?sSYX+x5LR(&@RiHHuPOT`x(Zr<bqldH$b_l$&*@fZ0-^@=LRHy+B)?
zr={nSb_9hCiD;@WnpTGvO$X17i*WrmD%;W9TV{X*WFazq`YIGfqt9#U<`+LR_N;u@
zx8TB1?U=qw_#Y&JZNSlZQAyr1iGru8UZEtF3WeOVY{8j<JR8U}=(NuYiQ!SL?;#_$
m#Ib*B%L)9cZK+ffk(#vNICOonBz~5dHc&QmRzY9t`u_#CpiLD3

delta 1795
zcmZA1OGs2v9LMp$Gd{~QC)2WrW7;&8y|dEF%Isl2dVtt_B~*lqpj?DBy0D09VN($;
zLWmxVFlZJf712u~5?Vx&LI!CH)j}(1QPB5yJ3(~tKcD-*bG-LF{%2ZuU0oe{7l=P+
zv`xe$;;hf?0H!AJLA#S^mWv%Y4tp>YhwvySCz;L1<2V*Oa1?goZ0texPf0f8(t@Z*
zhcVqOVsp6AKdi#>SdF7`FOI<m)B}!V8eVeWx8nrz`!0Wjdd^3ee{;D%#VmvS>8JsQ
za0(WCdBkix7Xfb6yADklB0r0%co(zq8IHjB$e(?3`FGTV^`-h}paz<YdhUGG%*&85
zStV+<YcQSn+ZEU0HnOVr0QG`SEWnqjrT&G7v2mo?01o46?B=cYxR2?7!Pj^OpRkPG
zSj%V{aRJNu5^o}pvL>y+Ms|{mc#NWEasl<?8>qc{i`trA=MU7Dq%*x73?pS@8&J=w
zKuu&b`mq+XaVO5h2Aqo50_?x`<~cVskY3aa2k=%Lv%!hvZFJHW+;hIdgXEvF2=`E#
z8qfvQ7Tm-z-gEc+kw@82)WFi{%pzH4ChN~?SUxvY{e`FpZRJDv_oD`I1evs*NA2x(
zcmIydU!jV&&*fiT?q}30(g11#1$^XVnalS_xL^|2>~5ULS>)}gnRKI;ZUEVC^RW+d
zG^&`gQCpUW+S4V@Qe+HPh3Z#_>Q|2&u^F`@kr%E*uX7Off+5to|Aj{|hiUA^i}(nA
zjH(5n;$f^{nLgk{JcL(R&exbd`Oojk5O$L9=InVZPT?@Hh!t|7JugAF$I5UH?m*SV
z3Ditlkw3f6hqmMy2C)xSWC<jCP73P((p;W}>OUE0Vi9U$bvTyy+c7Tmj~AV77)P!%
zx{P4uy<fPsSVm|WwKa<fwJM^NSVHL3s0E2ULNyU0RuKO-otD`|BJcMKVzv9W#3`x?
z6;CCh0c!MXh;l+rM<`4b6RIH=!qyX-t=e=#E2+X&)6x9fR4Z!U`Dcs0pG2JiwUvaH
zT-%|x@DDb_xg1p^>s&785{1NKLWQ+}*g&XJB3@Cm-(J(vQ)Amoy=v62or)q?cWKm$
zEhUPS{MRbTR}u3F9mQ$U{-m1N<>X?2Y)k5`xM(Oa7|kBFGPW(F#21UtiYCN{CpGwE
aUBOFn(VWoZXlrhHEErDp#ad>b^8W@3^`RjE

diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 374b9d72..c0a2e153 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-02-13 12:37+0000\n"
-"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/la/>\n"
@@ -157,16 +157,13 @@ msgstr "post Feria IV Cinerum"
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
 #: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been added on %s since the year %d (%s), applicable to "
-#| "the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
-"%s <i>'%s'</i> aggregata est igitur in die <b>%s</b> ab anno %d (%s), ergo "
-"viget in anno %d."
+"%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
+"ergo viget in anno %6$d."
 
 #: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
 msgid ""
@@ -180,18 +177,14 @@ msgstr ""
 #.  3. Current year
 #.
 #: includes/LitCalAPI.php:942
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' either falls between 17 Dec. and 24 Dec., or during the "
-#| "Octave of Christmas, or on the weekdays of the Lenten season in the year "
-#| "%d, rank reduced to Commemoration."
+#, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
 "Octave of Christmas, or on the weekdays of the Lenten season in the year "
 "%3$d, rank reduced to Commemoration."
 msgstr ""
-"Accidit %s <i>'%s'</i> aut infra 17 Dec. et 24 Dec. aut infra Octavam "
-"Nativitatis aut infra ferias Quadragesimae in anno %d, ergo reductus est "
+"Accidit %1$s <i>'%2$s'</i> aut infra 17 Dec. et 24 Dec. aut infra Octavam "
+"Nativitatis aut infra ferias Quadragesimae in anno %3$d, ergo reductus est "
 "gradus ad Commemorationem."
 
 #. translators:
@@ -202,10 +195,9 @@ msgstr ""
 #.  5. Current year
 #.
 #: includes/LitCalAPI.php:964
-#, fuzzy, php-format
-#| msgid "'%s' is superseded by the %s '%s' in the year %d."
+#, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
-msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
+msgstr "%1$s '%2$s' subplantata est ab %3$s '%4$s' in anno %5$d."
 
 #: includes/LitCalAPI.php:984
 msgid "Apostolic Constitution Missale Romanum"
@@ -223,17 +215,14 @@ msgstr ""
 #.  9. Current year
 #.
 #: includes/LitCalAPI.php:1006
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s', added in the %s of the Roman Missal since the year %d (%s) "
-#| "and usually celebrated on %s, is suppressed by the %s '%s' in the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
 "(%5$s) and usually celebrated on %6$s, is suppressed by the %7$s '%8$s' in "
 "the year %9$d."
 msgstr ""
-"%s <i>'%s'</i> aggregata in %s Missalis Romani ab anno %d (%s) et plerumque "
-"celebrata in die %s subplantata est ab %s <i>'%s'</i> in anno %d."
+"%1$s '%2$s' aggregata in %3$s Missalis Romani ab anno %4$d (%5$s) et "
+"plerumque celebrata in die %6$s subplantata est ab %7$s '%8$s' in anno %9$d."
 
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -246,16 +235,13 @@ msgstr ""
 #.  8. Current year
 #.
 #: includes/LitCalAPI.php:1042
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
-#| "a Sunday, a Solemnity or a Feast '%s' in the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
 "superseded by a %6$s '%7$s' in the year %8$d."
 msgstr ""
-"%s <i>'%s'</i>, aggregata in die %s ab anno %d (%s), subplantata est ab "
-"Dominica, aut Sollemnitate, aut Festu <i>'%s'</i> in anno %d."
+"%1$s '%2$s', aggregata in die %3$s ab anno %4$d (%5$s), subplantata est ab "
+"%6$s '%7$s' in anno %8$d."
 
 #. translators:
 #.  1. Name of the first coinciding Memorial
@@ -264,16 +250,13 @@ msgstr ""
 #.  4. Source of the information
 #.
 #: includes/LitCalAPI.php:1081
-#, fuzzy, php-format
-#| msgid ""
-#| "The Memorial '%s' coincides with another Memorial '%s' in the year %d. "
-#| "They are both reduced in rank to optional memorials (%s)."
+#, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
-"Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
-"ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
+"Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
+"simul redunctur in gradu Memoriæ ad libitum (%4$s)."
 
 #: includes/LitCalAPI.php:1102
 msgid "the Monday after Pentecost"
@@ -288,16 +271,13 @@ msgstr "dies Lunae post Pentecostem"
 #.  6. Source of the information
 #.
 #: includes/LitCalAPI.php:1158
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been raised to the rank of %s since the year %d, "
-#| "applicable to the year %d (%s)."
+#, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
 "applicable to the year %5$d (%6$s)."
 msgstr ""
-"%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
-"%d (%s)."
+"%1$s '%2$s' elevata est in gradu %3$s ab anno %4$d, ergo applicatur ad anno "
+"%5$d (%6$s)."
 
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -308,16 +288,13 @@ msgstr ""
 #.  6. Source of the information
 #.
 #: includes/LitCalAPI.php:1180
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been raised to the rank of %s since the year %d, "
-#| "applicable to the year %d (%s)."
+#, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
 "applicable to the year %5$d (%6$s)."
 msgstr ""
-"%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
-"%d (%s)."
+"%1$s '%2$s' elevata est in gradu %3$s ab anno %4$d, ergo applicatur ad anno "
+"%5$d (%6$s)."
 
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -328,16 +305,13 @@ msgstr ""
 #.  6. Source of the information
 #.
 #: includes/LitCalAPI.php:1190
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been raised to the rank of %s since the year %d, "
-#| "applicable to the year %d (%s)."
+#, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
 "applicable to the year %5$d (%6$s)."
 msgstr ""
-"%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
-"%d (%s)."
+"%1$s '%2$s' elevata est in gradu %3$s ab anno %4$d, ergo applicatur ad anno "
+"%5$d (%6$s)."
 
 #. translators:
 #.  1. Name of the festivity
@@ -346,16 +320,13 @@ msgstr ""
 #.  4. Source of the information
 #.
 #: includes/LitCalAPI.php:1224
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been raised to the rank of %s since the year %d, "
-#| "applicable to the year %d (%s)."
+#, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
-"%s <i>'%s'</i> elevata est in gradu %s ab anno %d, ergo applicatur ad anno "
-"%d (%s)."
+"'%1$s' declarato/a est Doctor Ecclesiæ ab anno %2$d, ergo applicatur ad anno "
+"%3$d (%4$s)."
 
 #: includes/LitCalAPI.php:1232
 #, fuzzy
@@ -374,16 +345,13 @@ msgstr "Dedicationis ecclesiæ"
 #.  8. Current year
 #.
 #: includes/LitCalAPI.php:1337
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s', added on %s since the year %d (%s), is however superseded by "
-#| "a Sunday, a Solemnity or a Feast '%s' in the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
 "superseded by the %6$s '%7$s' in the year %8$d."
 msgstr ""
-"%s <i>'%s'</i>, aggregata in die %s ab anno %d (%s), subplantata est ab "
-"Dominica, aut Sollemnitate, aut Festu <i>'%s'</i> in anno %d."
+"%1$s '%2$s', aggregata in die %3$s ab anno %4$d (%5$s), subplantata est ab "
+"%6$s '%7$s' in anno %8$d."
 
 #. translators:
 #.  1. Current year
@@ -396,15 +364,13 @@ msgstr ""
 #.  8. Source of the information
 #.
 #: includes/LitCalAPI.php:1365
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s' has been suppressed by the Memorial '%s', added on %s since "
-#| "the year %d (%s)."
+#, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
-"%s '%s' subplantata est ad Memoria '%s', aggregata in die %s ab anno %d (%s)."
+"In anno %1$d, %2$s '%3$s' subplantata est ad %4$s '%5$s', aggregata in die "
+"%6$s ab anno %7$d (%8$s)."
 
 #: includes/LitCalAPI.php:1423
 #, php-format
@@ -482,16 +448,13 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s '%s', usually celebrated on %s, is suppressed by the %s '%s' in "
-#| "the year %d."
+#, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
 "'%5$s' in the year %6$d."
 msgstr ""
-"%s '%s', celebrata plerumque in die %s, subplantata est ab %s '%s' in anno "
-"%d."
+"%1$s '%2$s', celebrata plerumque in die %3$s, subplantata est ab %4$s '%5$s' "
+"in anno %6$d."
 
 #. translators:
 #.  1. Name of the first coinciding Memorial
@@ -500,16 +463,13 @@ msgstr ""
 #.  4. Source of the information
 #.
 #: includes/LitCalAPI.php:1721
-#, fuzzy, php-format
-#| msgid ""
-#| "The Memorial '%s' coincides with another Memorial '%s' in the year %d. "
-#| "They are both reduced in rank to optional memorials (%s)."
+#, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
-"Memoria <i>'%s'</i> coincidet cum alia Memoria <i>'%s'</i> in anno %d. Ergo "
-"ambo simul redunctur in gradu Memoriæ ad libitum (%s)."
+"Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
+"simul redunctur in gradu Memoriæ ad libitum."
 
 #: includes/LitCalAPI.php:1842
 #, php-format

From 8330fa096b7e0a4154dcc6e00a3d7100d81f1896 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 13 Mar 2022 18:32:29 +0100
Subject: [PATCH 053/152] only needed until 2002

---
 nations/Europe.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nations/Europe.json b/nations/Europe.json
index 056afa0f..7709a320 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -104,6 +104,7 @@
             "Metadata": {
                 "action": "createNew",
                 "sinceYear": 1999,
+                "untilYear": 2002,
                 "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
                 "decreeLangs": {
                     "DE": "de",

From 6cf80da677a203ccfdd0d6b0a97aeebd63b3e011 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 14 Mar 2022 07:07:59 +0100
Subject: [PATCH 054/152] fix typo

---
 includes/LitCalAPI.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 6a02d781..94d64bb0 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1822,11 +1822,11 @@ private function handleNationalCalendarRows( array $rows ) : void {
     private function applyNationalCalendar() : void {
         //first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
         if( $this->WiderRegionData !== null && property_exists( $this->WiderRegionData, "LitCal" ) ) {
-            $this->handleNationalCalendarRow( $this->WiderRegionData->LitCal );
+            $this->handleNationalCalendarRows( $this->WiderRegionData->LitCal );
         }
 
         if( $this->NationalData !== null && property_exists( $this->NationalData, "LitCal" ) ) {
-            $this->handleNationalCalendarRow( $this->NationalData->LitCal );
+            $this->handleNationalCalendarRows( $this->NationalData->LitCal );
         }
 
         if( $this->NationalData !== null && property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData->Metadata, "Missals" ) ) {

From cdf8bdb99f8ddaff52382259ec600a6ec33058a2 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 14 Mar 2022 07:30:00 +0100
Subject: [PATCH 055/152] start to create setProperty and moveFestivity cases

---
 includes/LitCalAPI.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 94d64bb0..92395bb4 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1791,7 +1791,7 @@ private function createNewRegionalFestivity( object $row ) : void {
     }
     
     private function handleNationalCalendarRows( array $rows ) : void {
-        foreach( $this->WiderRegionData->LitCal as $row ) {
+        foreach( $rows as $row ) {
             if( $this->LitSettings->Year >= $row->Metadata->sinceYear ) {
                 if( property_exists( $row->Metadata, "untilYear" ) && $this->LitSettings->Year >= $row->Metadata->untilYear ) {
                     continue;
@@ -1813,6 +1813,12 @@ private function handleNationalCalendarRows( array $rows ) : void {
                         case "createNew":
                             $this->createNewRegionalFestivity( $row );
                             break;
+                        case "setProperty":
+                            break;
+                        case "moveFestivity":
+                            $festivityNewDate = DateTime::createFromFormat( '!j-n-Y', $row->Festivity->day.'-'.$row->Festivity->month.'-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                            $this->moveFestivityDate( $row->Festivity->tag, $festivityNewDate, $row->Metadata->reason, $row->Metadata->missal );
+                            break;
                     }
                 }
             }

From 5b5eb03eadeb34760224b99c23a28f3e0e0927de Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 06:31:01 +0000
Subject: [PATCH 056/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 9fb2dac9..e10a9adb 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From 428d6a7b533d34a9c67dbd92cd18601a9832d726 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 14 Mar 2022 07:31:06 +0100
Subject: [PATCH 057/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/es/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/fr/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/it/LC_MESSAGES/litcal.po | 15 ++++++++-------
 i18n/la/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/pt/LC_MESSAGES/litcal.po | 12 ++++++------
 6 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 34cf5b6d..80814d7e 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 04470146..24421146 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -425,7 +425,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -439,14 +439,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index e3c1c701..57f1368d 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 0bcb34e7..2b6d56e8 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -442,7 +442,8 @@ msgstr ""
 #: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
-msgstr "Errore nella lettura o nella decodifica dei dati Nazionali dal file %s."
+msgstr ""
+"Errore nella lettura o nella decodifica dei dati Nazionali dal file %s."
 
 #. translators:
 #.  1. Grade of the festivity
@@ -452,7 +453,7 @@ msgstr "Errore nella lettura o nella decodifica dei dati Nazionali dal file %s."
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -476,7 +477,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -490,7 +491,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -499,7 +500,7 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index c0a2e153..8ebe3936 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -471,7 +471,7 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -485,7 +485,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -494,7 +494,7 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index db134196..bcb2607d 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-02-13 12:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-14 06:31+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1926
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1842
+#: includes/LitCalAPI.php:1848
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1864
+#: includes/LitCalAPI.php:1870
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1877
+#: includes/LitCalAPI.php:1883
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From dbd77608bad2473dae3fc162425fbcaa0273c010 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 16 Mar 2022 19:40:41 +0000
Subject: [PATCH 058/152] Translated using Weblate (Italian)

Currently translated at 100.0% (12 of 12 strings)

Translation: Liturgical Calendar/Memorials from Decrees
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/memorials-from-decrees/it/
---
 data/memorialsFromDecrees/i18n/it.json | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/memorialsFromDecrees/i18n/it.json b/data/memorialsFromDecrees/i18n/it.json
index ea8b8d58..4347705b 100644
--- a/data/memorialsFromDecrees/i18n/it.json
+++ b/data/memorialsFromDecrees/i18n/it.json
@@ -1,14 +1,14 @@
-{
-    "MaryMotherChurch": "Beata Vergine Maria, Madre della Chiesa",
-    "StMartha": "Santi Marta, Maria e Lazzaro",
-    "StJohnXXIII": "San Giovanni XXIII, papa",
-    "StJohnPaulII": "San Giovanni Paolo II, papa",
-    "LadyLoreto": "Beata Maria Vergine di Loreto",
-    "StPaulVI": "San Paolo VI, Papa",
-    "StFaustinaKowalska": "Santa Faustina Kowalska",
-    "StGregoryNarek": "San Gregorio di Narek, abate e dottore della Chiesa",
-    "StJohnAvila": "San Giovanni d'Avila, sacerdote e dottore della Chiesa",
-    "StHildegardBingen": "Santa Ildegarda de Bingen, vergine e dottore della Chiesa",
-    "StThereseChildJesus": "Santa Teresa di Gesù Bambino, vergine e dottore della Chiesa",
-    "StIrenaeus": "Sant'Ireneo, vescovo e martire e dottore della Chiesa"
-}
+{
+    "MaryMotherChurch": "Beata Vergine Maria, Madre della Chiesa",
+    "StMartha": "Santi Marta, Maria e Lazzaro",
+    "StJohnXXIII": "San Giovanni XXIII, papa",
+    "StJohnPaulII": "San Giovanni Paolo II, papa",
+    "LadyLoreto": "Beata Maria Vergine di Loreto",
+    "StPaulVI": "San Paolo VI, Papa",
+    "StFaustinaKowalska": "Santa Faustina Kowalska",
+    "StGregoryNarek": "San Gregorio di Narek, abate e dottore della Chiesa",
+    "StJohnAvila": "San Giovanni d'Avila, sacerdote e dottore della Chiesa",
+    "StHildegardBingen": "Santa Ildegarda de Bingen, vergine e dottore della Chiesa",
+    "StThereseChildJesus": "Santa Teresa di Gesù Bambino, vergine e dottore della Chiesa",
+    "StIrenaeus": "Sant'Ireneo, vescovo e martire e dottore della Chiesa"
+}

From 715c28ac7b8113df0aa2c8ad81092828a13c619b Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 1 May 2022 14:36:10 +0200
Subject: [PATCH 059/152] add Roman Missal metadata

---
 LitCalAllFestivities.php       |  1 +
 LitCalMetadata.php             |  5 ++++-
 includes/enums/RomanMissal.php |  7 +++++++
 nations/Europe.json            | 12 ++++++------
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/LitCalAllFestivities.php b/LitCalAllFestivities.php
index 89336674..77ceee2c 100644
--- a/LitCalAllFestivities.php
+++ b/LitCalAllFestivities.php
@@ -34,6 +34,7 @@
                 $key = $festivity[ "TAG" ];
                 $FestivityCollection[ $key ] = $festivity;
                 $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+                $FestivityCollection[ $key ][ "MISSAL" ] = $LatinMissal;
             }
         }
     }
diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index c78b4263..db66efff 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -1,5 +1,7 @@
 <?php
 
+include_once( 'includes/enums/RomanMissal.php' );
+
 $requestHeaders = getallheaders();
 if( isset( $requestHeaders[ "Origin" ] ) ) {
     header( "Access-Control-Allow-Origin: {$requestHeaders[ "Origin" ]}" );
@@ -58,7 +60,8 @@
                 "NationalCalendars" => $nationalCalendars,
                 "DiocesanCalendars" => $diocesanCalendars,
                 "DiocesanGroups"    => $diocesanGroups,
-                "WiderRegions"      => $widerRegionsNames
+                "WiderRegions"      => $widerRegionsNames,
+                "RomanMissals"      => RomanMissal::produceMetadata()
             ],
         ], JSON_PRETTY_PRINT );
         $responseHash = md5( $response );
diff --git a/includes/enums/RomanMissal.php b/includes/enums/RomanMissal.php
index 24c8e350..76cb87f8 100644
--- a/includes/enums/RomanMissal.php
+++ b/includes/enums/RomanMissal.php
@@ -92,4 +92,11 @@ public static function getYearLimits( $value ) : object {
         return (object) self::$yearLimits[ $value ];
     }
 
+    public static function produceMetadata() : array {
+        $reflectionClass = new ReflectionClass(static::class);
+        $metadata = $reflectionClass->getConstants();
+        array_walk($metadata, function(string &$v){ $v = [ "value" => $v, "name" => self::getName( $v ), "sanctoraleFileName" => self::getSanctoraleFileName( $v ), "yearLimits" => self::$yearLimits[ $v ] ]; });
+        return $metadata;
+    }
+
 }
diff --git a/nations/Europe.json b/nations/Europe.json
index 7709a320..18562254 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -3,7 +3,7 @@
         {
             "Festivity": {
                 "tag": "StBenedict",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 11,
                 "month": 7
@@ -22,7 +22,7 @@
         {
             "Festivity": {
                 "tag": "StsCyrilMethodius",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 14,
                 "month": 2
@@ -42,7 +42,7 @@
         {
             "Festivity": {
                 "tag": "StBridget",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 23,
                 "month": 7
@@ -65,7 +65,7 @@
         {
             "Festivity": {
                 "tag": "StCatherineSiena",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 29,
                 "month": 4
@@ -88,7 +88,7 @@
         {
             "Festivity": {
                 "tag": "StEdithStein",
-                "color": "white",
+                "color": ["red","white"],
                 "grade": 4,
                 "day": 9,
                 "month": 8,
@@ -120,7 +120,7 @@
         {
             "Festivity": {
                 "tag": "StEdithStein",
-                "color": "white",
+                "color": ["red","white"],
                 "grade": 4,
                 "day": 9,
                 "month": 8

From a7e85de029fec3f2952129b97fc0428c740232cc Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 1 May 2022 14:37:57 +0200
Subject: [PATCH 060/152] fix issue #109

 was not properly initialized
---
 includes/LitCalAPI.php | 46 ++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 92395bb4..4fa3f737 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1629,20 +1629,20 @@ private function handleMissingFestivity( object $row ) : void {
         $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
         if( $this->Cal->inSolemnitiesFeastsOrMemorials( $currentFeastDate ) || self::DateIsSunday( $currentFeastDate ) ) {
-            $coincidingFestivity = new stdClass();
-            if ( self::DateIsSunday( $currentFeastDate ) && $coincidingFestivity->event->grade < LitGrade::SOLEMNITY ){
-                //it's a Sunday
-                $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
-                $coincidingFestivity->grade = $this->LitSettings->Locale === LitLocale::LATIN ? 'Die Domini' : ucfirst( $this->dayOfTheWeek->format( $currentFeastDate->format( 'U' ) ) );
-            } else if ( $this->Cal->inSolemnities( $currentFeastDate ) ) {
-                $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
-                //it's a Feast of the Lord or a Solemnity
-                $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
-            } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
-                $coincidingFestivity->event = $this->Cal->feastOrMemorialFromDate( $currentFeastDate );
+            $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
+            if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
                 //we should probably be able to create it anyways in this case?
-                $this->Cal->addFestivity( $row->Festivity->tag, new Festivity( $row->Festivity->name, $currentFeastDate, $row->Festivity->color, LitFeastType::FIXED, $row->Festivity->grade, LitCommon::PROPRIO ) );
-                $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
+                $this->Cal->addFestivity(
+                    $row->Festivity->tag,
+                    new Festivity(
+                        $row->Festivity->name,
+                        $currentFeastDate,
+                        $row->Festivity->color,
+                        LitFeastType::FIXED,
+                        $row->Festivity->grade,
+                        LitCommon::PROPRIO
+                    )
+                );
             }
             $this->Messages[] =  '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
                 /**translators:
@@ -1756,8 +1756,14 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
         }
     }
 
-    private function createNewRegionalFestivity( object $row ) : void {
+    private function createNewRegionalOrNationalFestivity( object $row ) : void {
         $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        if( is_array( $row->Festivity->color ) ) {
+            $row->Festivity->color = implode(",", $row->Festivity->color);
+        }
+        if( is_array( $row->Festivity->common ) ) {
+            $row->Festivity->common = implode(",", $row->Festivity->common);
+        }
         if( $this->festivityCanBeCreated( $row ) ) {
             if( $this->festivityDoesNotCoincide( $row ) ) {
                 $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, $row->Festivity->grade, $row->Festivity->common );
@@ -1811,7 +1817,7 @@ private function handleNationalCalendarRows( array $rows ) : void {
                             }
                             break;
                         case "createNew":
-                            $this->createNewRegionalFestivity( $row );
+                            $this->createNewRegionalOrNationalFestivity( $row );
                             break;
                         case "setProperty":
                             break;
@@ -1892,7 +1898,7 @@ private function applyNationalCalendar() : void {
         }
     }
 
-    private function makePatron( string $tag, string $nameSuffix, int $day, int $month, string $color, string $EditionRomanMissal = RomanMissal::EDITIO_TYPICA_1970 ) {
+    private function makePatron( string $tag, string $nameSuffix, int $day, int $month, array|string $color, string $EditionRomanMissal = RomanMissal::EDITIO_TYPICA_1970 ) {
         $festivity = $this->Cal->getFestivity( $tag );
         if( $festivity !== null ) {
             if( $festivity->grade < LitGrade::FEAST ) {
@@ -1917,6 +1923,9 @@ private function makePatron( string $tag, string $nameSuffix, int $day, int $mon
                     $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
                 } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
                     //we should probably be able to create it anyways in this case?
+                    if( is_array( $color ) ) {
+                        $color = implode(",", $color);
+                    }
                     $this->Cal->addFestivity( $tag, new Festivity( $FestivityName, $currentFeastDate, $color, LitFeastType::FIXED, LitGrade::FEAST, LitCommon::PROPRIO ) );
                     $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
                 }
@@ -1946,7 +1955,7 @@ private function applyCalendarUSA() : void {
         //The Solemnity of the Immaculate Conception is the Patronal FeastDay of the United States of America
         $festivity = $this->Cal->getFestivity( "ImmaculateConception" );
         if( $festivity !== null ) {
-            $this->makePatron( "ImmaculateConception", "Patronal feastday of the United States of America", 8, 12, LitColor::WHITE );
+            $this->makePatron( "ImmaculateConception", "Patronal feastday of the United States of America", 8, 12, [ LitColor::WHITE ] );
         }
 
         //move Saint Vincent Deacon from Jan 22 to Jan 23 in order to allow for National Day of Prayer for the Unborn on Jan 22
@@ -1990,6 +1999,9 @@ private function applyCalendarUSA() : void {
         $this->loadPropriumDeSanctisData( RomanMissal::USA_EDITION_2011 );
 
         foreach ( $this->tempCal[ RomanMissal::USA_EDITION_2011 ] as $row ) {
+            if( is_array( $row->COLOR ) ) {
+                $row->COLOR = implode(",", $row->COLOR );
+            }
             $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             if( !$this->Cal->inSolemnities( $currentFeastDate ) ) {
                 $festivity = new Festivity( "[ USA ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );

From feadc831d49650f74c65c010c056295fa192fe66 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Sun, 1 May 2022 14:42:44 +0200
Subject: [PATCH 061/152] update actions

checkout and commit actions have been updated to account for updates to git regarding safe-directory
---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0a8ea542..4e95414f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Check-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update source file translation strings
         id: update_pot
@@ -34,7 +34,7 @@ jobs:
       # push the output folder to your repo
       - name: Push changes
         if: ${{ steps.update_pot.outputs.POT_LINES_CHANGED > 0 }}
-        uses: actions-x/commit@v4
+        uses: actions-x/commit@v6
         with:
           # The committer's email address
           email: 41898282+github-actions[bot]@users.noreply.github.com

From 4e0a5979552a79382f74edb052f4578333d2a007 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 1 May 2022 14:50:34 +0200
Subject: [PATCH 062/152] fix issue #110 undefined variable $lang

---
 includes/LitCalAPI.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 4fa3f737..66e4509e 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1413,10 +1413,10 @@ private function createImmaculateHeart() {
      */
     private function handleSaintJaneFrancesDeChantal() {
         $StJaneFrancesNewDate = DateTime::createFromFormat( '!j-n-Y', '12-8-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $langs = ["LA" => "lt", "ES" => "es"];
+        $lang = in_array( $this->LitSettings->Locale, array_keys($langs) ) ? $langs[$this->LitSettings->Locale] : "lt";
         if ( self::DateIsNotSunday( $StJaneFrancesNewDate ) && $this->Cal->notInSolemnitiesFeastsOrMemorials( $StJaneFrancesNewDate ) ) {
             $festivity = $this->Cal->getFestivity( "StJaneFrancesDeChantal" );
-            $langs = ["LA" => "lt", "ES" => "es"];
-            $lang = in_array( $this->LitSettings->Locale, array_keys($langs) ) ? $langs[$this->LitSettings->Locale] : "lt";
             if( $festivity !== null ) {
                 $this->Cal->moveFestivityDate( "StJaneFrancesDeChantal", $StJaneFrancesNewDate );
                 $this->Messages[] = sprintf(

From e1e7620ce07d24a333a48587594f46821c42c1f4 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 12:51:19 +0000
Subject: [PATCH 063/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index e10a9adb..4533b3d6 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,14 +434,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From 07a99acbd813620b338a5d05c85632e7bb0b225b Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 1 May 2022 14:51:23 +0200
Subject: [PATCH 064/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/es/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/fr/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/it/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/la/LC_MESSAGES/litcal.po | 12 ++++++------
 i18n/pt/LC_MESSAGES/litcal.po | 12 ++++++------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 80814d7e..233c558b 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 24421146..1beb2840 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -425,7 +425,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -439,14 +439,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 57f1368d..fe0fbc1f 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 2b6d56e8..8f6e3966 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -477,7 +477,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -491,7 +491,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,7 +500,7 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 8ebe3936..d7337a53 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -471,7 +471,7 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -485,7 +485,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -494,7 +494,7 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index bcb2607d..a7098861 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-14 06:31+0000\n"
+"POT-Creation-Date: 2022-05-01 12:51+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1777
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,7 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1848
+#: includes/LitCalAPI.php:1854
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,14 +436,14 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1870
+#: includes/LitCalAPI.php:1876
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1883
+#: includes/LitCalAPI.php:1889
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""

From 0bcbd3b09bbe4f8e6d6ddae9cdc1c732a824091a Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 1 May 2022 18:02:35 +0200
Subject: [PATCH 065/152] output 404 error for unavailable resources

---
 LitCalNationalAndRegionalData.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index 8ea4bfed..b41745c7 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -118,6 +118,10 @@ private function retrieveNationalCalendar() {
                     $responseStr = json_encode( $response );
                     echo $responseStr;
                     die();
+                } else {
+                    header( $_SERVER[ "SERVER_PROTOCOL" ]." 404 Not Found", true, 404 );
+                    echo "{\"message\":\"file $calendarDataFile does not exist\"}";
+                    die();
                 }
             }
         }

From 62ad9461757c4e7e6b7c22a2ed5b0567f6052bd7 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 7 May 2022 16:46:08 +0200
Subject: [PATCH 066/152] write national calendar to JSON file

---
 LitCalNationalAndRegionalData.php |  31 ++---
 nations/USA/USA.json              | 188 ++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+), 22 deletions(-)
 create mode 100644 nations/USA/USA.json

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index b41745c7..a9452bbb 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -128,35 +128,22 @@ private function retrieveNationalCalendar() {
     }
 
     private function writeNationalCalendar() {
-        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
+        if( !property_exists( $this->DATA, 'LitCal' ) || !property_exists( $this->DATA, 'Metadata' ) || !property_exists( $this->DATA, 'Settings' ) ) {
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-            die( '{"error":"Required parameters were not received"}' );
+            die( '{"error":"Not all required parameters were received (LitCal, Metadata, Settings)"}' );
         } else {
-            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
-            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
-            $CalData = json_decode( $this->DATA->calendar );
-            if( json_last_error() !== JSON_ERROR_NONE ) {
-                header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-                die( '{"error":"Malformed data received in <calendar> parameters"}' );
-            }
-            if( property_exists( $this->DATA, 'overrides' ) ) {
-                $CalData->Overrides = $this->DATA->overrides;
+            $region = $this->DATA->Metadata->Region;
+            if( $region === 'UNITED STATES' ) {
+                $region = 'USA';
             }
-            $this->RESPONSE->Calendar = json_encode( $CalData );
-            if( property_exists( $this->DATA, 'group' ) ) {
-                $this->RESPONSE->Group = strip_tags( $this->DATA->group );
-            }
-            $path = "nations/{$this->RESPONSE->Nation}";
+            $path = "nations/{$region}";
             if( !file_exists( $path ) ){
                 mkdir( $path, 0755, true );
             }
-
-            file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
-
-            //$this->createOrUpdateIndex( $path );
+            $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
+            file_put_contents( $path . "/{$region}.json",  $data . PHP_EOL );
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
-            die( '{"success":"National calendar created or updated for nation \"'. $this->RESPONSE->Diocese .'\""}' );
-
+            die( '{"success":"National calendar created or updated for nation \"'. $this->DATA->Metadata->Region .'\""}' );
         }
     }
 
diff --git a/nations/USA/USA.json b/nations/USA/USA.json
new file mode 100644
index 00000000..c69fc143
--- /dev/null
+++ b/nations/USA/USA.json
@@ -0,0 +1,188 @@
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "ImmaculateConception",
+                "name": "The Immaculate Conception of the Blessed Virgin Mary, Patronal feastday of the United States of America",
+                "color": [
+                    "white"
+                ],
+                "grade": 6,
+                "day": 8,
+                "month": 12
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StVincentDeacon",
+                "name": "Saint Vincent, Deacon and Martyr",
+                "day": 23,
+                "month": 1,
+                "missal": "USA_2011",
+                "reason": "National Day of Prayer for the Unborn"
+            },
+            "Metadata": {
+                "action": "moveFestivity",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StVincentDeacon",
+                "name": "[ USA ] Saint Vincent, Deacon and Martyr",
+                "day": 22,
+                "month": 1
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "name",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StPaulCross",
+                "name": "Saint Paul of the Cross, Priest",
+                "day": 20,
+                "month": 10,
+                "missal": "USA_2011",
+                "reason": "Saint John Brebeuf (elevated to memorial)"
+            },
+            "Metadata": {
+                "action": "moveFestivity",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StPaulCross",
+                "name": "[ USA ] Saint Paul of the Cross, Priest",
+                "day": 19,
+                "month": 10
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "name",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StsJeanBrebeuf",
+                "name": "Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
+                "grade": 3,
+                "day": 19,
+                "month": 10
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "grade",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StsJeanBrebeuf",
+                "name": "[ USA ] Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
+                "day": 19,
+                "month": 10
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "name",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "ThanksgivingDay",
+                "name": "[ USA ] Thanksgiving",
+                "color": [
+                    "white"
+                ],
+                "grade": 3,
+                "strtotime": "fourth thursday of november",
+                "common": [],
+                "readings": ""
+            },
+            "Metadata": {
+                "action": "createNew"
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StCamillusDeLellis",
+                "name": "Saint Camillus de Lellis, Priest",
+                "day": 18,
+                "month": 7,
+                "missal": "USA_2011",
+                "reason": "Blessed Kateri Tekakwitha"
+            },
+            "Metadata": {
+                "action": "moveFestivity",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StCamillusDeLellis",
+                "name": "[ USA ] Saint Camillus de Lellis, Priest",
+                "day": 14,
+                "month": 7
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "name",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StElizabethPortugal",
+                "name": "Saint Elizabeth of Portugal",
+                "day": 5,
+                "month": 7,
+                "missal": "USA_2011",
+                "reason": "Independence Day"
+            },
+            "Metadata": {
+                "action": "moveFestivity",
+                "sinceYear": 1970
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StElizabethPortugal",
+                "name": "[ USA ] Saint Elizabeth of Portugal",
+                "day": 4,
+                "month": 7
+            },
+            "Metadata": {
+                "action": "setProperty",
+                "property": "name",
+                "sinceYear": 1970
+            }
+        }
+    ],
+    "Settings": {
+        "Epiphany": "SUNDAY_JAN2_JAN8",
+        "Ascension": "SUNDAY",
+        "CorpusChristi": "SUNDAY",
+        "Locale": "EN"
+    },
+    "Metadata": {
+        "Region": "UNITED STATES",
+        "WiderRegion": {
+            "name": "Americas",
+            "jsonFile": "nations\/Americas.json",
+            "i18nFile": "nations\/AMERICAS\/en.json"
+        },
+        "Missals": [
+            "USA_2011"
+        ]
+    }
+}

From b66f4d243834a6e19d33505f7ce123ddee651c51 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 8 May 2022 17:31:46 +0200
Subject: [PATCH 067/152] define JSON schemas

---
 schemas/DiocesanCalendar.json     | 230 ++++++++++++++++++++
 schemas/LitCalTranslation.json    |  19 ++
 schemas/MemorialsFromDecrees.json | 309 +++++++++++++++++++++++++++
 schemas/NationalCalendar.json     | 338 ++++++++++++++++++++++++++++++
 schemas/PropriumDeSanctis.json    | 191 +++++++++++++++++
 schemas/WiderRegionCalendar.json  | 247 ++++++++++++++++++++++
 6 files changed, 1334 insertions(+)
 create mode 100644 schemas/DiocesanCalendar.json
 create mode 100644 schemas/LitCalTranslation.json
 create mode 100644 schemas/MemorialsFromDecrees.json
 create mode 100644 schemas/NationalCalendar.json
 create mode 100644 schemas/PropriumDeSanctis.json
 create mode 100644 schemas/WiderRegionCalendar.json

diff --git a/schemas/DiocesanCalendar.json b/schemas/DiocesanCalendar.json
new file mode 100644
index 00000000..9163acbc
--- /dev/null
+++ b/schemas/DiocesanCalendar.json
@@ -0,0 +1,230 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/DiocesanCalendar",
+    "definitions": {
+        "DiocesanCalendar": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "LitCal": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "$ref": "#/definitions/LitCal"
+                    }
+                },
+                "Overrides": {
+                    "$ref": "#/definitions/Overrides"
+                }
+            },
+            "required": [
+                "LitCal"
+            ],
+            "title": "DiocesanCalendar"
+        },
+        "LitCal": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "color": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ColorString"
+                        },
+                        {
+                            "$ref": "#/definitions/ColorArray"
+                        }
+                    ]
+                },
+                "grade": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 7,
+                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                },
+                "common": {
+                    "$ref": "#/definitions/Common"
+                },
+                "day": {
+                    "type": "integer"
+                },
+                "month": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 12
+                },
+                "readings": {
+                    "$ref": "#/definitions/Readings"
+                },
+                "formRowNum": {
+                    "type": "integer"
+                },
+                "sinceYear": {
+                    "type": "string",
+                    "format": "integer"
+                },
+                "decreeURL": {
+                    "type": "string",
+                    "format": "uri",
+                    "qt-uri-protocols": [
+                        "https"
+                    ],
+                    "qt-uri-extensions": [
+                        ".html"
+                    ]
+                },
+                "decreeLangs": {
+                    "$ref": "#/definitions/DecreeLangs"
+                }
+            },
+            "required": [
+                "color",
+                "common",
+                "day",
+                "formRowNum",
+                "grade",
+                "month",
+                "name",
+                "sinceYear"
+            ],
+            "title": "LitCal"
+        },
+        "ColorString": {
+            "type": "string",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink"
+            ],
+            "title": "ColorString"
+        },
+        "ColorArray": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "ColorArray"
+        },
+        "Common": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ALLELUIA_VERSE",
+                "FIRST_READING",
+                "GOSPEL",
+                "RESPONSORIAL_PSALM",
+                "SECOND_READING"
+            ],
+            "title": "Readings"
+        },
+        "Overrides": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Epiphany": {
+                    "type": "string",
+                    "enum": [
+                        "JAN6",
+                        "SUNDAY_JAN2_JAN8"
+                    ]
+                },
+                "Ascension": {
+                    "type": "string",
+                    "enum": [
+                        "SUNDAY",
+                        "THURSDAY"
+                    ]
+                },
+                "CorpusChristi": {
+                    "type": "string",
+                    "enum": [
+                        "SUNDAY",
+                        "THURSDAY"
+                    ]
+                }
+            },
+            "minItems": 1,
+            "title": "Overrides"
+        },
+        "DecreeLangs": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/LangMapping"
+            },
+            "minItems": 1,
+            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
+            "title": "DecreeLangs"
+        }
+    }
+}
diff --git a/schemas/LitCalTranslation.json b/schemas/LitCalTranslation.json
new file mode 100644
index 00000000..26138720
--- /dev/null
+++ b/schemas/LitCalTranslation.json
@@ -0,0 +1,19 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/LitCalTranslation",
+    "definitions": {
+        "LitCalTranslation": {
+            "type": "object",
+            "description": "a collection of key value pairs, in which the keys are the tags for Liturgical events as defined in the Liturgical Calendar json definition being translated; the name of the current file is the two-letter ISO code of the language for the translation",
+            "additionalProperties": {
+                "$ref": "#/definitions/Translation"
+            },
+            "title": "LitCalTranslation"
+        },
+        "Translation": {
+            "type": "string",
+            "description": "a key value pair in which the key is a Liturgical event tag that corresponds to the same tag in the corresponding Liturgical Calendar JSON definition being translated, and the value is the translated value",
+            "title": "Translation"
+        }
+    }
+}
diff --git a/schemas/MemorialsFromDecrees.json b/schemas/MemorialsFromDecrees.json
new file mode 100644
index 00000000..42c8f6e0
--- /dev/null
+++ b/schemas/MemorialsFromDecrees.json
@@ -0,0 +1,309 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "items": {
+        "$ref": "#/definitions/MemorialsFromDecrees"
+    },
+    "definitions": {
+        "MemorialsFromDecrees": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Festivity": {
+                    "$ref": "#/definitions/Festivity"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/Metadata"
+                }
+            },
+            "required": [
+                "Festivity",
+                "Metadata"
+            ],
+            "title": "MemorialsFromDecrees"
+        },
+        "Festivity": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "TAG": {
+                    "type": "string"
+                },
+                "GRADE": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 7,
+                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                },
+                "COMMON": {
+                    "$ref": "#/definitions/Common"
+                },
+                "CALENDAR": {
+                    "$ref": "#/definitions/Calendar"
+                },
+                "COLOR": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ColorString"
+                        },
+                        {
+                            "$ref": "#/definitions/ColorArray"
+                        }
+                    ]
+                },
+                "TYPE": {
+                    "type": "string",
+                    "enum": [
+                        "mobile",
+                        "fixed"
+                    ]
+                },
+                "READINGS": {
+                    "$ref": "#/definitions/Readings"
+                },
+                "MONTH": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 12
+                },
+                "DAY": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "description": "maximum value will be 28, 29, 30, or 31 depending on whether we are dealing with a leap year, and whether we are dealing with a month that usually has 28, 30, or 31 days"
+                }
+            },
+            "required": [
+                "TAG"
+            ],
+            "title": "Festivity"
+        },
+        "ColorString": {
+            "type": "string",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink"
+            ],
+            "title": "ColorString"
+        },
+        "ColorArray": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "ColorArray"
+        },
+        "Common": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FIRST_READING",
+                "RESPONSORIAL_PSALM",
+                "SECOND_READING",
+                "ALLELUIA_VERSE",
+                "GOSPEL"
+            ],
+            "title": "Readings"
+        },
+        "Metadata": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "action": {
+                    "$ref": "#/definitions/Action"
+                },
+                "property": {
+                    "type": "string",
+                    "enum": [
+                        "name",
+                        "grade"
+                    ]
+                },
+                "decreeURL": {
+                    "type": "string",
+                    "format": "uri",
+                    "qt-uri-protocols": [
+                        "http",
+                        "https"
+                    ],
+                    "qt-uri-extensions": [
+                        ".html",
+                        ".pdf"
+                    ]
+                },
+                "decreeLangs": {
+                    "$ref": "#/definitions/DecreeLangs"
+                },
+                "sinceYear": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "action",
+                "decreeURL"
+            ],
+            "title": "Metadata"
+        },
+        "DecreeLangs": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "DE": {
+                    "type": "string"
+                },
+                "EN": {
+                    "$ref": "#/definitions/En"
+                },
+                "ES": {
+                    "$ref": "#/definitions/Es"
+                },
+                "FR": {
+                    "$ref": "#/definitions/Fr"
+                },
+                "IT": {
+                    "$ref": "#/definitions/It"
+                },
+                "LA": {
+                    "$ref": "#/definitions/La"
+                },
+                "PL": {
+                    "type": "string"
+                },
+                "PT": {
+                    "$ref": "#/definitions/Pt"
+                }
+            },
+            "minItems": 1,
+            "title": "DecreeLangs"
+        },
+        "Action": {
+            "type": "string",
+            "enum": [
+                "setProperty",
+                "createNew",
+                "makeDoctor"
+            ],
+            "title": "Action"
+        },
+        "En": {
+            "type": "string",
+            "enum": [
+                "en"
+            ],
+            "title": "En"
+        },
+        "Es": {
+            "type": "string",
+            "enum": [
+                "sp",
+                "es"
+            ],
+            "title": "Es"
+        },
+        "Fr": {
+            "type": "string",
+            "enum": [
+                "fr"
+            ],
+            "title": "Fr"
+        },
+        "It": {
+            "type": "string",
+            "enum": [
+                "it"
+            ],
+            "title": "It"
+        },
+        "La": {
+            "type": "string",
+            "enum": [
+                "la"
+            ],
+            "title": "La"
+        },
+        "Pt": {
+            "type": "string",
+            "enum": [
+                "po",
+                "pt"
+            ],
+            "title": "Pt"
+        },
+        "Calendar": {
+            "type": "string",
+            "enum": [
+                "GENERAL ROMAN"
+            ],
+            "title": "Calendar"
+        }
+    }
+}
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
new file mode 100644
index 00000000..6a4d0fa4
--- /dev/null
+++ b/schemas/NationalCalendar.json
@@ -0,0 +1,338 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/NationalCalendar",
+    "definitions": {
+        "NationalCalendar": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "LitCal": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/LitCal"
+                    }
+                },
+                "Settings": {
+                    "$ref": "#/definitions/Settings"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/NationalCalendarMetadata"
+                }
+            },
+            "required": [
+                "LitCal",
+                "Metadata",
+                "Settings"
+            ],
+            "title": "NationalCalendar"
+        },
+        "LitCal": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Festivity": {
+                    "$ref": "#/definitions/Festivity"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/LitCalMetadata"
+                }
+            },
+            "required": [
+                "Festivity",
+                "Metadata"
+            ],
+            "title": "LitCal"
+        },
+        "Festivity": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "tag": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "color": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ColorString"
+                        },
+                        {
+                            "$ref": "#/definitions/ColorArray"
+                        }
+                    ]
+                },
+                "grade": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 7,
+                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                },
+                "day": {
+                    "anyOf": [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
+                },
+                "month": {
+                    "anyOf": [
+                        {
+                            "type": "integer",
+                            "minimum": 1,
+                            "maximum": 12
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
+                },
+                "common": {
+                    "$ref": "#/definitions/Common"
+                },
+                "readings": {
+                    "$ref": "#/definitions/Readings"
+                },
+                "strtotime": {
+                    "type": "string",
+                    "description": "supports PHP strtotime string format"
+                }
+            },
+            "required": [
+                "day",
+                "month",
+                "name",
+                "tag"
+            ],
+            "title": "Festivity"
+        },
+        "LitCalMetadata": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "action": {
+                    "$ref": "#/definitions/Action"
+                },
+                "sinceYear": {
+                    "type": "integer"
+                },
+                "missal": {
+                    "type": "string"
+                },
+                "reason": {
+                    "type": "string"
+                },
+                "property": {
+                    "type": "string"
+                },
+                "decreeURL": {
+                    "type": "string",
+                    "format": "uri",
+                    "qt-uri-protocols": [
+                        "https"
+                    ],
+                    "qt-uri-extensions": [
+                        ".html"
+                    ]
+                },
+                "decreeLangs": {
+                    "$ref": "#/definitions/DecreeLangs"
+                }
+            },
+            "required": [
+                "action",
+                "sinceYear"
+            ],
+            "title": "LitCalMetadata"
+        },
+        "NationalCalendarMetadata": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "WiderRegion": {
+                    "$ref": "#/definitions/WiderRegion"
+                },
+                "Missals": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "Missals",
+                "Region",
+                "WiderRegion"
+            ],
+            "title": "NationalCalendarMetadata"
+        },
+        "WiderRegion": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "jsonFile": {
+                    "type": "string"
+                },
+                "i18nFile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "i18nFile",
+                "jsonFile",
+                "name"
+            ],
+            "title": "WiderRegion"
+        },
+        "Settings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Epiphany": {
+                    "type": "string"
+                },
+                "Ascension": {
+                    "type": "string"
+                },
+                "CorpusChristi": {
+                    "type": "string"
+                },
+                "Locale": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ascension",
+                "CorpusChristi",
+                "Epiphany",
+                "Locale"
+            ],
+            "title": "Settings"
+        },
+        "ColorString": {
+            "type": "string",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink"
+            ],
+            "title": "ColorString"
+        },
+        "ColorArray": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "ColorArray"
+        },
+        "Common": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ALLELUIA_VERSE",
+                "FIRST_READING",
+                "GOSPEL",
+                "RESPONSORIAL_PSALM",
+                "SECOND_READING"
+            ],
+            "title": "Readings"
+        },
+        "DecreeLangs": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/LangMapping"
+            },
+            "minItems": 1,
+            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
+            "title": "DecreeLangs"
+        },
+        "Action": {
+            "type": "string",
+            "enum": [
+                "setProperty",
+                "moveFestivity",
+                "createNew",
+                "makePatron"
+            ]
+        }
+    }
+}
diff --git a/schemas/PropriumDeSanctis.json b/schemas/PropriumDeSanctis.json
new file mode 100644
index 00000000..720a4468
--- /dev/null
+++ b/schemas/PropriumDeSanctis.json
@@ -0,0 +1,191 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "items": {
+        "$ref": "#/definitions/PropriumDeSanctis"
+    },
+    "definitions": {
+        "PropriumDeSanctis": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "MONTH": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 12
+                },
+                "DAY": {
+                    "type": "integer"
+                },
+                "TAG": {
+                    "type": "string"
+                },
+                "GRADE": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 7,
+                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                },
+                "COMMON": {
+                    "$ref": "#/definitions/Common"
+                },
+                "CALENDAR": {
+                    "$ref": "#/definitions/Calendar"
+                },
+                "COLOR": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ColorString"
+                        },
+                        {
+                            "$ref": "#/definitions/ColorArray"
+                        }
+                    ]
+                },
+                "READINGS": {
+                    "$ref": "#/definitions/Readings"
+                }
+            },
+            "required": [
+                "CALENDAR",
+                "COLOR",
+                "COMMON",
+                "DAY",
+                "GRADE",
+                "MONTH",
+                "READINGS",
+                "TAG"
+            ],
+            "title": "PropriumDeSanctis"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/LiturgicalEventWithVigilMass"
+                },
+                {
+                    "$ref": "#/definitions/LiturgicalEventReadings"
+                }
+            ],
+            "title": "Readings"
+        },
+        "LiturgicalEventWithVigilMass": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "VIGIL": {
+                    "$ref": "#/definitions/LiturgicalEventReadings"
+                },
+                "DAY": {
+                    "$ref": "#/definitions/LiturgicalEventReadings"
+                }
+            }
+        },
+        "LiturgicalEventReadings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FIRST_READING",
+                "RESPONSORIAL_PSALM",
+                "SECOND_READING",
+                "ALLELUIA_VERSE",
+                "GOSPEL"
+            ],
+            "title": "LiturgicalEventReadings"
+        },
+        "Calendar": {
+            "type": "string",
+            "enum": [
+                "GENERAL ROMAN"
+            ],
+            "title": "Calendar"
+        },
+        "ColorString": {
+            "type": "string",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink"
+            ],
+            "title": "ColorString"
+        },
+        "ColorArray": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "ColorArray"
+        },
+        "Common": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        }
+    }
+}
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
new file mode 100644
index 00000000..18c8d2b5
--- /dev/null
+++ b/schemas/WiderRegionCalendar.json
@@ -0,0 +1,247 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/WiderRegionCalendar",
+    "definitions": {
+        "WiderRegionCalendar": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "LitCal": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/LitCal"
+                    }
+                },
+                "NationalCalendars": {
+                    "$ref": "#/definitions/NationalCalendars"
+                }
+            },
+            "required": [
+                "LitCal",
+                "NationalCalendars"
+            ],
+            "title": "WiderRegionCalendar"
+        },
+        "LitCal": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Festivity": {
+                    "$ref": "#/definitions/Festivity"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/Metadata"
+                }
+            },
+            "required": [
+                "Festivity",
+                "Metadata"
+            ],
+            "title": "LitCal"
+        },
+        "Festivity": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "tag": {
+                    "type": "string"
+                },
+                "color": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ColorString"
+                        },
+                        {
+                            "$ref": "#/definitions/ColorArray"
+                        }
+                    ]
+                },
+                "grade": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 7,
+                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                },
+                "day": {
+                    "type": "integer"
+                },
+                "month": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 12
+                },
+                "common": {
+                    "$ref": "#/definitions/Common"
+                },
+                "readings": {
+                    "$ref": "#/definitions/Readings"
+                }
+            },
+            "required": [
+                "color",
+                "day",
+                "grade",
+                "month",
+                "tag"
+            ],
+            "title": "Festivity"
+        },
+        "ColorString": {
+            "type": "string",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink"
+            ],
+            "title": "ColorString"
+        },
+        "ColorArray": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "ColorArray"
+        },
+        "Common": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ALLELUIA_VERSE",
+                "FIRST_READING",
+                "GOSPEL",
+                "RESPONSORIAL_PSALM",
+                "SECOND_READING"
+            ],
+            "title": "Readings"
+        },
+        "Metadata": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "action": {
+                    "type": "string"
+                },
+                "sinceYear": {
+                    "type": "integer"
+                },
+                "decreeURL": {
+                    "type": "string",
+                    "format": "uri",
+                    "qt-uri-protocols": [
+                        "https"
+                    ],
+                    "qt-uri-extensions": [
+                        ".html"
+                    ]
+                },
+                "decreeLangs": {
+                    "$ref": "#/definitions/DecreeLangs"
+                },
+                "untilYear": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "action",
+                "decreeLangs",
+                "decreeURL",
+                "sinceYear"
+            ],
+            "title": "Metadata"
+        },
+        "DecreeLangs": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/LangMapping"
+            },
+            "minItems": 1,
+            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
+            "title": "DecreeLangs"
+        },
+        "NationalCalendars": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/NationalCalendarVals"
+            },
+            "title": "NationalCalendars"
+        },
+        "NationalCalendarVals": {
+            "type": "string",
+            "description": "a key value pair where the key is the uppercased country name in English, and the value is the corresponding two letter ISO code for the same country; this is useful for discovery of National Calendars that use this same WiderRegion Calendar"
+        },
+        "LangMapping": {
+            "type": "string",
+            "description": "a key value pair where the key is the uppercased two letter ISO code for a language, and the value is the two-letter representation of the same language as used in the Decree URL (generally lowercase, but not necessarily)",
+            "title": "LangMapping"
+        }
+    }
+}

From 0db16a7748e4d10bd6c10e3491cf5325232080ca Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 10:41:18 +0200
Subject: [PATCH 068/152] move common components to CommonDef.json

---
 data/propriumdetempore.json       | 700 ++++++++++++++++++++++++++++++
 nations/USA/USA.json              |  37 +-
 schemas/CommonDef.json            | 323 ++++++++++++++
 schemas/DiocesanCalendar.json     | 155 +------
 schemas/MemorialsFromDecrees.json | 233 +---------
 schemas/NationalCalendar.json     | 166 +------
 schemas/PropriumDeSanctis.json    | 126 +-----
 schemas/WiderRegionCalendar.json  | 143 +-----
 8 files changed, 1107 insertions(+), 776 deletions(-)
 create mode 100644 data/propriumdetempore.json
 create mode 100644 schemas/CommonDef.json

diff --git a/data/propriumdetempore.json b/data/propriumdetempore.json
new file mode 100644
index 00000000..33745fd0
--- /dev/null
+++ b/data/propriumdetempore.json
@@ -0,0 +1,700 @@
+{
+    "HolyThurs": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "GoodFri": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "EasterVigil": {
+        "READINGS": {
+            "FIRST_READING": "Genesis 1:1-2:2|Genesis 1:1,26-31a",
+            "RESPONSORIAL_PSALM": "Psalm 104:1-2,5-6,10,12,13-14,24,35|Psalm 33:4-5,6-7,12-13,20,22",
+            "SECOND_READING": "Genesis 22:1-18|Genesis 22:1-2,9,10-13,15-18",
+            "RESPONSORIAL_PSALM_2": "Psalm 16:5,8,9-10,11",
+            "THIRD_READING": "Exodus 14:15-15:1",
+            "RESPONSORIAL_PSALM_3": "Exodus 15:1-2,3-4,5-6,17-18",
+            "FOURTH_READING": "Isaiah 54:5-14",
+            "RESPONSORIAL_PSALM_4": "Psalm 30:2,4,5-6,11-12,13",
+            "FIFTH_READING": "Isaiah 55:1-11",
+            "RESPONSORIAL_PSALM_5": "Isaiah 12:2-3,4,5-6",
+            "SIXTH_READING": "Baruch 3:9-15,32;4:4",
+            "RESPONSORIAL_PSALM_6": "Psalm 19:8,9,10,11",
+            "SEVENTH_READING": "Ezekiel 36:16-17,18-28",
+            "RESPONSORIAL_PSALM_7": "Psalm 42:3,5;43:3,4|Isaiah 12:2-3,4,5-6|Psalm 51:12-13,14-15,18-19",
+            "EPISTLE": "Romans 6:3-11",
+            "RESPONSORIAL_PSALM_EPISTLE": "Psalm 118:1-2,16-17,22-23",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": "Luke 24:1-12"
+        }
+    },
+    "Easter": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Christmas": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "MotherGod": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Epiphany": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Ascension": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Pentecost": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter7": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Christmas2": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Advent1": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Advent2": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Advent3": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Advent4": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Lent1": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Lent2": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Lent3": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Lent4": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Lent5": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "PalmSun": {
+        "READINGS": {
+            "PALM_GOSPEL": "",
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter2": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter3": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter4": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter5": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Easter6": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "Trinity": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "CorpusChristi": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "AshWednesday": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "MonHolyWeek": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "TueHolyWeek": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "WedHolyWeek": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "MonOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "TueOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "WedOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "ThuOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "FriOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "SatOctaveEaster": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "SacredHeart": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "ChristKing": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "BaptismLord": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "HolyFamily": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday2": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday3": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday4": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday5": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday6": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday7": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday8": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday9": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday10": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday11": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday12": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday13": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday14": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday15": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday16": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday17": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday18": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday19": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday20": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday21": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday22": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday23": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday24": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday25": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday26": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday27": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday28": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday29": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday30": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday31": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday32": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday33": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "OrdSunday34": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    },
+    "ImmaculateHeart": {
+        "READINGS": {
+            "FIRST_READING": "",
+            "RESPONSORIAL_PSALM": "",
+            "SECOND_READING": "",
+            "ALLELUIA_VERSE": "",
+            "GOSPEL": ""
+        }
+    }
+}
diff --git a/nations/USA/USA.json b/nations/USA/USA.json
index c69fc143..e211f3b6 100644
--- a/nations/USA/USA.json
+++ b/nations/USA/USA.json
@@ -21,12 +21,12 @@
                 "tag": "StVincentDeacon",
                 "name": "Saint Vincent, Deacon and Martyr",
                 "day": 23,
-                "month": 1,
-                "missal": "USA_2011",
-                "reason": "National Day of Prayer for the Unborn"
+                "month": 1
             },
             "Metadata": {
                 "action": "moveFestivity",
+                "missal": "USA_2011",
+                "reason": "National Day of Prayer for the Unborn",
                 "sinceYear": 1970
             }
         },
@@ -48,12 +48,12 @@
                 "tag": "StPaulCross",
                 "name": "Saint Paul of the Cross, Priest",
                 "day": 20,
-                "month": 10,
-                "missal": "USA_2011",
-                "reason": "Saint John Brebeuf (elevated to memorial)"
+                "month": 10
             },
             "Metadata": {
                 "action": "moveFestivity",
+                "missal": "USA_2011",
+                "reason": "Saint John Brebeuf (elevated to memorial)",
                 "sinceYear": 1970
             }
         },
@@ -74,9 +74,9 @@
             "Festivity": {
                 "tag": "StsJeanBrebeuf",
                 "name": "Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
-                "grade": 3,
                 "day": 19,
-                "month": 10
+                "month": 10,
+                "grade": 3
             },
             "Metadata": {
                 "action": "setProperty",
@@ -105,12 +105,15 @@
                     "white"
                 ],
                 "grade": 3,
-                "strtotime": "fourth thursday of november",
+                "day": null,
+                "month": null,
                 "common": [],
-                "readings": ""
+                "readings": "",
+                "strtotime": "fourth thursday of november"
             },
             "Metadata": {
-                "action": "createNew"
+                "action": "createNew",
+                "sinceYear": 1970
             }
         },
         {
@@ -118,12 +121,12 @@
                 "tag": "StCamillusDeLellis",
                 "name": "Saint Camillus de Lellis, Priest",
                 "day": 18,
-                "month": 7,
-                "missal": "USA_2011",
-                "reason": "Blessed Kateri Tekakwitha"
+                "month": 7
             },
             "Metadata": {
                 "action": "moveFestivity",
+                "missal": "USA_2011",
+                "reason": "Blessed Kateri Tekakwitha",
                 "sinceYear": 1970
             }
         },
@@ -145,12 +148,12 @@
                 "tag": "StElizabethPortugal",
                 "name": "Saint Elizabeth of Portugal",
                 "day": 5,
-                "month": 7,
-                "missal": "USA_2011",
-                "reason": "Independence Day"
+                "month": 7
             },
             "Metadata": {
                 "action": "moveFestivity",
+                "missal": "USA_2011",
+                "reason": "Independence Day",
                 "sinceYear": 1970
             }
         },
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
new file mode 100644
index 00000000..179eea83
--- /dev/null
+++ b/schemas/CommonDef.json
@@ -0,0 +1,323 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "definitions": {
+        "LitColor": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "white",
+                    "red",
+                    "green",
+                    "purple",
+                    "pink"
+                ]
+            },
+            "title": "LitColor"
+        },
+        "LitCommon": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [ 
+                    "Proper",
+                    "Dedication of a Church",
+                    "Blessed Virgin Mary",
+                    "Martyrs",
+                    "Pastors",
+                    "Doctors",
+                    "Virgins",
+                    "Holy Men and Women",
+                    "For One Martyr",
+                    "For Several Martyrs",
+                    "For Missionary Martyrs",
+                    "For One Missionary Martyr",
+                    "For Several Missionary Martyrs",
+                    "For a Virgin Martyr",
+                    "For a Holy Woman Martyr",
+                    "For a Pope",
+                    "For a Bishop",
+                    "For One Pastor",
+                    "For Several Pastors",
+                    "For Founders of a Church",
+                    "For One Founder",
+                    "For Several Founders",
+                    "For Missionaries",
+                    "For One Virgin",
+                    "For Several Virgins",
+                    "For Several Saints",
+                    "For One Saint",
+                    "For an Abbot",
+                    "For a Monk",
+                    "For a Nun",
+                    "For Religious",
+                    "For Those Who Practiced Works of Mercy",
+                    "For Educators",
+                    "For Holy Women"
+                ]
+            },
+            "title": "Common"
+        },
+        "LitGrade": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 7,
+            "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY",
+            "title": "LitGrade"
+        },
+        "Readings": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "PALM_GOSPEL": {
+                    "type": "string"
+                },
+                "FIRST_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM": {
+                    "type": "string"
+                },
+                "SECOND_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_2": {
+                    "type": "string"
+                },
+                "THIRD_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_3": {
+                    "type": "string"
+                },
+                "FOURTH_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_4": {
+                    "type": "string"
+                },
+                "FIFTH_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_5": {
+                    "type": "string"
+                },
+                "SIXTH_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_6": {
+                    "type": "string"
+                },
+                "SEVENTH_READING": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_7": {
+                    "type": "string"
+                },
+                "EPISTLE": {
+                    "type": "string"
+                },
+                "RESPONSORIAL_PSALM_EPISTLE": {
+                    "type": "string"
+                },
+                "ALLELUIA_VERSE": {
+                    "type": "string"
+                },
+                "GOSPEL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FIRST_READING",
+                "RESPONSORIAL_PSALM",
+                "ALLELUIA_VERSE",
+                "GOSPEL"
+            ],
+            "title": "Readings"
+        },
+        "Day": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "maximum value will be 28, 29, 30, or 31 depending on whether we are dealing with a leap year, and whether we are dealing with a month that usually has 28, 30, or 31 days",
+            "title": "Day"
+        },
+        "Month": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 12,
+            "title": "Month"
+        },
+        "LitFeastType": {
+            "type": "string",
+            "enum": [
+                "fixed",
+                "mobile"
+            ],
+            "title": "LitFeastType"
+        },
+        "Epiphany": {
+            "type": "string",
+            "enum": [
+                "JAN6",
+                "SUNDAY_JAN2_JAN8"
+            ],
+            "title": "Epiphany"
+        },
+        "Ascension": {
+            "type": "string",
+            "enum": [
+                "SUNDAY",
+                "THURSDAY"
+            ],
+            "title": "Ascension"
+        },
+        "CorpusChristi": {
+            "type": "string",
+            "enum": [
+                "SUNDAY",
+                "THURSDAY"
+            ],
+            "title": "CorpusChristi"
+        },
+        "DecreeLangs": {
+            "type": "object",
+            "properties": {
+                "DE": {
+                    "type": "string",
+                    "description": "German",
+                    "enum": [
+                        "de",
+                        "ge"
+                    ]
+                },
+                "EN": {
+                    "type": "string",
+                    "description": "English",
+                    "enum": [
+                        "en"
+                    ]
+                },
+                "ES": {
+                    "type": "string",
+                    "description": "Spanish",
+                    "enum": [
+                        "es",
+                        "sp"
+                    ]
+                },
+                "FR": {
+                    "type": "string",
+                    "description": "French",
+                    "enum": [
+                        "fr"
+                    ]
+                },
+                "IT": {
+                    "type": "string",
+                    "description": "Italian",
+                    "enum": [
+                        "it"
+                    ]
+                },
+                "LA": {
+                    "type": "string",
+                    "description": "Latin",
+                    "enum": [
+                        "la"
+                    ]
+                },
+                "PL": {
+                    "type": "string",
+                    "description": "Polish",
+                    "enum": [
+                        "pl"
+                    ]
+                },
+                "PT": {
+                    "type": "string",
+                    "description": "Portuguese",
+                    "enum": [
+                        "po",
+                        "pt"
+                    ]
+                }
+            },
+            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
+            "title": "DecreeLangs"
+        },
+        "Calendar": {
+            "type": "string",
+            "enum": [
+                "GENERAL ROMAN"
+            ],
+            "title": "Calendar"
+        },
+        "DecreeURL": {
+            "type": "string",
+            "format": "uri",
+            "qt-uri-protocols": [
+                "http",
+                "https"
+            ],
+            "qt-uri-extensions": [
+                ".html",
+                ".pdf"
+            ],
+            "title": "DecreeURL"
+        },
+        "ColorString": {
+            "type": "string",
+            "description": "This is defined simply for backwards compatibility. In the latest work on the API, arrays are supported, and should be expected. Once this definition is clear everywhere, we can remove this definition...",
+            "enum": [
+                "white",
+                "red",
+                "green",
+                "purple",
+                "pink",
+                "white,red"
+            ],
+            "title": "ColorString"
+        },
+        "Missals": {
+            "type": "array",
+            "description": "Missals as defined in the PHP RomanMissal enum, from which data for the current calendar is drawn",
+            "items": {
+                "$ref": "#/definitions/Missal"
+            }
+        },
+        "Missal": {
+            "type": "string",
+            "enum": [
+                "USA_2011",
+                "ITALY_1983",
+                "ITALY_2020"
+            ]
+        },
+        "MemorialFromDecreesAction": {
+            "type": "string",
+            "enum": [
+                "createNew",
+                "setProperty",
+                "makeDoctor"
+            ],
+            "title": "MemorialFromDecreesAction"
+        },
+        "WiderRegionCalendarAction": {
+            "type": "string",
+            "enum": [
+                "createNew",
+                "makePatron"
+            ]
+        },
+        "NationalCalendarAction": {
+            "type": "string",
+            "enum": [
+                "createNew",
+                "setProperty",
+                "makePatron",
+                "moveFestivity"
+            ],
+            "title": "NationalCalendarAction"
+        }
+    }
+}
diff --git a/schemas/DiocesanCalendar.json b/schemas/DiocesanCalendar.json
index 9163acbc..9320b036 100644
--- a/schemas/DiocesanCalendar.json
+++ b/schemas/DiocesanCalendar.json
@@ -31,32 +31,27 @@
                 "color": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/ColorString"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
                         },
                         {
-                            "$ref": "#/definitions/ColorArray"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                         }
                     ]
                 },
                 "grade": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "maximum": 7,
-                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "common": {
-                    "$ref": "#/definitions/Common"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
                 "day": {
-                    "type": "integer"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                 },
                 "month": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "maximum": 12
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                 },
                 "readings": {
-                    "$ref": "#/definitions/Readings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 },
                 "formRowNum": {
                     "type": "integer"
@@ -66,17 +61,10 @@
                     "format": "integer"
                 },
                 "decreeURL": {
-                    "type": "string",
-                    "format": "uri",
-                    "qt-uri-protocols": [
-                        "https"
-                    ],
-                    "qt-uri-extensions": [
-                        ".html"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeURL"
                 },
                 "decreeLangs": {
-                    "$ref": "#/definitions/DecreeLangs"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeLangs"
                 }
             },
             "required": [
@@ -91,140 +79,21 @@
             ],
             "title": "LitCal"
         },
-        "ColorString": {
-            "type": "string",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink"
-            ],
-            "title": "ColorString"
-        },
-        "ColorArray": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [
-                    "white",
-                    "red",
-                    "green",
-                    "purple",
-                    "pink"
-                ]
-            },
-            "title": "ColorArray"
-        },
-        "Common": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [ 
-                    "Proper",
-                    "Dedication of a Church",
-                    "Blessed Virgin Mary",
-                    "Martyrs",
-                    "Pastors",
-                    "Doctors",
-                    "Virgins",
-                    "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
-                ]
-            },
-            "title": "Common"
-        },
-        "Readings": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "FIRST_READING": {
-                    "type": "string"
-                },
-                "RESPONSORIAL_PSALM": {
-                    "type": "string"
-                },
-                "SECOND_READING": {
-                    "type": "string"
-                },
-                "ALLELUIA_VERSE": {
-                    "type": "string"
-                },
-                "GOSPEL": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ALLELUIA_VERSE",
-                "FIRST_READING",
-                "GOSPEL",
-                "RESPONSORIAL_PSALM",
-                "SECOND_READING"
-            ],
-            "title": "Readings"
-        },
         "Overrides": {
             "type": "object",
             "additionalProperties": false,
             "properties": {
                 "Epiphany": {
-                    "type": "string",
-                    "enum": [
-                        "JAN6",
-                        "SUNDAY_JAN2_JAN8"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Epiphany"
                 },
                 "Ascension": {
-                    "type": "string",
-                    "enum": [
-                        "SUNDAY",
-                        "THURSDAY"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Ascension"
                 },
                 "CorpusChristi": {
-                    "type": "string",
-                    "enum": [
-                        "SUNDAY",
-                        "THURSDAY"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/CorpusChristi"
                 }
             },
-            "minItems": 1,
             "title": "Overrides"
-        },
-        "DecreeLangs": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#/definitions/LangMapping"
-            },
-            "minItems": 1,
-            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
-            "title": "DecreeLangs"
         }
     }
 }
diff --git a/schemas/MemorialsFromDecrees.json b/schemas/MemorialsFromDecrees.json
index 42c8f6e0..29ab74fd 100644
--- a/schemas/MemorialsFromDecrees.json
+++ b/schemas/MemorialsFromDecrees.json
@@ -30,46 +30,35 @@
                     "type": "string"
                 },
                 "GRADE": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "maximum": 7,
-                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "COMMON": {
-                    "$ref": "#/definitions/Common"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
                 "CALENDAR": {
-                    "$ref": "#/definitions/Calendar"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Calendar"
                 },
                 "COLOR": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/ColorString"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
                         },
                         {
-                            "$ref": "#/definitions/ColorArray"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                         }
                     ]
                 },
                 "TYPE": {
-                    "type": "string",
-                    "enum": [
-                        "mobile",
-                        "fixed"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitFeastType"
                 },
                 "READINGS": {
-                    "$ref": "#/definitions/Readings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 },
                 "MONTH": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "maximum": 12
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                 },
                 "DAY": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "description": "maximum value will be 28, 29, 30, or 31 depending on whether we are dealing with a leap year, and whether we are dealing with a month that usually has 28, 30, or 31 days"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                 }
             },
             "required": [
@@ -77,109 +66,12 @@
             ],
             "title": "Festivity"
         },
-        "ColorString": {
-            "type": "string",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink"
-            ],
-            "title": "ColorString"
-        },
-        "ColorArray": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [
-                    "white",
-                    "red",
-                    "green",
-                    "purple",
-                    "pink"
-                ]
-            },
-            "title": "ColorArray"
-        },
-        "Common": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [ 
-                    "Proper",
-                    "Dedication of a Church",
-                    "Blessed Virgin Mary",
-                    "Martyrs",
-                    "Pastors",
-                    "Doctors",
-                    "Virgins",
-                    "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
-                ]
-            },
-            "title": "Common"
-        },
-        "Readings": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "FIRST_READING": {
-                    "type": "string"
-                },
-                "RESPONSORIAL_PSALM": {
-                    "type": "string"
-                },
-                "SECOND_READING": {
-                    "type": "string"
-                },
-                "ALLELUIA_VERSE": {
-                    "type": "string"
-                },
-                "GOSPEL": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "FIRST_READING",
-                "RESPONSORIAL_PSALM",
-                "SECOND_READING",
-                "ALLELUIA_VERSE",
-                "GOSPEL"
-            ],
-            "title": "Readings"
-        },
         "Metadata": {
             "type": "object",
             "additionalProperties": false,
             "properties": {
                 "action": {
-                    "$ref": "#/definitions/Action"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MemorialFromDecreesAction"
                 },
                 "property": {
                     "type": "string",
@@ -189,19 +81,10 @@
                     ]
                 },
                 "decreeURL": {
-                    "type": "string",
-                    "format": "uri",
-                    "qt-uri-protocols": [
-                        "http",
-                        "https"
-                    ],
-                    "qt-uri-extensions": [
-                        ".html",
-                        ".pdf"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeURL"
                 },
                 "decreeLangs": {
-                    "$ref": "#/definitions/DecreeLangs"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeLangs"
                 },
                 "sinceYear": {
                     "type": "integer"
@@ -212,98 +95,6 @@
                 "decreeURL"
             ],
             "title": "Metadata"
-        },
-        "DecreeLangs": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "DE": {
-                    "type": "string"
-                },
-                "EN": {
-                    "$ref": "#/definitions/En"
-                },
-                "ES": {
-                    "$ref": "#/definitions/Es"
-                },
-                "FR": {
-                    "$ref": "#/definitions/Fr"
-                },
-                "IT": {
-                    "$ref": "#/definitions/It"
-                },
-                "LA": {
-                    "$ref": "#/definitions/La"
-                },
-                "PL": {
-                    "type": "string"
-                },
-                "PT": {
-                    "$ref": "#/definitions/Pt"
-                }
-            },
-            "minItems": 1,
-            "title": "DecreeLangs"
-        },
-        "Action": {
-            "type": "string",
-            "enum": [
-                "setProperty",
-                "createNew",
-                "makeDoctor"
-            ],
-            "title": "Action"
-        },
-        "En": {
-            "type": "string",
-            "enum": [
-                "en"
-            ],
-            "title": "En"
-        },
-        "Es": {
-            "type": "string",
-            "enum": [
-                "sp",
-                "es"
-            ],
-            "title": "Es"
-        },
-        "Fr": {
-            "type": "string",
-            "enum": [
-                "fr"
-            ],
-            "title": "Fr"
-        },
-        "It": {
-            "type": "string",
-            "enum": [
-                "it"
-            ],
-            "title": "It"
-        },
-        "La": {
-            "type": "string",
-            "enum": [
-                "la"
-            ],
-            "title": "La"
-        },
-        "Pt": {
-            "type": "string",
-            "enum": [
-                "po",
-                "pt"
-            ],
-            "title": "Pt"
-        },
-        "Calendar": {
-            "type": "string",
-            "enum": [
-                "GENERAL ROMAN"
-            ],
-            "title": "Calendar"
         }
     }
 }
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index 6a4d0fa4..6e3247b4 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -56,23 +56,20 @@
                 "color": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/ColorString"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
                         },
                         {
-                            "$ref": "#/definitions/ColorArray"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                         }
                     ]
                 },
                 "grade": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "maximum": 7,
-                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "day": {
                     "anyOf": [
                         {
-                            "type": "integer"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                         },
                         {
                             "type": "null"
@@ -82,9 +79,7 @@
                 "month": {
                     "anyOf": [
                         {
-                            "type": "integer",
-                            "minimum": 1,
-                            "maximum": 12
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                         },
                         {
                             "type": "null"
@@ -92,10 +87,10 @@
                     ]
                 },
                 "common": {
-                    "$ref": "#/definitions/Common"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
                 "readings": {
-                    "$ref": "#/definitions/Readings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 },
                 "strtotime": {
                     "type": "string",
@@ -115,32 +110,29 @@
             "additionalProperties": false,
             "properties": {
                 "action": {
-                    "$ref": "#/definitions/Action"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/NationalCalendarAction"
                 },
                 "sinceYear": {
                     "type": "integer"
                 },
                 "missal": {
-                    "type": "string"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
                 },
                 "reason": {
                     "type": "string"
                 },
                 "property": {
-                    "type": "string"
-                },
-                "decreeURL": {
                     "type": "string",
-                    "format": "uri",
-                    "qt-uri-protocols": [
-                        "https"
-                    ],
-                    "qt-uri-extensions": [
-                        ".html"
+                    "enum": [
+                        "name",
+                        "grade"
                     ]
                 },
+                "decreeURL": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeURL"
+                },
                 "decreeLangs": {
-                    "$ref": "#/definitions/DecreeLangs"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeLangs"
                 }
             },
             "required": [
@@ -160,10 +152,7 @@
                     "$ref": "#/definitions/WiderRegion"
                 },
                 "Missals": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missals"
                 }
             },
             "required": [
@@ -199,13 +188,13 @@
             "additionalProperties": false,
             "properties": {
                 "Epiphany": {
-                    "type": "string"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Epiphany"
                 },
                 "Ascension": {
-                    "type": "string"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Ascension"
                 },
                 "CorpusChristi": {
-                    "type": "string"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/CorpusChristi"
                 },
                 "Locale": {
                     "type": "string"
@@ -218,121 +207,6 @@
                 "Locale"
             ],
             "title": "Settings"
-        },
-        "ColorString": {
-            "type": "string",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink"
-            ],
-            "title": "ColorString"
-        },
-        "ColorArray": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [
-                    "white",
-                    "red",
-                    "green",
-                    "purple",
-                    "pink"
-                ]
-            },
-            "title": "ColorArray"
-        },
-        "Common": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [ 
-                    "Proper",
-                    "Dedication of a Church",
-                    "Blessed Virgin Mary",
-                    "Martyrs",
-                    "Pastors",
-                    "Doctors",
-                    "Virgins",
-                    "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
-                ]
-            },
-            "title": "Common"
-        },
-        "Readings": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "FIRST_READING": {
-                    "type": "string"
-                },
-                "RESPONSORIAL_PSALM": {
-                    "type": "string"
-                },
-                "SECOND_READING": {
-                    "type": "string"
-                },
-                "ALLELUIA_VERSE": {
-                    "type": "string"
-                },
-                "GOSPEL": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ALLELUIA_VERSE",
-                "FIRST_READING",
-                "GOSPEL",
-                "RESPONSORIAL_PSALM",
-                "SECOND_READING"
-            ],
-            "title": "Readings"
-        },
-        "DecreeLangs": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#/definitions/LangMapping"
-            },
-            "minItems": 1,
-            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
-            "title": "DecreeLangs"
-        },
-        "Action": {
-            "type": "string",
-            "enum": [
-                "setProperty",
-                "moveFestivity",
-                "createNew",
-                "makePatron"
-            ]
         }
     }
 }
diff --git a/schemas/PropriumDeSanctis.json b/schemas/PropriumDeSanctis.json
index 720a4468..2fb2e764 100644
--- a/schemas/PropriumDeSanctis.json
+++ b/schemas/PropriumDeSanctis.json
@@ -10,24 +10,19 @@
             "additionalProperties": false,
             "properties": {
                 "MONTH": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "maximum": 12
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                 },
                 "DAY": {
-                    "type": "integer"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                 },
                 "TAG": {
                     "type": "string"
                 },
                 "GRADE": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "maximum": 7,
-                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "COMMON": {
-                    "$ref": "#/definitions/Common"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
                 "CALENDAR": {
                     "$ref": "#/definitions/Calendar"
@@ -35,10 +30,10 @@
                 "COLOR": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/ColorString"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
                         },
                         {
-                            "$ref": "#/definitions/ColorArray"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                         }
                     ]
                 },
@@ -66,7 +61,7 @@
                     "$ref": "#/definitions/LiturgicalEventWithVigilMass"
                 },
                 {
-                    "$ref": "#/definitions/LiturgicalEventReadings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 }
             ],
             "title": "Readings"
@@ -76,116 +71,15 @@
             "additionalProperties": false,
             "properties": {
                 "VIGIL": {
-                    "$ref": "#/definitions/LiturgicalEventReadings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 },
                 "DAY": {
-                    "$ref": "#/definitions/LiturgicalEventReadings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 }
             }
         },
-        "LiturgicalEventReadings": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "FIRST_READING": {
-                    "type": "string"
-                },
-                "RESPONSORIAL_PSALM": {
-                    "type": "string"
-                },
-                "SECOND_READING": {
-                    "type": "string"
-                },
-                "ALLELUIA_VERSE": {
-                    "type": "string"
-                },
-                "GOSPEL": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "FIRST_READING",
-                "RESPONSORIAL_PSALM",
-                "SECOND_READING",
-                "ALLELUIA_VERSE",
-                "GOSPEL"
-            ],
-            "title": "LiturgicalEventReadings"
-        },
         "Calendar": {
-            "type": "string",
-            "enum": [
-                "GENERAL ROMAN"
-            ],
-            "title": "Calendar"
-        },
-        "ColorString": {
-            "type": "string",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink"
-            ],
-            "title": "ColorString"
-        },
-        "ColorArray": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [
-                    "white",
-                    "red",
-                    "green",
-                    "purple",
-                    "pink"
-                ]
-            },
-            "title": "ColorArray"
-        },
-        "Common": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [ 
-                    "Proper",
-                    "Dedication of a Church",
-                    "Blessed Virgin Mary",
-                    "Martyrs",
-                    "Pastors",
-                    "Doctors",
-                    "Virgins",
-                    "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
-                ]
-            },
-            "title": "Common"
+            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Calendar"
         }
     }
 }
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 18c8d2b5..abb0b01b 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -49,32 +49,27 @@
                 "color": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/ColorString"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
                         },
                         {
-                            "$ref": "#/definitions/ColorArray"
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                         }
                     ]
                 },
                 "grade": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "maximum": 7,
-                    "description": "0 = WEEKDAY, 1 = COMMEMORATION, 2 = MEMORIAL_OPT, 3 = MEMORIAL, 4 = FEAST, 5 = FEAST_LORD, 6 = SOLEMNITY, 7 = HIGHER_SOLEMNITY"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "day": {
-                    "type": "integer"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                 },
                 "month": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "maximum": 12
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                 },
                 "common": {
-                    "$ref": "#/definitions/Common"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
                 "readings": {
-                    "$ref": "#/definitions/Readings"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 }
             },
             "required": [
@@ -86,125 +81,21 @@
             ],
             "title": "Festivity"
         },
-        "ColorString": {
-            "type": "string",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink"
-            ],
-            "title": "ColorString"
-        },
-        "ColorArray": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [
-                    "white",
-                    "red",
-                    "green",
-                    "purple",
-                    "pink"
-                ]
-            },
-            "title": "ColorArray"
-        },
-        "Common": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "enum": [ 
-                    "Proper",
-                    "Dedication of a Church",
-                    "Blessed Virgin Mary",
-                    "Martyrs",
-                    "Pastors",
-                    "Doctors",
-                    "Virgins",
-                    "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
-                ]
-            },
-            "title": "Common"
-        },
-        "Readings": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "FIRST_READING": {
-                    "type": "string"
-                },
-                "RESPONSORIAL_PSALM": {
-                    "type": "string"
-                },
-                "SECOND_READING": {
-                    "type": "string"
-                },
-                "ALLELUIA_VERSE": {
-                    "type": "string"
-                },
-                "GOSPEL": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ALLELUIA_VERSE",
-                "FIRST_READING",
-                "GOSPEL",
-                "RESPONSORIAL_PSALM",
-                "SECOND_READING"
-            ],
-            "title": "Readings"
-        },
         "Metadata": {
             "type": "object",
             "additionalProperties": false,
             "properties": {
                 "action": {
-                    "type": "string"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/WiderRegionCalendarAction"
                 },
                 "sinceYear": {
                     "type": "integer"
                 },
                 "decreeURL": {
-                    "type": "string",
-                    "format": "uri",
-                    "qt-uri-protocols": [
-                        "https"
-                    ],
-                    "qt-uri-extensions": [
-                        ".html"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeURL"
                 },
                 "decreeLangs": {
-                    "$ref": "#/definitions/DecreeLangs"
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeLangs"
                 },
                 "untilYear": {
                     "type": "integer"
@@ -218,15 +109,6 @@
             ],
             "title": "Metadata"
         },
-        "DecreeLangs": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#/definitions/LangMapping"
-            },
-            "minItems": 1,
-            "description": "mapping between two-letter ISO code for a language, and the actual two-letter representation used in the Decree URL",
-            "title": "DecreeLangs"
-        },
         "NationalCalendars": {
             "type": "object",
             "additionalProperties": {
@@ -237,11 +119,6 @@
         "NationalCalendarVals": {
             "type": "string",
             "description": "a key value pair where the key is the uppercased country name in English, and the value is the corresponding two letter ISO code for the same country; this is useful for discovery of National Calendars that use this same WiderRegion Calendar"
-        },
-        "LangMapping": {
-            "type": "string",
-            "description": "a key value pair where the key is the uppercased two letter ISO code for a language, and the value is the two-letter representation of the same language as used in the Decree URL (generally lowercase, but not necessarily)",
-            "title": "LangMapping"
         }
     }
 }

From 0853363c3c13df9def5777d4408eb950c666b18a Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 11:41:18 +0200
Subject: [PATCH 069/152] add litcal.org to allowed origins

---
 LitCalNationalAndRegionalData.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index a9452bbb..38d36b24 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -8,13 +8,23 @@
 include_once( 'includes/enums/ReturnType.php' );
 include_once( 'includes/APICore.php' );
 
+if( file_exists("allowedOrigins.php") ) {
+    include_once( 'allowedOrigins.php' );
+}
+
 $allowedOrigins = [
     "https://johnromanodorazio.com",
     "https://www.johnromanodorazio.com",
     "https://litcal.johnromanodorazio.com",
-    "https://litcal-staging.johnromanodorazio.com"
+    "https://litcal-staging.johnromanodorazio.com",
+    "https://litcal.org",
+    "https://www.litcal.org"
 ];
 
+if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
+    $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
+}
+
 $LitCalNationalData = new LitCalNationalData();
 
 $LitCalNationalData->APICore->setAllowedOrigins( $allowedOrigins );

From 7395ef4e75ef0548fcf5dff916cc9b2e77d9f8f6 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 15:20:17 +0200
Subject: [PATCH 070/152] allow write widerregion calendar

---
 LitCalNationalAndRegionalData.php | 25 ++++++++++++++++----
 nations/Americas.json             | 39 +++++++++++++++++++++++++++++++
 nations/Europe.json               | 35 +++++++++++++++++++++++++--
 schemas/WiderRegionCalendar.json  | 29 ++++++++++++++++++++++-
 4 files changed, 120 insertions(+), 8 deletions(-)
 create mode 100644 nations/Americas.json

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index 38d36b24..7882fef3 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -138,16 +138,13 @@ private function retrieveNationalCalendar() {
     }
 
     private function writeNationalCalendar() {
-        if( !property_exists( $this->DATA, 'LitCal' ) || !property_exists( $this->DATA, 'Metadata' ) || !property_exists( $this->DATA, 'Settings' ) ) {
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-            die( '{"error":"Not all required parameters were received (LitCal, Metadata, Settings)"}' );
-        } else {
+        if( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Metadata' ) && property_exists( $this->DATA, 'Settings' ) ) {
             $region = $this->DATA->Metadata->Region;
             if( $region === 'UNITED STATES' ) {
                 $region = 'USA';
             }
             $path = "nations/{$region}";
-            if( !file_exists( $path ) ){
+            if( !file_exists( $path ) ) {
                 mkdir( $path, 0755, true );
             }
             $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
@@ -155,6 +152,24 @@ private function writeNationalCalendar() {
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
             die( '{"success":"National calendar created or updated for nation \"'. $this->DATA->Metadata->Region .'\""}' );
         }
+        else if ( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Metadata' ) && property_exists( $this->DATA, 'NationalCalendars' ) ) {
+            $this->DATA->Metadata->WiderRegion = ucfirst( strtolower( $this->DATA->Metadata->WiderRegion ) );
+            $widerRegion = strtoupper( $this->DATA->Metadata->WiderRegion );
+            if( $this->DATA->Metadata->IsMultilingual === true ) {
+                $path = "nations/{$widerRegion}";
+                if( !file_exists( $path ) ) {
+                    mkdir( $path, 0755, true );
+                }
+            }
+            $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
+            file_put_contents( "nations/{$this->DATA->Metadata->WiderRegion}.json",  $data . PHP_EOL );
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
+            die( '{"success":"Wider region calendar created or updated for region \"'. $this->DATA->Metadata->WiderRegion .'\""}' );
+        }
+        else {
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
+            die( '{"error":"Not all required parameters were received (LitCal, Metadata, Settings)"}' );
+        }
     }
 
     private function deleteNationalCalendar() {
diff --git a/nations/Americas.json b/nations/Americas.json
new file mode 100644
index 00000000..f856b1c5
--- /dev/null
+++ b/nations/Americas.json
@@ -0,0 +1,39 @@
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "LadyGuadalupe",
+                "name": "Our Lady of Guadalupe",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 12,
+                "month": 12
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1999,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/homilies\/1999\/documents\/hf_jp-ii_hom_19990123_mexico-guadalupe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "ES": "es",
+                    "EN": "en",
+                    "FR": "fr",
+                    "IT": "it",
+                    "PT": "pt"
+                }
+            }
+        }
+    ],
+    "NationalCalendars": {},
+    "Metadata": {
+        "IsMultilingual": true,
+        "Languages": [
+            "en",
+            "es",
+            "pt"
+        ],
+        "WiderRegion": "Americas"
+    }
+}
diff --git a/nations/Europe.json b/nations/Europe.json
index 18562254..3f1d9240 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -154,6 +154,7 @@
         "FRANCE": "FR",
         "GERMANY": "DE",
         "GREECE": "GR",
+        "HUNGARY": "HU",
         "IRELAND": "IE",
         "ITALY": "IT",
         "LATVIA": "LV",
@@ -167,7 +168,37 @@
         "SLOVACCHIA": "SK",
         "SLOVENIA": "SI",
         "SPAIN": "ES",
-        "SWEDEN": "SE",
-        "HUNGARY": "HU"
+        "SWEDEN": "SE"
+    },
+    "Metadata": {
+        "IsMultilingual": true,
+        "Languages": [
+            "bg",
+            "cs",
+            "da",
+            "de",
+            "el",
+            "es",
+            "et",
+            "fi",
+            "fr",
+            "ga",
+            "hr",
+            "hu",
+            "it",
+            "lb",
+            "lt",
+            "lv",
+            "mt",
+            "nl",
+            "pl",
+            "pt",
+            "ro",
+            "sk",
+            "sl",
+            "sv",
+            "tr"
+        ],
+        "WiderRegion": "Europe"
     }
 }
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index abb0b01b..5e0865b6 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -14,11 +14,15 @@
                 },
                 "NationalCalendars": {
                     "$ref": "#/definitions/NationalCalendars"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/CalendarMetadata"
                 }
             },
             "required": [
                 "LitCal",
-                "NationalCalendars"
+                "NationalCalendars",
+                "Metadata"
             ],
             "title": "WiderRegionCalendar"
         },
@@ -119,6 +123,29 @@
         "NationalCalendarVals": {
             "type": "string",
             "description": "a key value pair where the key is the uppercased country name in English, and the value is the corresponding two letter ISO code for the same country; this is useful for discovery of National Calendars that use this same WiderRegion Calendar"
+        },
+        "CalendarMetadata": {
+            "type": "object",
+            "properties": {
+                "IsMultilingual": {
+                    "type": "boolean"
+                },
+                "Languages": {
+                    "type": "array",
+                    "items": {
+                        "type": "string",
+                        "pattern": "[A-Z]{2}"
+                    }
+                },
+                "WiderRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IsMultilingual",
+                "WiderRegion"
+            ],
+            "title": "CalendarMetadata"
         }
     }
 }

From e5d010f093da4599d9b378396a0b89e7d2763a1f Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 15:39:24 +0200
Subject: [PATCH 071/152] move Our Lady of Guadalupe to Wider Region

---
 LitCalNationalAndRegionalData.php              | 11 +++++++++++
 .../propriumdesanctis_USA_2011.json            | 18 ------------------
 nations/AMERICAS/en.json                       |  3 +++
 nations/AMERICAS/es.json                       |  3 +++
 nations/AMERICAS/fr.json                       |  3 +++
 nations/AMERICAS/pt.json                       |  3 +++
 nations/Americas.json                          |  5 +++--
 7 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 nations/AMERICAS/en.json
 create mode 100644 nations/AMERICAS/es.json
 create mode 100644 nations/AMERICAS/fr.json
 create mode 100644 nations/AMERICAS/pt.json

diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index 7882fef3..e917d1db 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -160,6 +160,17 @@ private function writeNationalCalendar() {
                 if( !file_exists( $path ) ) {
                     mkdir( $path, 0755, true );
                 }
+                $translationJSON = new stdClass();
+                foreach( $this->DATA->LitCal as $CalEvent ) {
+                    $translationJSON->{ $CalEvent->Festivity->tag } = '';
+                }
+                if( count( $this->DATA->Metadata->Languages ) > 0 ) {
+                    foreach( $this->DATA->Metadata->Languages as $iso ) {
+                        if( !file_exists( "nations/{$widerRegion}/{$iso}.json" ) ) {
+                            file_put_contents( "nations/{$widerRegion}/{$iso}.json", json_encode( $translationJSON, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE ) );
+                        }
+                    }
+                }
             }
             $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
             file_put_contents( "nations/{$this->DATA->Metadata->WiderRegion}.json",  $data . PHP_EOL );
diff --git a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
index 9e1edd3d..393b5d2e 100644
--- a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
+++ b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
@@ -268,23 +268,5 @@
             "ALLELUIA_VERSE": "",
             "GOSPEL": ""
         }
-    },
-    {
-        "MONTH": 12,
-        "DAY": 12,
-        "TAG": "LadyGuadalupe",
-        "NAME": "Our Lady of Guadalupe",
-        "GRADE": 4,
-        "DISPLAYGRADE": "",
-        "COMMON": "Proper",
-        "CALENDAR": "",
-        "COLOR": "white",
-        "READINGS": {
-            "FIRST_READING": "",
-            "RESPONSORIAL_PSALM": "",
-            "SECOND_READING": "",
-            "ALLELUIA_VERSE": "",
-            "GOSPEL": ""
-        }
     }
 ]
diff --git a/nations/AMERICAS/en.json b/nations/AMERICAS/en.json
new file mode 100644
index 00000000..ef98ecb7
--- /dev/null
+++ b/nations/AMERICAS/en.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": "[ USA ] Our Lady of Guadalupe"
+}
diff --git a/nations/AMERICAS/es.json b/nations/AMERICAS/es.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/fr.json b/nations/AMERICAS/fr.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/fr.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/pt.json b/nations/AMERICAS/pt.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/pt.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/Americas.json b/nations/Americas.json
index f856b1c5..f92221ed 100644
--- a/nations/Americas.json
+++ b/nations/Americas.json
@@ -31,8 +31,9 @@
         "IsMultilingual": true,
         "Languages": [
             "en",
-            "es",
-            "pt"
+            "fr",
+            "pt",
+            "es"
         ],
         "WiderRegion": "Americas"
     }

From 9ada5aa092888a1c5ab1df31bc19c185273634f5 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 17:26:27 +0200
Subject: [PATCH 072/152] define nationalCalendars based on regional languages

---
 nations/AMERICAS/en_CA.json  |   3 +
 nations/AMERICAS/en_US.json  |   3 +
 nations/AMERICAS/es_419.json |   3 +
 nations/AMERICAS/es_AR.json  |   3 +
 nations/AMERICAS/es_BO.json  |   3 +
 nations/AMERICAS/es_BR.json  |   3 +
 nations/AMERICAS/es_BZ.json  |   3 +
 nations/AMERICAS/es_CL.json  |   3 +
 nations/AMERICAS/es_CO.json  |   3 +
 nations/AMERICAS/es_CR.json  |   3 +
 nations/AMERICAS/es_CU.json  |   3 +
 nations/AMERICAS/es_DO.json  |   3 +
 nations/AMERICAS/es_EC.json  |   3 +
 nations/AMERICAS/es_GT.json  |   3 +
 nations/AMERICAS/es_HN.json  |   3 +
 nations/AMERICAS/es_MX.json  |   3 +
 nations/AMERICAS/es_NI.json  |   3 +
 nations/AMERICAS/es_PA.json  |   3 +
 nations/AMERICAS/es_PE.json  |   3 +
 nations/AMERICAS/es_PR.json  |   3 +
 nations/AMERICAS/es_PY.json  |   3 +
 nations/AMERICAS/es_SV.json  |   3 +
 nations/AMERICAS/fr_CA.json  |   3 +
 nations/AMERICAS/pt_BR.json  |   3 +
 nations/Americas.json        |  55 ++++-
 nations/EUROPE/bg.json       |   7 +
 nations/EUROPE/bg_BG.json    |   7 +
 nations/EUROPE/cs.json       |   7 +
 nations/EUROPE/cs_CZ.json    |   7 +
 nations/EUROPE/da.json       |   7 +
 nations/EUROPE/da_DK.json    |   7 +
 nations/EUROPE/de.json       |   7 +
 nations/EUROPE/de_AT.json    |   7 +
 nations/EUROPE/de_BE.json    |   7 +
 nations/EUROPE/de_CH.json    |   7 +
 nations/EUROPE/de_DE.json    |   7 +
 nations/EUROPE/de_LI.json    |   7 +
 nations/EUROPE/de_LU.json    |   7 +
 nations/EUROPE/el.json       |   7 +
 nations/EUROPE/el_CY.json    |   7 +
 nations/EUROPE/el_GR.json    |   7 +
 nations/EUROPE/es.json       |   7 +
 nations/EUROPE/es_ES.json    |   7 +
 nations/EUROPE/et.json       |   7 +
 nations/EUROPE/et_EE.json    |   7 +
 nations/EUROPE/fi.json       |   7 +
 nations/EUROPE/fi_FI.json    |   7 +
 nations/EUROPE/fr.json       |   7 +
 nations/EUROPE/fr_BE.json    |   7 +
 nations/EUROPE/fr_FR.json    |   7 +
 nations/EUROPE/ga.json       |   7 +
 nations/EUROPE/ga_IE.json    |   7 +
 nations/EUROPE/hr.json       |   7 +
 nations/EUROPE/hr_HR.json    |   7 +
 nations/EUROPE/hu.json       |   7 +
 nations/EUROPE/hu_HU.json    |   7 +
 nations/EUROPE/it_CH.json    |   7 +
 nations/EUROPE/it_IT.json    |   7 +
 nations/EUROPE/lb.json       |   7 +
 nations/EUROPE/lb_LU.json    |   7 +
 nations/EUROPE/lt.json       |   7 +
 nations/EUROPE/lt_LT.json    |   7 +
 nations/EUROPE/lv.json       |   7 +
 nations/EUROPE/lv_LV.json    |   7 +
 nations/EUROPE/mt.json       |   7 +
 nations/EUROPE/mt_MT.json    |   7 +
 nations/EUROPE/nl.json       |   7 +
 nations/EUROPE/nl_NL.json    |   7 +
 nations/EUROPE/pl.json       |   7 +
 nations/EUROPE/pl_PL.json    |   7 +
 nations/EUROPE/pt.json       |   7 +
 nations/EUROPE/pt_PT.json    |   7 +
 nations/EUROPE/ro.json       |   7 +
 nations/EUROPE/ro_RO.json    |   7 +
 nations/EUROPE/sk.json       |   7 +
 nations/EUROPE/sk_SK.json    |   7 +
 nations/EUROPE/sl.json       |   7 +
 nations/EUROPE/sl_SI.json    |   7 +
 nations/EUROPE/sv.json       |   7 +
 nations/EUROPE/sv_SE.json    |   7 +
 nations/EUROPE/tr.json       |   7 +
 nations/EUROPE/tr_CY.json    |   7 +
 nations/Europe.json          | 435 +++++++++++++++++++----------------
 83 files changed, 751 insertions(+), 210 deletions(-)
 create mode 100644 nations/AMERICAS/en_CA.json
 create mode 100644 nations/AMERICAS/en_US.json
 create mode 100644 nations/AMERICAS/es_419.json
 create mode 100644 nations/AMERICAS/es_AR.json
 create mode 100644 nations/AMERICAS/es_BO.json
 create mode 100644 nations/AMERICAS/es_BR.json
 create mode 100644 nations/AMERICAS/es_BZ.json
 create mode 100644 nations/AMERICAS/es_CL.json
 create mode 100644 nations/AMERICAS/es_CO.json
 create mode 100644 nations/AMERICAS/es_CR.json
 create mode 100644 nations/AMERICAS/es_CU.json
 create mode 100644 nations/AMERICAS/es_DO.json
 create mode 100644 nations/AMERICAS/es_EC.json
 create mode 100644 nations/AMERICAS/es_GT.json
 create mode 100644 nations/AMERICAS/es_HN.json
 create mode 100644 nations/AMERICAS/es_MX.json
 create mode 100644 nations/AMERICAS/es_NI.json
 create mode 100644 nations/AMERICAS/es_PA.json
 create mode 100644 nations/AMERICAS/es_PE.json
 create mode 100644 nations/AMERICAS/es_PR.json
 create mode 100644 nations/AMERICAS/es_PY.json
 create mode 100644 nations/AMERICAS/es_SV.json
 create mode 100644 nations/AMERICAS/fr_CA.json
 create mode 100644 nations/AMERICAS/pt_BR.json
 create mode 100644 nations/EUROPE/bg.json
 create mode 100644 nations/EUROPE/bg_BG.json
 create mode 100644 nations/EUROPE/cs.json
 create mode 100644 nations/EUROPE/cs_CZ.json
 create mode 100644 nations/EUROPE/da.json
 create mode 100644 nations/EUROPE/da_DK.json
 create mode 100644 nations/EUROPE/de.json
 create mode 100644 nations/EUROPE/de_AT.json
 create mode 100644 nations/EUROPE/de_BE.json
 create mode 100644 nations/EUROPE/de_CH.json
 create mode 100644 nations/EUROPE/de_DE.json
 create mode 100644 nations/EUROPE/de_LI.json
 create mode 100644 nations/EUROPE/de_LU.json
 create mode 100644 nations/EUROPE/el.json
 create mode 100644 nations/EUROPE/el_CY.json
 create mode 100644 nations/EUROPE/el_GR.json
 create mode 100644 nations/EUROPE/es.json
 create mode 100644 nations/EUROPE/es_ES.json
 create mode 100644 nations/EUROPE/et.json
 create mode 100644 nations/EUROPE/et_EE.json
 create mode 100644 nations/EUROPE/fi.json
 create mode 100644 nations/EUROPE/fi_FI.json
 create mode 100644 nations/EUROPE/fr.json
 create mode 100644 nations/EUROPE/fr_BE.json
 create mode 100644 nations/EUROPE/fr_FR.json
 create mode 100644 nations/EUROPE/ga.json
 create mode 100644 nations/EUROPE/ga_IE.json
 create mode 100644 nations/EUROPE/hr.json
 create mode 100644 nations/EUROPE/hr_HR.json
 create mode 100644 nations/EUROPE/hu.json
 create mode 100644 nations/EUROPE/hu_HU.json
 create mode 100644 nations/EUROPE/it_CH.json
 create mode 100644 nations/EUROPE/it_IT.json
 create mode 100644 nations/EUROPE/lb.json
 create mode 100644 nations/EUROPE/lb_LU.json
 create mode 100644 nations/EUROPE/lt.json
 create mode 100644 nations/EUROPE/lt_LT.json
 create mode 100644 nations/EUROPE/lv.json
 create mode 100644 nations/EUROPE/lv_LV.json
 create mode 100644 nations/EUROPE/mt.json
 create mode 100644 nations/EUROPE/mt_MT.json
 create mode 100644 nations/EUROPE/nl.json
 create mode 100644 nations/EUROPE/nl_NL.json
 create mode 100644 nations/EUROPE/pl.json
 create mode 100644 nations/EUROPE/pl_PL.json
 create mode 100644 nations/EUROPE/pt.json
 create mode 100644 nations/EUROPE/pt_PT.json
 create mode 100644 nations/EUROPE/ro.json
 create mode 100644 nations/EUROPE/ro_RO.json
 create mode 100644 nations/EUROPE/sk.json
 create mode 100644 nations/EUROPE/sk_SK.json
 create mode 100644 nations/EUROPE/sl.json
 create mode 100644 nations/EUROPE/sl_SI.json
 create mode 100644 nations/EUROPE/sv.json
 create mode 100644 nations/EUROPE/sv_SE.json
 create mode 100644 nations/EUROPE/tr.json
 create mode 100644 nations/EUROPE/tr_CY.json

diff --git a/nations/AMERICAS/en_CA.json b/nations/AMERICAS/en_CA.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/en_CA.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/en_US.json b/nations/AMERICAS/en_US.json
new file mode 100644
index 00000000..ef98ecb7
--- /dev/null
+++ b/nations/AMERICAS/en_US.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": "[ USA ] Our Lady of Guadalupe"
+}
diff --git a/nations/AMERICAS/es_419.json b/nations/AMERICAS/es_419.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_419.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_AR.json b/nations/AMERICAS/es_AR.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_AR.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_BO.json b/nations/AMERICAS/es_BO.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_BO.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_BR.json b/nations/AMERICAS/es_BR.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_BR.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_BZ.json b/nations/AMERICAS/es_BZ.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_BZ.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_CL.json b/nations/AMERICAS/es_CL.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_CL.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_CO.json b/nations/AMERICAS/es_CO.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_CO.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_CR.json b/nations/AMERICAS/es_CR.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_CR.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_CU.json b/nations/AMERICAS/es_CU.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_CU.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_DO.json b/nations/AMERICAS/es_DO.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_DO.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_EC.json b/nations/AMERICAS/es_EC.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_EC.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_GT.json b/nations/AMERICAS/es_GT.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_GT.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_HN.json b/nations/AMERICAS/es_HN.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_HN.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_MX.json b/nations/AMERICAS/es_MX.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_MX.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_NI.json b/nations/AMERICAS/es_NI.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_NI.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_PA.json b/nations/AMERICAS/es_PA.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_PA.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_PE.json b/nations/AMERICAS/es_PE.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_PE.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_PR.json b/nations/AMERICAS/es_PR.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_PR.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_PY.json b/nations/AMERICAS/es_PY.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_PY.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/es_SV.json b/nations/AMERICAS/es_SV.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/es_SV.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/fr_CA.json b/nations/AMERICAS/fr_CA.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/fr_CA.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/AMERICAS/pt_BR.json b/nations/AMERICAS/pt_BR.json
new file mode 100644
index 00000000..41fcf9a0
--- /dev/null
+++ b/nations/AMERICAS/pt_BR.json
@@ -0,0 +1,3 @@
+{
+    "LadyGuadalupe": ""
+}
\ No newline at end of file
diff --git a/nations/Americas.json b/nations/Americas.json
index f92221ed..fd83bd15 100644
--- a/nations/Americas.json
+++ b/nations/Americas.json
@@ -3,7 +3,7 @@
         {
             "Festivity": {
                 "tag": "LadyGuadalupe",
-                "name": "Our Lady of Guadalupe",
+                "name": "[ USA ] Our Lady of Guadalupe",
                 "color": [
                     "white"
                 ],
@@ -26,14 +26,57 @@
             }
         }
     ],
-    "NationalCalendars": {},
+    "NationalCalendars": {
+        "Canada": "CA",
+        "United States": "US",
+        "Brazil": "BR",
+        "Argentina": "AR",
+        "Belize": "BZ",
+        "Bolivia": "BO",
+        "Chile": "CL",
+        "Colombia": "CO",
+        "Costa Rica": "CR",
+        "Cuba": "CU",
+        "Dominican Republic": "DO",
+        "Ecuador": "EC",
+        "El Salvador": "SV",
+        "Guatemala": "GT",
+        "Honduras": "HN",
+        "Latin America": "419",
+        "Mexico": "MX",
+        "Nicaragua": "NI",
+        "Panama": "PA",
+        "Paraguay": "PY",
+        "Peru": "PE",
+        "Puerto Rico": "PR"
+    },
     "Metadata": {
         "IsMultilingual": true,
         "Languages": [
-            "en",
-            "fr",
-            "pt",
-            "es"
+            "en_CA",
+            "en_US",
+            "fr_CA",
+            "pt_BR",
+            "es_AR",
+            "es_BZ",
+            "es_BO",
+            "es_BR",
+            "es_CL",
+            "es_CO",
+            "es_CR",
+            "es_CU",
+            "es_DO",
+            "es_EC",
+            "es_SV",
+            "es_GT",
+            "es_HN",
+            "es_419",
+            "es_MX",
+            "es_NI",
+            "es_PA",
+            "es_PY",
+            "es_PE",
+            "es_PR"
         ],
         "WiderRegion": "Americas"
     }
diff --git a/nations/EUROPE/bg.json b/nations/EUROPE/bg.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/bg.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/bg_BG.json b/nations/EUROPE/bg_BG.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/bg_BG.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/cs.json b/nations/EUROPE/cs.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/cs.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/cs_CZ.json b/nations/EUROPE/cs_CZ.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/cs_CZ.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/da.json b/nations/EUROPE/da.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/da.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/da_DK.json b/nations/EUROPE/da_DK.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/da_DK.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de.json b/nations/EUROPE/de.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_AT.json b/nations/EUROPE/de_AT.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_AT.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_BE.json b/nations/EUROPE/de_BE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_BE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_CH.json b/nations/EUROPE/de_CH.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_CH.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_DE.json b/nations/EUROPE/de_DE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_DE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_LI.json b/nations/EUROPE/de_LI.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_LI.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/de_LU.json b/nations/EUROPE/de_LU.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/de_LU.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/el.json b/nations/EUROPE/el.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/el.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/el_CY.json b/nations/EUROPE/el_CY.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/el_CY.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/el_GR.json b/nations/EUROPE/el_GR.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/el_GR.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/es.json b/nations/EUROPE/es.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/es.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/es_ES.json b/nations/EUROPE/es_ES.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/es_ES.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/et.json b/nations/EUROPE/et.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/et.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/et_EE.json b/nations/EUROPE/et_EE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/et_EE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/fi.json b/nations/EUROPE/fi.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/fi.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/fi_FI.json b/nations/EUROPE/fi_FI.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/fi_FI.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/fr.json b/nations/EUROPE/fr.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/fr.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/fr_BE.json b/nations/EUROPE/fr_BE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/fr_BE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/fr_FR.json b/nations/EUROPE/fr_FR.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/fr_FR.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/ga.json b/nations/EUROPE/ga.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/ga.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/ga_IE.json b/nations/EUROPE/ga_IE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/ga_IE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/hr.json b/nations/EUROPE/hr.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/hr.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/hr_HR.json b/nations/EUROPE/hr_HR.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/hr_HR.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/hu.json b/nations/EUROPE/hu.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/hu.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/hu_HU.json b/nations/EUROPE/hu_HU.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/hu_HU.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/it_CH.json b/nations/EUROPE/it_CH.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/it_CH.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/it_IT.json b/nations/EUROPE/it_IT.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/it_IT.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lb.json b/nations/EUROPE/lb.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lb.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lb_LU.json b/nations/EUROPE/lb_LU.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lb_LU.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lt.json b/nations/EUROPE/lt.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lt.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lt_LT.json b/nations/EUROPE/lt_LT.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lt_LT.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lv.json b/nations/EUROPE/lv.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lv.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/lv_LV.json b/nations/EUROPE/lv_LV.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/lv_LV.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/mt.json b/nations/EUROPE/mt.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/mt.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/mt_MT.json b/nations/EUROPE/mt_MT.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/mt_MT.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/nl.json b/nations/EUROPE/nl.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/nl.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/nl_NL.json b/nations/EUROPE/nl_NL.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/nl_NL.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/pl.json b/nations/EUROPE/pl.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/pl.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/pl_PL.json b/nations/EUROPE/pl_PL.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/pl_PL.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/pt.json b/nations/EUROPE/pt.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/pt.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/pt_PT.json b/nations/EUROPE/pt_PT.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/pt_PT.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/ro.json b/nations/EUROPE/ro.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/ro.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/ro_RO.json b/nations/EUROPE/ro_RO.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/ro_RO.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sk.json b/nations/EUROPE/sk.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sk.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sk_SK.json b/nations/EUROPE/sk_SK.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sk_SK.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sl.json b/nations/EUROPE/sl.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sl.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sl_SI.json b/nations/EUROPE/sl_SI.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sl_SI.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sv.json b/nations/EUROPE/sv.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sv.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/sv_SE.json b/nations/EUROPE/sv_SE.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/sv_SE.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/tr.json b/nations/EUROPE/tr.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/tr.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/EUROPE/tr_CY.json b/nations/EUROPE/tr_CY.json
new file mode 100644
index 00000000..8ce3ff1e
--- /dev/null
+++ b/nations/EUROPE/tr_CY.json
@@ -0,0 +1,7 @@
+{
+    "StBenedict": "",
+    "StsCyrilMethodius": "",
+    "StBridget": "",
+    "StCatherineSiena": "",
+    "StEdithStein": ""
+}
\ No newline at end of file
diff --git a/nations/Europe.json b/nations/Europe.json
index 3f1d9240..e8a2c302 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -1,204 +1,231 @@
-{
-    "LitCal": [
-        {
-            "Festivity": {
-                "tag": "StBenedict",
-                "color": ["white"],
-                "grade": 4,
-                "day": 11,
-                "month": 7
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1964,
-                "decreeURL": "https://www.vatican.va/content/paul-vi/%s/apost_letters/documents/hf_p-vi_apl_19641024_pacis-nuntius.html",
-                "decreeLangs": {
-                    "IT": "it",
-                    "ES": "es",
-                    "LA": "la"
-                }
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StsCyrilMethodius",
-                "color": ["white"],
-                "grade": 4,
-                "day": 14,
-                "month": 2
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1980,
-                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/apost_letters/1980/documents/hf_jp-ii_apl_31121980_egregiae-virtutis.html",
-                "decreeLangs": {
-                    "ES": "es",
-                    "IT": "it",
-                    "LA": "la",
-                    "PT": "pt"
-                }
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StBridget",
-                "color": ["white"],
-                "grade": 4,
-                "day": 23,
-                "month": 7
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1999,
-                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
-                "decreeLangs": {
-                    "DE": "de",
-                    "EN": "en",
-                    "ES": "es",
-                    "FR": "fr",
-                    "IT": "it",
-                    "LA": "la",
-                    "PT": "pt"
-                }
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StCatherineSiena",
-                "color": ["white"],
-                "grade": 4,
-                "day": 29,
-                "month": 4
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1999,
-                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
-                "decreeLangs": {
-                    "DE": "de",
-                    "EN": "en",
-                    "ES": "es",
-                    "FR": "fr",
-                    "IT": "it",
-                    "LA": "la",
-                    "PT": "pt"
-                }
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StEdithStein",
-                "color": ["red","white"],
-                "grade": 4,
-                "day": 9,
-                "month": 8,
-                "common": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
-                "readings": {
-                    "FIRST_READING": "",
-                    "RESPONSORIAL_PSALM": "",
-                    "SECOND_READING": "",
-                    "ALLELUIA_VERSE": "",
-                    "GOSPEL": ""
-                }
-            },
-            "Metadata": {
-                "action": "createNew",
-                "sinceYear": 1999,
-                "untilYear": 2002,
-                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
-                "decreeLangs": {
-                    "DE": "de",
-                    "EN": "en",
-                    "ES": "es",
-                    "FR": "fr",
-                    "IT": "it",
-                    "LA": "la",
-                    "PT": "pt"
-                }
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StEdithStein",
-                "color": ["red","white"],
-                "grade": 4,
-                "day": 9,
-                "month": 8
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 2002,
-                "decreeURL": "https://www.vatican.va/content/john-paul-ii/%s/motu_proprio/documents/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
-                "decreeLangs": {
-                    "DE": "de",
-                    "EN": "en",
-                    "ES": "es",
-                    "FR": "fr",
-                    "IT": "it",
-                    "LA": "la",
-                    "PT": "pt"
-                }
-            }
-        }
-    ],
-    "NationalCalendars": {
-        "AUSTRIA": "AT",
-        "BELGIUM": "BE",
-        "BULGARIA": "BG",
-        "CZECH REPUBLIC": "CZ",
-        "CYPRUS": "CY",
-        "CROATIA": "HR",
-        "DENMARK": "DK",
-        "ESTONIA": "EE",
-        "FINLAND": "FI",
-        "FRANCE": "FR",
-        "GERMANY": "DE",
-        "GREECE": "GR",
-        "HUNGARY": "HU",
-        "IRELAND": "IE",
-        "ITALY": "IT",
-        "LATVIA": "LV",
-        "LITHUANIA": "LT",
-        "LUXEMBOURG": "LU",
-        "MALTA": "MT",
-        "NETHERLANDS": "NL",
-        "POLONIA": "PL",
-        "PORTUGAL": "PT",
-        "ROMANIA": "RO",
-        "SLOVACCHIA": "SK",
-        "SLOVENIA": "SI",
-        "SPAIN": "ES",
-        "SWEDEN": "SE"
-    },
-    "Metadata": {
-        "IsMultilingual": true,
-        "Languages": [
-            "bg",
-            "cs",
-            "da",
-            "de",
-            "el",
-            "es",
-            "et",
-            "fi",
-            "fr",
-            "ga",
-            "hr",
-            "hu",
-            "it",
-            "lb",
-            "lt",
-            "lv",
-            "mt",
-            "nl",
-            "pl",
-            "pt",
-            "ro",
-            "sk",
-            "sl",
-            "sv",
-            "tr"
-        ],
-        "WiderRegion": "Europe"
-    }
-}
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "StBenedict",
+                "name": "San Benedetto, abate, patrono d'Europa",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 11,
+                "month": 7
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1964,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/paul-vi\/%s\/apost_letters\/documents\/hf_p-vi_apl_19641024_pacis-nuntius.html",
+                "decreeLangs": {
+                    "IT": "it",
+                    "ES": "es",
+                    "LA": "la"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StsCyrilMethodius",
+                "name": "Santi Cirillo, monaco, e Metodio, vescovo, patroni d'Europa",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 14,
+                "month": 2
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1980,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/apost_letters\/1980\/documents\/hf_jp-ii_apl_31121980_egregiae-virtutis.html",
+                "decreeLangs": {
+                    "ES": "es",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StBridget",
+                "name": "Santa Brigida, religiosa, patrona d'Europa",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 23,
+                "month": 7
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1999,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/motu_proprio\/documents\/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StCatherineSiena",
+                "name": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia e d'Europa",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 29,
+                "month": 4
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1999,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/motu_proprio\/documents\/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StEdithStein",
+                "name": "Santa Teresa Benedetta della Croce, vergine e martire, patrona d'Europa",
+                "color": [
+                    "white",
+                    "red"
+                ],
+                "grade": 4,
+                "day": 9,
+                "month": 8,
+                "common": [
+                    "Martyrs:For a Virgin Martyr",
+                    "Virgins:For One Virgin"
+                ],
+                "readings": ""
+            },
+            "Metadata": {
+                "action": "createNew",
+                "sinceYear": 1999,
+                "untilYear": 2002,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/motu_proprio\/documents\/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StEdithStein",
+                "name": "Santa Teresa Benedetta della Croce, vergine e martire, patrona d'Europa",
+                "color": [
+                    "white",
+                    "red"
+                ],
+                "grade": 4,
+                "day": 9,
+                "month": 8
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 2002,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/motu_proprio\/documents\/hf_jp-ii_motu-proprio_01101999_co-patronesses-europe.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "LA": "la",
+                    "PT": "pt"
+                }
+            }
+        }
+    ],
+    "NationalCalendars": {
+        "Bulgaria": "BG",
+        "Czechia": "CZ",
+        "Croatia": "HR",
+        "Denmark": "DK",
+        "Estonia": "EE",
+        "Finland": "FI",
+        "Belgium": "BE",
+        "France": "FR",
+        "Cyprus": "CY",
+        "Greece": "GR",
+        "Ireland": "IE",
+        "Italy": "IT",
+        "Switzerland": "CH",
+        "Latvia": "LV",
+        "Lithuania": "LT",
+        "Luxembourg": "LU",
+        "Malta": "MT",
+        "Netherlands": "NL",
+        "Poland": "PL",
+        "Portugal": "PT",
+        "Romania": "RO",
+        "Slovakia": "SK",
+        "Slovenia": "SI",
+        "Spain": "ES",
+        "Sweden": "SE",
+        "Austria": "AT",
+        "Germany": "DE",
+        "Liechtenstein": "LI",
+        "Hungary": "HU"
+    },
+    "Metadata": {
+        "IsMultilingual": true,
+        "Languages": [
+            "bg_BG",
+            "cs_CZ",
+            "hr_HR",
+            "da_DK",
+            "et_EE",
+            "fi_FI",
+            "fr_BE",
+            "fr_FR",
+            "el_CY",
+            "el_GR",
+            "ga_IE",
+            "it_IT",
+            "it_CH",
+            "lv_LV",
+            "lt_LT",
+            "lb_LU",
+            "mt_MT",
+            "nl_NL",
+            "pl_PL",
+            "pt_PT",
+            "ro_RO",
+            "sk_SK",
+            "sl_SI",
+            "es_ES",
+            "sv_SE",
+            "de_AT",
+            "de_BE",
+            "de_DE",
+            "de_LI",
+            "de_LU",
+            "de_CH",
+            "tr_CY",
+            "hu_HU"
+        ],
+        "WiderRegion": "Europe"
+    }
+}

From c9646a6b24ee9998aed74d077b455231f67183de Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 20:57:43 +0200
Subject: [PATCH 073/152] copy IT strings to it_IT and it_CH

---
 nations/EUROPE/it_CH.json | 12 ++++++------
 nations/EUROPE/it_IT.json | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nations/EUROPE/it_CH.json b/nations/EUROPE/it_CH.json
index 8ce3ff1e..c5ac419b 100644
--- a/nations/EUROPE/it_CH.json
+++ b/nations/EUROPE/it_CH.json
@@ -1,7 +1,7 @@
 {
-    "StBenedict": "",
-    "StsCyrilMethodius": "",
-    "StBridget": "",
-    "StCatherineSiena": "",
-    "StEdithStein": ""
-}
\ No newline at end of file
+    "StBenedict": "San Benedetto, abate, patrono d'Europa",
+    "StsCyrilMethodius": "Santi Cirillo, monaco, e Metodio, vescovo, patroni d'Europa",
+    "StBridget": "Santa Brigida, religiosa, patrona d'Europa",
+    "StCatherineSiena": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia e d'Europa",
+    "StEdithStein": "Santa Teresa Benedetta della Croce, vergine e martire, patrona d'Europa"
+}
diff --git a/nations/EUROPE/it_IT.json b/nations/EUROPE/it_IT.json
index 8ce3ff1e..c5ac419b 100644
--- a/nations/EUROPE/it_IT.json
+++ b/nations/EUROPE/it_IT.json
@@ -1,7 +1,7 @@
 {
-    "StBenedict": "",
-    "StsCyrilMethodius": "",
-    "StBridget": "",
-    "StCatherineSiena": "",
-    "StEdithStein": ""
-}
\ No newline at end of file
+    "StBenedict": "San Benedetto, abate, patrono d'Europa",
+    "StsCyrilMethodius": "Santi Cirillo, monaco, e Metodio, vescovo, patroni d'Europa",
+    "StBridget": "Santa Brigida, religiosa, patrona d'Europa",
+    "StCatherineSiena": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia e d'Europa",
+    "StEdithStein": "Santa Teresa Benedetta della Croce, vergine e martire, patrona d'Europa"
+}

From 8ee7065c334aa93e6fe0a078b312256cad7cf061 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 21:10:33 +0200
Subject: [PATCH 074/152] ensure sinceYear is always integer

---
 nations/ITALY/Diocesi di Roma.json            | 335 +++++++++++++++++-
 ... Sora - Cassino - Aquino - Pontecorvo.json |  27 +-
 ...Archdiocese of Boston (Massachusetts).json |  20 +-
 schemas/DiocesanCalendar.json                 |   3 +-
 4 files changed, 380 insertions(+), 5 deletions(-)

diff --git a/nations/ITALY/Diocesi di Roma.json b/nations/ITALY/Diocesi di Roma.json
index 18ad0d44..8f5c6c04 100644
--- a/nations/ITALY/Diocesi di Roma.json	
+++ b/nations/ITALY/Diocesi di Roma.json	
@@ -1 +1,334 @@
-{"LitCal":{"BeatoGregorioXpapa":{"name":"Beato Gregorio X, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":9,"month":1,"formRowNum":0,"sinceYear":"1973"},"SanVincenzoPallottisacerdote":{"name":"San Vincenzo Pallotti, sacerdote","color":"white","grade":3,"common":"Proper","day":22,"month":1,"formRowNum":1,"sinceYear":"1973"},"BeataLudovicaAlbertoni":{"name":"Beata Ludovica Albertoni","color":"white","grade":2,"common":"Holy Men and Women:For Those Who Practiced Works of Mercy","day":1,"month":2,"formRowNum":1,"sinceYear":"1973"},"SantoIlaropapa":{"name":"Santo Ilaro, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":28,"month":2,"formRowNum":2,"sinceYear":"1973"},"SanFeliceIIIpapa":{"name":"San Felice III, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":1,"month":3,"formRowNum":3,"sinceYear":"1973"},"SanMartinoIpapaemartire":{"name":"San Martino I, papa e martire","color":"red,white","grade":3,"common":"Martyrs:For One Martyr,Pastors:For a Pope","day":13,"month":4,"formRowNum":2,"sinceYear":"1973"},"SanBenedettoGiuseppeLabre":{"name":"San Benedetto Giuseppe Labre","color":"white","grade":3,"common":"Proper","day":16,"month":4,"formRowNum":3,"sinceYear":"1973"},"SanLeoneIXpapa":{"name":"San Leone IX, papa","color":"white","grade":3,"common":"Proper","day":19,"month":4,"formRowNum":4,"sinceYear":"1973"},"SanPioVpapa":{"name":"San Pio V, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":30,"month":4,"formRowNum":5,"sinceYear":"1973"},"SanFelicedaCantalicereligioso":{"name":"San Felice da Cantalice, religioso","color":"white","grade":2,"common":"Proper","day":18,"month":5,"formRowNum":4,"sinceYear":"1973"},"SanGiovanniBattistadeRossisacerdote":{"name":"San Giovanni Battista de Rossi, sacerdote","color":"white","grade":3,"common":"Proper","day":23,"month":5,"formRowNum":6,"sinceYear":"1973"},"BeataMariaVergineAuxiliumChristianorum":{"name":"Beata Maria Vergine «Auxilium Christianorum»","color":"white","grade":2,"common":"Proper","day":24,"month":5,"formRowNum":5,"sinceYear":"1973"},"SanGregorioVIIpapa":{"name":"San Gregorio VII, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":25,"month":5,"formRowNum":7,"sinceYear":"1973"},"SantiMarcellinoePietromartiri":{"name":"Santi Marcellino e Pietro, martiri","color":"red","grade":3,"common":"Martyrs:For Several Martyrs","day":2,"month":6,"formRowNum":8,"sinceYear":"1973"},"BeataAnnaMariaTaigi":{"name":"Beata Anna Maria Taigi","color":"white","grade":3,"common":"Holy Men and Women:For Holy Women","day":9,"month":6,"formRowNum":9,"sinceYear":"1973"},"SantiGiovanniePaolomartiri":{"name":"Santi Giovanni e Paolo, martiri","color":"red","grade":2,"common":"Martyrs","day":26,"month":6,"formRowNum":6,"sinceYear":"1973"},"SantiPietroePaoloApostoliPatroniprincipalidiRoma":{"name":"Santi Pietro e Paolo, Apostoli, Patroni principali di Roma","color":"red","grade":6,"common":"Proper","day":29,"month":6,"formRowNum":0,"sinceYear":"1973"},"SantiPrimiMartiridellaChiesaRomana":{"name":"Santi Primi Martiri della Chiesa Romana","color":"red","grade":3,"common":"Martyrs:For Several Martyrs","day":30,"month":6,"formRowNum":10,"sinceYear":"1973"},"SantaBrigidareligiosa":{"name":"Santa Brigida, religiosa","color":"white","grade":3,"common":"Holy Men and Women:For Religious,Holy Men and Women:For Holy Women","day":23,"month":7,"formRowNum":11,"sinceYear":"1973"},"BeatoInnocenzoXIpapa":{"name":"Beato Innocenzo XI, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":12,"month":8,"formRowNum":8,"sinceYear":"1973"},"SanSistoIIIpapa":{"name":"San Sisto III, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":19,"month":8,"formRowNum":9,"sinceYear":"1973"},"SanGasparedelBufalosacerdote":{"name":"San Gaspare del Bufalo, sacerdote","color":"white","grade":3,"common":"Proper","day":21,"month":10,"formRowNum":13,"sinceYear":"1973"},"SanNicolaIpapa":{"name":"San Nicola I, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":13,"month":11,"formRowNum":14,"sinceYear":"1973"},"SanGelasioIpapa":{"name":"San Gelasio I, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":20,"month":11,"formRowNum":10,"sinceYear":"1973"},"SanClementeIpapaemartire":{"name":"San Clemente I, papa e martire","color":"red,white","grade":3,"common":"Martyrs:For One Martyr,Pastors:For a Pope","day":23,"month":11,"formRowNum":15,"sinceYear":"1973"},"SanSiriciopapa":{"name":"San Siricio, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":26,"month":11,"formRowNum":11,"sinceYear":"1973"},"SanLeonardodaPortoMauriziosacerdote":{"name":"San Leonardo da Porto Maurizio, sacerdote","color":"white","grade":2,"common":"Holy Men and Women:For Religious","day":26,"month":11,"formRowNum":12,"sinceYear":"1973"},"SanDamasoIpapa":{"name":"San Damaso I, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":11,"month":12,"formRowNum":16,"sinceYear":"1973"},"DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma":{"name":"Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma","color":"white","grade":4,"common":"Dedication of a Church","day":9,"month":11,"formRowNum":1,"sinceYear":"1973"},"SanGiovanniPaoloIIpapa":{"name":"San Giovanni Paolo II, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":22,"month":10,"formRowNum":17,"sinceYear":"2014"},"BeatoUrbanoIIpapa":{"name":"Beato Urbano II, papa","color":"white","grade":2,"common":"Pastors:For a Pope","day":28,"month":7,"formRowNum":7,"sinceYear":"1973"},"SantAgatonepapa":{"name":"Sant'Agatone, papa","color":"white","grade":3,"common":"Pastors:For a Pope","day":10,"month":1,"formRowNum":0,"sinceYear":"1973"},"SanCallistoIpapaemartire":{"name":"San Callisto I, papa e martire","color":"red,white","grade":3,"common":"Martyrs:For One Martyr,Pastors:For a Pope","day":14,"month":10,"formRowNum":12,"sinceYear":"1970"}}}
+{
+    "LitCal": {
+        "BeatoGregorioXpapa": {
+            "name": "Beato Gregorio X, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 9,
+            "month": 1,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SanVincenzoPallottisacerdote": {
+            "name": "San Vincenzo Pallotti, sacerdote",
+            "color": "white",
+            "grade": 3,
+            "common": "Proper",
+            "day": 22,
+            "month": 1,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "BeataLudovicaAlbertoni": {
+            "name": "Beata Ludovica Albertoni",
+            "color": "white",
+            "grade": 2,
+            "common": "Holy Men and Women:For Those Who Practiced Works of Mercy",
+            "day": 1,
+            "month": 2,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "SantoIlaropapa": {
+            "name": "Santo Ilaro, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 28,
+            "month": 2,
+            "formRowNum": 2,
+            "sinceYear": 1973
+        },
+        "SanFeliceIIIpapa": {
+            "name": "San Felice III, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 1,
+            "month": 3,
+            "formRowNum": 3,
+            "sinceYear": 1973
+        },
+        "SanMartinoIpapaemartire": {
+            "name": "San Martino I, papa e martire",
+            "color": "red,white",
+            "grade": 3,
+            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
+            "day": 13,
+            "month": 4,
+            "formRowNum": 2,
+            "sinceYear": 1973
+        },
+        "SanBenedettoGiuseppeLabre": {
+            "name": "San Benedetto Giuseppe Labre",
+            "color": "white",
+            "grade": 3,
+            "common": "Proper",
+            "day": 16,
+            "month": 4,
+            "formRowNum": 3,
+            "sinceYear": 1973
+        },
+        "SanLeoneIXpapa": {
+            "name": "San Leone IX, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Proper",
+            "day": 19,
+            "month": 4,
+            "formRowNum": 4,
+            "sinceYear": 1973
+        },
+        "SanPioVpapa": {
+            "name": "San Pio V, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 30,
+            "month": 4,
+            "formRowNum": 5,
+            "sinceYear": 1973
+        },
+        "SanFelicedaCantalicereligioso": {
+            "name": "San Felice da Cantalice, religioso",
+            "color": "white",
+            "grade": 2,
+            "common": "Proper",
+            "day": 18,
+            "month": 5,
+            "formRowNum": 4,
+            "sinceYear": 1973
+        },
+        "SanGiovanniBattistadeRossisacerdote": {
+            "name": "San Giovanni Battista de Rossi, sacerdote",
+            "color": "white",
+            "grade": 3,
+            "common": "Proper",
+            "day": 23,
+            "month": 5,
+            "formRowNum": 6,
+            "sinceYear": 1973
+        },
+        "BeataMariaVergineAuxiliumChristianorum": {
+            "name": "Beata Maria Vergine «Auxilium Christianorum»",
+            "color": "white",
+            "grade": 2,
+            "common": "Proper",
+            "day": 24,
+            "month": 5,
+            "formRowNum": 5,
+            "sinceYear": 1973
+        },
+        "SanGregorioVIIpapa": {
+            "name": "San Gregorio VII, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 25,
+            "month": 5,
+            "formRowNum": 7,
+            "sinceYear": 1973
+        },
+        "SantiMarcellinoePietromartiri": {
+            "name": "Santi Marcellino e Pietro, martiri",
+            "color": "red",
+            "grade": 3,
+            "common": "Martyrs:For Several Martyrs",
+            "day": 2,
+            "month": 6,
+            "formRowNum": 8,
+            "sinceYear": 1973
+        },
+        "BeataAnnaMariaTaigi": {
+            "name": "Beata Anna Maria Taigi",
+            "color": "white",
+            "grade": 3,
+            "common": "Holy Men and Women:For Holy Women",
+            "day": 9,
+            "month": 6,
+            "formRowNum": 9,
+            "sinceYear": 1973
+        },
+        "SantiGiovanniePaolomartiri": {
+            "name": "Santi Giovanni e Paolo, martiri",
+            "color": "red",
+            "grade": 2,
+            "common": "Martyrs",
+            "day": 26,
+            "month": 6,
+            "formRowNum": 6,
+            "sinceYear": 1973
+        },
+        "SantiPietroePaoloApostoliPatroniprincipalidiRoma": {
+            "name": "Santi Pietro e Paolo, Apostoli, Patroni principali di Roma",
+            "color": "red",
+            "grade": 6,
+            "common": "Proper",
+            "day": 29,
+            "month": 6,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SantiPrimiMartiridellaChiesaRomana": {
+            "name": "Santi Primi Martiri della Chiesa Romana",
+            "color": "red",
+            "grade": 3,
+            "common": "Martyrs:For Several Martyrs",
+            "day": 30,
+            "month": 6,
+            "formRowNum": 10,
+            "sinceYear": 1973
+        },
+        "SantaBrigidareligiosa": {
+            "name": "Santa Brigida, religiosa",
+            "color": "white",
+            "grade": 3,
+            "common": "Holy Men and Women:For Religious,Holy Men and Women:For Holy Women",
+            "day": 23,
+            "month": 7,
+            "formRowNum": 11,
+            "sinceYear": 1973
+        },
+        "BeatoInnocenzoXIpapa": {
+            "name": "Beato Innocenzo XI, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 12,
+            "month": 8,
+            "formRowNum": 8,
+            "sinceYear": 1973
+        },
+        "SanSistoIIIpapa": {
+            "name": "San Sisto III, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 19,
+            "month": 8,
+            "formRowNum": 9,
+            "sinceYear": 1973
+        },
+        "SanGasparedelBufalosacerdote": {
+            "name": "San Gaspare del Bufalo, sacerdote",
+            "color": "white",
+            "grade": 3,
+            "common": "Proper",
+            "day": 21,
+            "month": 10,
+            "formRowNum": 13,
+            "sinceYear": 1973
+        },
+        "SanNicolaIpapa": {
+            "name": "San Nicola I, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 13,
+            "month": 11,
+            "formRowNum": 14,
+            "sinceYear": 1973
+        },
+        "SanGelasioIpapa": {
+            "name": "San Gelasio I, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 20,
+            "month": 11,
+            "formRowNum": 10,
+            "sinceYear": 1973
+        },
+        "SanClementeIpapaemartire": {
+            "name": "San Clemente I, papa e martire",
+            "color": "red,white",
+            "grade": 3,
+            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
+            "day": 23,
+            "month": 11,
+            "formRowNum": 15,
+            "sinceYear": 1973
+        },
+        "SanSiriciopapa": {
+            "name": "San Siricio, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 26,
+            "month": 11,
+            "formRowNum": 11,
+            "sinceYear": 1973
+        },
+        "SanLeonardodaPortoMauriziosacerdote": {
+            "name": "San Leonardo da Porto Maurizio, sacerdote",
+            "color": "white",
+            "grade": 2,
+            "common": "Holy Men and Women:For Religious",
+            "day": 26,
+            "month": 11,
+            "formRowNum": 12,
+            "sinceYear": 1973
+        },
+        "SanDamasoIpapa": {
+            "name": "San Damaso I, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 11,
+            "month": 12,
+            "formRowNum": 16,
+            "sinceYear": 1973
+        },
+        "DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma": {
+            "name": "Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma",
+            "color": "white",
+            "grade": 4,
+            "common": "Dedication of a Church",
+            "day": 9,
+            "month": 11,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "SanGiovanniPaoloIIpapa": {
+            "name": "San Giovanni Paolo II, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 22,
+            "month": 10,
+            "formRowNum": 17,
+            "sinceYear": 2014
+        },
+        "BeatoUrbanoIIpapa": {
+            "name": "Beato Urbano II, papa",
+            "color": "white",
+            "grade": 2,
+            "common": "Pastors:For a Pope",
+            "day": 28,
+            "month": 7,
+            "formRowNum": 7,
+            "sinceYear": 1973
+        },
+        "SantAgatonepapa": {
+            "name": "Sant'Agatone, papa",
+            "color": "white",
+            "grade": 3,
+            "common": "Pastors:For a Pope",
+            "day": 10,
+            "month": 1,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SanCallistoIpapaemartire": {
+            "name": "San Callisto I, papa e martire",
+            "color": "red,white",
+            "grade": 3,
+            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
+            "day": 14,
+            "month": 10,
+            "formRowNum": 12,
+            "sinceYear": 1970
+        }
+    }
+}
diff --git a/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json
index 977ef41f..d9e85c3a 100644
--- a/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json	
+++ b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json	
@@ -1 +1,26 @@
-{"LitCal":{"DedicazionedellaChiesaMadrediCassinoinCassino":{"name":"Dedicazione della Chiesa Madre di Cassino (in Cassino)","color":"white","grade":6,"common":"Dedication of a Church","day":5,"month":6,"formRowNum":1,"sinceYear":"1970"},"SantaRestituta":{"name":"Santa Restituta","color":["white"],"grade":4,"common":"Proper","day":27,"month":5,"formRowNum":0,"sinceYear":"1970"}}}
+{
+    "LitCal": {
+        "DedicazionedellaChiesaMadrediCassinoinCassino": {
+            "name": "Dedicazione della Chiesa Madre di Cassino (in Cassino)",
+            "color": "white",
+            "grade": 6,
+            "common": "Dedication of a Church",
+            "day": 5,
+            "month": 6,
+            "formRowNum": 1,
+            "sinceYear": 1970
+        },
+        "SantaRestituta": {
+            "name": "Santa Restituta",
+            "color": [
+                "white"
+            ],
+            "grade": 4,
+            "common": "Proper",
+            "day": 27,
+            "month": 5,
+            "formRowNum": 0,
+            "sinceYear": 1970
+        }
+    }
+}
diff --git a/nations/USA/Archdiocese of Boston (Massachusetts).json b/nations/USA/Archdiocese of Boston (Massachusetts).json
index 6d5aca48..a15867da 100644
--- a/nations/USA/Archdiocese of Boston (Massachusetts).json	
+++ b/nations/USA/Archdiocese of Boston (Massachusetts).json	
@@ -1 +1,19 @@
-{"LitCal":{"DedicationoftheCathedraloftheHolyCross":{"name":"Dedication of the Cathedral of the Holy Cross","color":"white","grade":4,"common":"Dedication of a Church","day":8,"month":12,"formRowNum":1,"sinceYear":"1970"}},"Overrides":{"Epiphany":"JAN6","Ascension":"THURSDAY","CorpusChristi":"THURSDAY"}}
+{
+    "LitCal": {
+        "DedicationoftheCathedraloftheHolyCross": {
+            "name": "Dedication of the Cathedral of the Holy Cross",
+            "color": "white",
+            "grade": 4,
+            "common": "Dedication of a Church",
+            "day": 8,
+            "month": 12,
+            "formRowNum": 1,
+            "sinceYear": 1970
+        }
+    },
+    "Overrides": {
+        "Epiphany": "JAN6",
+        "Ascension": "THURSDAY",
+        "CorpusChristi": "THURSDAY"
+    }
+}
diff --git a/schemas/DiocesanCalendar.json b/schemas/DiocesanCalendar.json
index 9320b036..f67d65f1 100644
--- a/schemas/DiocesanCalendar.json
+++ b/schemas/DiocesanCalendar.json
@@ -57,8 +57,7 @@
                     "type": "integer"
                 },
                 "sinceYear": {
-                    "type": "string",
-                    "format": "integer"
+                    "type": "integer"
                 },
                 "decreeURL": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/DecreeURL"

From 44df76f230d2595c57a0abe44539efb543f0dc4f Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 9 May 2022 21:12:43 +0200
Subject: [PATCH 075/152] sinceYear should never be string

---
 includes/LitCalAPI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 66e4509e..bbd9177b 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -2209,7 +2209,7 @@ private function applyDiocesanCalendar() {
             }
             //if sinceYear is undefined or null or empty, let's go ahead and create the event in any case
             //creation will be restricted only if explicitly defined by the sinceYear property
-            if( $this->LitSettings->Year >= $obj->sinceYear || $obj->sinceYear === null || $obj->sinceYear == '' ) {
+            if( $this->LitSettings->Year >= $obj->sinceYear || $obj->sinceYear === null || $obj->sinceYear === 0 ) {
                 $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $obj->day . '-' . $obj->month . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                 if( $obj->grade > LitGrade::FEAST ) {
                     if( $this->Cal->inSolemnities( $currentFeastDate ) && $key != $this->Cal->solemnityKeyFromDate( $currentFeastDate ) ) {

From 25aa01a8ffd4abf2df97f4fd7ce035361310c6bb Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Tue, 10 May 2022 07:47:06 +0200
Subject: [PATCH 076/152] remove applyUSA method, use automated JSON

---
 includes/LitCalAPI.php         | 237 +++++++++++++++------------------
 includes/enums/RomanMissal.php |   2 +
 2 files changed, 109 insertions(+), 130 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index bbd9177b..90daf1ef 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1709,7 +1709,7 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
                     $this->Cal->setProperty( $key, "grade", LitGrade::MEMORIAL_OPT );
                     $coincidingMemorialName = $value->name;
                 }
-                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, $row->Festivity->common );
+                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, implode(',', $row->Festivity->color), LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, implode(',', $row->Festivity->common) );
                 $this->Cal->addFestivity( $row->Festivity->tag, $festivity );
                 $this->Messages[] = sprintf(
                     /**translators:
@@ -1757,7 +1757,30 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
     }
 
     private function createNewRegionalOrNationalFestivity( object $row ) : void {
-        $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        if(
+            property_exists( $row->Festivity, 'strtotime' )
+            && $row->Festivity->strtotime !== ''
+        ) {
+            $festivityDateTS = strtotime( $row->Festivity->strtotime . ' ' . $this->LitSettings->Year . ' UTC' );
+            $row->Festivity->DATE = new DateTime( "@$festivityDateTS", new DateTimeZone( 'UTC' ) );
+        }
+        else if(
+            property_exists( $row->Festivity, 'month' )
+            && $row->Festivity->month >= 1
+            && $row->Festivity->month <= 12
+            && property_exists( $row->Festivity, 'day' )
+            && $row->Festivity->day >= 1
+            && $row->Festivity->day <= cal_days_in_month(CAL_GREGORIAN, $row->Festivity->month, $this->LitSettings->Year)
+        ) {
+            $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        } else {
+            ob_start();
+            var_dump($row);
+            $a=ob_get_contents();
+            ob_end_clean();
+            $this->Messages[] = _( 'We should be creating a new festivity, however we do not seem to have the correct date information in order to proceed' ) . ' :: ' . $a;
+            return;
+        }
         if( is_array( $row->Festivity->color ) ) {
             $row->Festivity->color = implode(",", $row->Festivity->color);
         }
@@ -1766,11 +1789,27 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
         }
         if( $this->festivityCanBeCreated( $row ) ) {
             if( $this->festivityDoesNotCoincide( $row ) ) {
-                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, $row->Festivity->grade, $row->Festivity->common );
+                if( !property_exists( $row->Festivity, 'type' ) || !LitFeastType::isValid( $row->Festivity->type ) ) {
+                    $row->Festivity->type = property_exists( $row->Festivity, 'strtotime' ) ? LitFeastType::MOBILE : LitFeastType::FIXED;
+                }
+                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, $row->Festivity->type, $row->Festivity->grade, $row->Festivity->common );
                 $this->Cal->addFestivity( $row->Festivity->tag, $festivity );
             } else {
                 $this->handleFestivityCreationWithCoincidence( $row );
             }
+            $infoSource = 'unknown';
+            if( property_exists( $row->Metadata, 'decreeURL' ) ) {
+                $infoSource = $this->elaborateDecreeSource( $row );
+            }
+            else if( property_exists( $row->Metadata, 'missal' ) ) {
+                $infoSource = RomanMissal::getName( $row->Metadata->missal );
+            }
+
+            $formattedDateStr = $this->LitSettings->Locale === LitLocale::LATIN ? ( $row->Festivity->DATE->format( 'j' ) . ' ' . LitMessages::LATIN_MONTHS[ (int)$row->Festivity->DATE->format( 'n' ) ] ) :
+                ( $this->LitSettings->Locale === LitLocale::ENGLISH ? $row->Festivity->DATE->format( 'F jS' ) :
+                    $this->dayAndMonth->format( $row->Festivity->DATE->format( 'U' ) )
+                );
+            $dateStr = property_exists( $row->Festivity, 'strtotime' ) && $row->Festivity->strtotime !== '' ? '<i>' . $row->Festivity->strtotime . '</i>' : $formattedDateStr;
             $this->Messages[] = sprintf(
                 /**translators:
                  * 1. Grade or rank of the festivity
@@ -1783,12 +1822,9 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
                 _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' ),
                 $this->LitGrade->i18n( $row->Festivity->grade, false ),
                 $row->Festivity->name,
-                $this->LitSettings->Locale === LitLocale::LATIN ? ( $row->Festivity->DATE->format( 'j' ) . ' ' . LitMessages::LATIN_MONTHS[ (int)$row->Festivity->DATE->format( 'n' ) ] ) :
-                    ( $this->LitSettings->Locale === LitLocale::ENGLISH ? $row->Festivity->DATE->format( 'F jS' ) :
-                        $this->dayAndMonth->format( $row->Festivity->DATE->format( 'U' ) )
-                    ),
+                $dateStr,
                 $row->Metadata->sinceYear,
-                $this->elaborateDecreeSource( $row ),
+                $infoSource,
                 $this->LitSettings->Year
             );
         }// else {
@@ -1820,6 +1856,14 @@ private function handleNationalCalendarRows( array $rows ) : void {
                             $this->createNewRegionalOrNationalFestivity( $row );
                             break;
                         case "setProperty":
+                            switch( $row->Metadata->property ) {
+                                case "name":
+                                    $this->Cal->setProperty( $row->Festivity->tag, "name", $row->Festivity->name );
+                                    break;
+                                case "grade":
+                                    $this->Cal->setProperty( $row->Festivity->tag, "grade", $row->Festivity->grade );
+                                    break;
+                            }
                             break;
                         case "moveFestivity":
                             $festivityNewDate = DateTime::createFromFormat( '!j-n-Y', $row->Festivity->day.'-'.$row->Festivity->month.'-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
@@ -1842,6 +1886,9 @@ private function applyNationalCalendar() : void {
         }
 
         if( $this->NationalData !== null && property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData->Metadata, "Missals" ) ) {
+            if( $this->NationalData->Metadata->Region === 'UNITED STATES' ) {
+                $this->NationalData->Metadata->Region = 'USA';
+            }
             $this->Messages[] = "Found Missals for region " . $this->NationalData->Metadata->Region. ": " . implode(', ', $this->NationalData->Metadata->Missals);
             foreach( $this->NationalData->Metadata->Missals as $missal ) {
                 $yearLimits = RomanMissal::getYearLimits( $missal );
@@ -1856,32 +1903,47 @@ private function applyNationalCalendar() : void {
                             );
                             $this->loadPropriumDeSanctisData( $missal );
                             foreach ( $this->tempCal[ $missal ] as $row ) {
+                                if( is_array( $row->COLOR ) ) {
+                                    $row->COLOR = implode(',', $row->COLOR);
+                                }
+                                if( is_array( $row->COMMON ) ) {
+                                    $row->COMMON = implode(',', $row->COMMON);
+                                }
                                 $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                                 if( !$this->Cal->inSolemnitiesOrFeasts( $currentFeastDate ) ) {
                                     $festivity = new Festivity( "[ {$this->NationalData->Metadata->Region} ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
                                     $this->Cal->addFestivity( $row->TAG, $festivity );
                                 }
                                 else{
-                                    $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
-                                    $this->Messages[] = sprintf(
-                                        /**translators:
-                                         * 1. Festivity grade
-                                         * 2. Festivity name
-                                         * 3. Festivity date
-                                         * 4. Edition of the Roman Missal
-                                         * 5. Superseding festivity grade
-                                         * 6. Superseding festivity name
-                                         * 7. Current year
-                                         */
-                                        $this->NationalData->Metadata->Region . ": " . _( 'The %1$s \'%2$s\' (%3$s), added to the national calendar in the %4$s, is superseded by the %5$s \'%6$s\' in the year %7$d' ),
-                                        $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
-                                        '<i>' . $row->NAME . '</i>',
-                                        $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
-                                        RomanMissal::getName( $missal ),
-                                        $coincidingFestivity->grade,
-                                        $coincidingFestivity->event->name,
-                                        $this->LitSettings->Year
-                                    );
+                                    if( self::DateIsSunday( $currentFeastDate ) && $row->TAG === "PrayerUnborn" ) {
+                                        $festivity = new Festivity( "[ USA ] " . $row->NAME, $currentFeastDate->add( new DateInterval( 'P1D' ) ), $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
+                                        $this->Cal->addFestivity( $row->TAG, $festivity );
+                                        $this->Messages[] = sprintf(
+                                            "USA: The National Day of Prayer for the Unborn is set to Jan 22 as per the 2011 Roman Missal issued by the USCCB, however since it coincides with a Sunday or a Solemnity in the year %d, it has been moved to Jan 23",
+                                            $this->LitSettings->Year
+                                        );
+                                    } else {
+                                        $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
+                                        $this->Messages[] = sprintf(
+                                            /**translators:
+                                             * 1. Festivity grade
+                                             * 2. Festivity name
+                                             * 3. Festivity date
+                                             * 4. Edition of the Roman Missal
+                                             * 5. Superseding festivity grade
+                                             * 6. Superseding festivity name
+                                             * 7. Current year
+                                             */
+                                            $this->NationalData->Metadata->Region . ": " . _( 'The %1$s \'%2$s\' (%3$s), added to the national calendar in the %4$s, is superseded by the %5$s \'%6$s\' in the year %7$d' ),
+                                            $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
+                                            '<i>' . $row->NAME . '</i>',
+                                            $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
+                                            RomanMissal::getName( $missal ),
+                                            $coincidingFestivity->grade,
+                                            $coincidingFestivity->event->name,
+                                            $this->LitSettings->Year
+                                        );
+                                    }
                                 }
                             }
                         } else {
@@ -1950,88 +2012,10 @@ private function makePatron( string $tag, string $nameSuffix, int $day, int $mon
         }
     }
 
-    private function applyCalendarUSA() : void {
-
-        //The Solemnity of the Immaculate Conception is the Patronal FeastDay of the United States of America
-        $festivity = $this->Cal->getFestivity( "ImmaculateConception" );
-        if( $festivity !== null ) {
-            $this->makePatron( "ImmaculateConception", "Patronal feastday of the United States of America", 8, 12, [ LitColor::WHITE ] );
-        }
-
-        //move Saint Vincent Deacon from Jan 22 to Jan 23 in order to allow for National Day of Prayer for the Unborn on Jan 22
-        //however if Jan 22 is a Sunday, National Day of Prayer for the Unborn is moved to Jan 23 ( in place of Saint Vincent Deacon )
-        $festivity = $this->Cal->getFestivity( "StVincentDeacon" );
-        if( $festivity !== null ) {
-            $StVincentDeaconNewDate = clone ( $festivity->date );
-            $StVincentDeaconNewDate->add( new DateInterval( 'P1D' ) );
-            $this->moveFestivityDate( "StVincentDeacon", $StVincentDeaconNewDate, "National Day of Prayer for the Unborn", RomanMissal::USA_EDITION_2011 );
-        }
-
-        //move Saint Paul of the Cross to the next day (Oct 20), to make room for Saint John Brebeuf, elevated to memorial
-        $StPaulCrossNewDate = DateTime::createFromFormat( '!j-n-Y', '20-10-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-        $this->moveFestivityDate( "StPaulCross", $StPaulCrossNewDate, "Saint John Brebeuf (elevated to memorial)", RomanMissal::USA_EDITION_2011 );
-
-        //elevate Saint John Brebeuf to memorial
-        $festivity = $this->Cal->getFestivity( "StsJeanBrebeuf" );
-        if( $festivity !== null ) {
-            //if it exists, it means it's not on a Sunday, so we can go ahead and elevate it to Memorial
-            $this->Cal->setProperty( "StsJeanBrebeuf", "grade", LitGrade::MEMORIAL );
-            $this->Messages[] = sprintf(
-                "USA: The optional memorial '%s' is elevated to Memorial on Oct 19 as per the 2011 Roman Missal issued by the USCCB, applicable to the year %d",
-                '<i>' . $festivity->name . '</i>',
-                $this->LitSettings->Year
-            );
-            $this->Cal->setProperty( "StsJeanBrebeuf", "name", "[ USA ] " . $festivity->name );
-        }
-
-        //The fourth Thursday of November is Thanksgiving
-        $thanksgivingDateTS = strtotime( 'fourth thursday of november ' . $this->LitSettings->Year . ' UTC' );
-        $thanksgivingDate = new DateTime( "@$thanksgivingDateTS", new DateTimeZone( 'UTC' ) );
-        $festivity = new Festivity( "[ USA ] Thanksgiving", $thanksgivingDate, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::MEMORIAL, '', 'National Holiday' );
-        $this->Cal->addFestivity( "ThanksgivingDay", $festivity );
-
-        $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '18-7-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-        $this->moveFestivityDate( "StCamillusDeLellis", $currentFeastDate, "Blessed Kateri Tekakwitha", RomanMissal::USA_EDITION_2011 );
-
-        $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', '5-7-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-        $this->moveFestivityDate( "StElizabethPortugal", $currentFeastDate, "Independence Day", RomanMissal::USA_EDITION_2011 );
-
-        $this->loadPropriumDeSanctisData( RomanMissal::USA_EDITION_2011 );
-
-        foreach ( $this->tempCal[ RomanMissal::USA_EDITION_2011 ] as $row ) {
-            if( is_array( $row->COLOR ) ) {
-                $row->COLOR = implode(",", $row->COLOR );
-            }
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-            if( !$this->Cal->inSolemnities( $currentFeastDate ) ) {
-                $festivity = new Festivity( "[ USA ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
-                $this->Cal->addFestivity( $row->TAG, $festivity );
-            }
-            else if( self::DateIsSunday( $currentFeastDate ) && $row->TAG === "PrayerUnborn" ){
-                $festivity = new Festivity( "[ USA ] " . $row->NAME, $currentFeastDate->add( new DateInterval( 'P1D' ) ), $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
-                $this->Cal->addFestivity( $row->TAG, $festivity );
-                $this->Messages[] = sprintf(
-                    "USA: The National Day of Prayer for the Unborn is set to Jan 22 as per the 2011 Roman Missal issued by the USCCB, however since it coincides with a Sunday or a Solemnity in the year %d, it has been moved to Jan 23",
-                    $this->LitSettings->Year
-                );
-            }
-            else{
-                $this->Messages[] = sprintf(
-                    "USA: the %s '%s', added to the calendar as per the 2011 Roman Missal issued by the USCCB, is superseded by a Sunday or a Solemnity in the year %d",
-                    $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
-                    '<i>' . $row->NAME . '</i>',
-                    $this->LitSettings->Year
-                );
-            }
-        }
-    }
-
-    /**currently only using this for the USA calendar
-     * The celebrations being transferred are all from the 1970 Editio Typica
-     * 
-     * If it were to become useful for other national calendars,
-     * we might have to abstract out the Calendar that is the source
-     * of the festivity that is being transferred
+    /**
+     * So far, the celebrations being transferred are all originally from the 1970 Editio Typica
+     * and they are currently only celebrations from the USA calendar...
+     * However the method should work for any calendar
      */
     private function moveFestivityDate( string $tag, DateTime $newDate, string $inFavorOf, $missal ) {
         $festivity = $this->Cal->getFestivity( $tag );
@@ -2044,8 +2028,9 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
             else{
                 //if it was suppressed on the original date because of a higher ranking celebration,
                 //we should recreate it on the new date
-                //except in the case of Saint Vincent Deacon, where the National Day of Prayer will take over the new date
-                if( $tag !== "StVincentDeacon" ) {
+                //except in the case of Saint Vincent Deacon when we're dealing with the Roman Missal USA edition,
+                //since the National Day of Prayer will take over the new date
+                if( $tag !== "StVincentDeacon" || $missal !== RomanMissal::USA_EDITION_2011 ) {
                     $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ $tag ];
                     $festivity = new Festivity( $row->NAME, $newDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
                     $this->Cal->addFestivity( $tag, $festivity );
@@ -2053,9 +2038,11 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
                     $oldDateStr = $oldDate->format('F jS');
                 }
             }
+
+            //If the festivity has been successfully recreated, let's make a note about that
             if( $festivity !== null ) {
                 $this->Messages[] = sprintf(
-                    'USA: The %1$s \'%2$s\' is transferred from %5$s to %6$s as per the %7$s, to make room for \'%3$s\': applicable to the year %4$d.',
+                    _( 'The %1$s \'%2$s\' is transferred from %5$s to %6$s as per the %7$s, to make room for \'%3$s\': applicable to the year %4$d.' ),
                     $this->LitGrade->i18n( $festivity->grade ),
                     '<i>' . $festivity->name . '</i>',
                     '<i>' . $inFavorOf . '</i>',
@@ -2064,7 +2051,7 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
                     $newDateStr,
                     RomanMissal::getName( $missal )
                 );
-                $this->Cal->setProperty( $tag, "name", "[ USA ] " . $festivity->name );
+                //$this->Cal->setProperty( $tag, "name", "[ USA ] " . $festivity->name );
             }
         }
         else{
@@ -2073,7 +2060,7 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
                 $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $newDate );
                 //If the new date is already covered by a Solemnity, Feast or Memorial, then we can't move the celebration, so we simply suppress it
                 $this->Messages[] = sprintf(
-                    'USA: The %1$s \'%2$s\' would have been transferred from %3$s to %4$s as per the %5$s, to make room for \'%6$s\', however it is suppressed by the %7$s \'%8$s\' in the year %9$d.',
+                    _( 'The %1$s \'%2$s\' would have been transferred from %3$s to %4$s as per the %5$s, to make room for \'%6$s\', however it is suppressed by the %7$s \'%8$s\' in the year %9$d.' ),
                     $this->LitGrade->i18n( $festivity->grade ),
                     '<i>' . $festivity->name . '</i>',
                     $oldDateStr,
@@ -2207,6 +2194,9 @@ private function applyDiocesanCalendar() {
             if( is_array( $obj->color ) ) {
                 $obj->color = implode( ',', $obj->color );
             }
+            if( is_array( $obj->common ) ) {
+                $obj->common = implode( ',', $obj->common );
+            }
             //if sinceYear is undefined or null or empty, let's go ahead and create the event in any case
             //creation will be restricted only if explicitly defined by the sinceYear property
             if( $this->LitSettings->Year >= $obj->sinceYear || $obj->sinceYear === null || $obj->sinceYear === 0 ) {
@@ -2478,21 +2468,8 @@ public function Init(){
             $this->calculateUniversalCalendar();
 
             if( $this->LitSettings->NationalCalendar !== null ) {
-                //$this->loadNationalCalendarData();
-                //$this->applyNationalCalendar();
-                switch( $this->LitSettings->NationalCalendar ){
-                    case 'ITALY':
-                        $this->loadNationalCalendarData();
-                        $this->applyNationalCalendar();
-                        break;
-                    case 'USA':
-                        //I don't have any data before 2011
-                        //I need copies of the calendar from the Missals printed before 2011...
-                        if( $this->LitSettings->Year >= 2011 ) {
-                            $this->applyCalendarUSA();
-                        }
-                        break;
-                }
+                $this->loadNationalCalendarData();
+                $this->applyNationalCalendar();
             }
 
             if( $this->LitSettings->DiocesanCalendar !== null && $this->DiocesanData !== null ) {
diff --git a/includes/enums/RomanMissal.php b/includes/enums/RomanMissal.php
index 76cb87f8..3ca07e79 100644
--- a/includes/enums/RomanMissal.php
+++ b/includes/enums/RomanMissal.php
@@ -63,6 +63,8 @@ class RomanMissal {
         self::EDITIO_TYPICA_TERTIA_2002             => [ "sinceYear" => 2002 ],
         self::EDITIO_TYPICA_TERTIA_EMENDATA_2008    => [ "sinceYear" => 2008 ],
         self::USA_EDITION_2011                      => [ "sinceYear" => 2011 ],
+        //the festivities applied in the '83 edition were incorporated into the Latin 2002 edition,
+        //therefore we no longer need to apply them after the year 2002 since the Latin edition takes precedence
         self::ITALY_EDITION_1983                    => [ "sinceYear" => 1983, "untilYear" => 2002 ],
         self::ITALY_EDITION_2020                    => [ "sinceYear" => 2020 ]
     ];

From 4c5dddd75e558b506df0f8b0294239ebc9c88033 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 05:47:33 +0000
Subject: [PATCH 077/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 4533b3d6..4abdfa75 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,7 +420,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -434,18 +440,33 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, php-format
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+
+#: includes/LitCalAPI.php:2063
+#, php-format
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331

From c0b2293720fb2594c4c4566907b4fd8063c2b22f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 10 May 2022 07:47:37 +0200
Subject: [PATCH 078/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 33 ++++++++++++++++++++-----
 i18n/es/LC_MESSAGES/litcal.po | 33 ++++++++++++++++++++-----
 i18n/fr/LC_MESSAGES/litcal.po | 33 ++++++++++++++++++++-----
 i18n/it/LC_MESSAGES/litcal.po | 45 ++++++++++++++++++++++++++++++-----
 i18n/la/LC_MESSAGES/litcal.po | 44 +++++++++++++++++++++++++++++-----
 i18n/pt/LC_MESSAGES/litcal.po | 33 ++++++++++++++++++++-----
 6 files changed, 185 insertions(+), 36 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 233c558b..7c1d16dd 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,18 +442,33 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, php-format
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+
+#: includes/LitCalAPI.php:2063
+#, php-format
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 1beb2840..ccc0c77f 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -425,7 +425,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -439,18 +445,33 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, php-format
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+
+#: includes/LitCalAPI.php:2063
+#, php-format
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index fe0fbc1f..840dbe97 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,18 +442,33 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, php-format
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+
+#: includes/LitCalAPI.php:2063
+#, php-format
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 8f6e3966..7b1bb3fe 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -477,7 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -491,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,11 +506,38 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
+#: includes/LitCalAPI.php:2045
+#, fuzzy, php-format
+#| msgid ""
+#| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
+#| "applicable to the year %6$d."
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+"La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
+"(%5$s), applicabile pertanto all'anno %6$d."
+
+#: includes/LitCalAPI.php:2063
+#, fuzzy, php-format
+#| msgid ""
+#| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
+#| "%4$d (%5$s) and usually celebrated on %6$s, is suppressed by the %7$s "
+#| "'%8$s' in the year %9$d."
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+"La %1$s '%2$s', aggiunta nella %3$s del Messale Romano dall'anno %4$d (%5$s) "
+"e celebrata solitamente il giorno %6$s, è soppressa dalla %7$s '%8$s' "
+"nell'anno %9$d."
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index d7337a53..a60493b0 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -471,7 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -485,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -494,11 +500,37 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, fuzzy, php-format
+#| msgid ""
+#| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
+#| "applicable to the year %6$d."
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+"%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
+"ergo viget in anno %6$d."
+
+#: includes/LitCalAPI.php:2063
+#, fuzzy, php-format
+#| msgid ""
+#| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
+#| "%4$d (%5$s) and usually celebrated on %6$s, is suppressed by the %7$s "
+#| "'%8$s' in the year %9$d."
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+"%1$s '%2$s' aggregata in %3$s Missalis Romani ab anno %4$d (%5$s) et "
+"plerumque celebrata in die %6$s subplantata est ab %7$s '%8$s' in anno %9$d."
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index a7098861..abac7383 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-01 12:51+0000\n"
+"POT-Creation-Date: 2022-05-10 05:47+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1783
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:1941
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,7 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1854
+#: includes/LitCalAPI.php:1781
+msgid ""
+"We should be creating a new festivity, however we do not seem to have the "
+"correct date information in order to proceed"
+msgstr ""
+
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -436,18 +442,33 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1876
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1889
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
+#: includes/LitCalAPI.php:2045
+#, php-format
+msgid ""
+"The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
+"room for '%3$s': applicable to the year %4$d."
+msgstr ""
+
+#: includes/LitCalAPI.php:2063
+#, php-format
+msgid ""
+"The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
+"%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
+"in the year %9$d."
+msgstr ""
+
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
 #: includes/enums/LitCommon.php:331

From ea5beacd4d21c050aaf0629596feef430f4faa5b Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Tue, 10 May 2022 17:19:54 +0200
Subject: [PATCH 079/152] standardize LitCalDicoesanData /
 LitCalNationalAndRegionalData

---
 LitCalDiocesanData.php            | 12 ++++++++----
 LitCalNationalAndRegionalData.php |  5 ++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/LitCalDiocesanData.php b/LitCalDiocesanData.php
index 620a88c2..64115987 100644
--- a/LitCalDiocesanData.php
+++ b/LitCalDiocesanData.php
@@ -8,6 +8,10 @@
 include_once( 'includes/enums/ReturnType.php' );
 include_once( 'includes/APICore.php' );
 
+if( file_exists("allowedOrigins.php") ) {
+    include_once( 'allowedOrigins.php' );
+}
+
 $allowedOrigins = [
     "https://johnromanodorazio.com",
     "https://www.johnromanodorazio.com",
@@ -15,6 +19,10 @@
     "https://litcal-staging.johnromanodorazio.com"
 ];
 
+if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
+    $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
+}
+
 $LitCalDiocesanData = new LitCalDiocesanData();
 
 $LitCalDiocesanData->APICore->setAllowedOrigins( $allowedOrigins );
@@ -47,7 +55,6 @@ private function handleGetPostRequests( array $REQUEST ) {
             $this->DATA = (object)$REQUEST;
         }
         $this->retrieveDiocesanCalendar();
-
     }
 
     private function handlePutPatchDeleteRequests( string $requestMethod ) {
@@ -70,7 +77,6 @@ private function handlePutPatchDeleteRequests( string $requestMethod ) {
     }
 
     private function handleRequestedMethod() {
-
         switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
             case RequestMethod::GET:
                 $this->handleGetPostRequests( $_GET );
@@ -192,12 +198,10 @@ private function deleteDiocesanCalendar() {
     }
 
     public function Init() {
-
         $this->APICore->Init();
         $this->APICore->setResponseContentTypeHeader();
         $this->loadIndex();
         $this->handleRequestedMethod();
-
     }
 
 }
diff --git a/LitCalNationalAndRegionalData.php b/LitCalNationalAndRegionalData.php
index e917d1db..e598eb5a 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalNationalAndRegionalData.php
@@ -16,9 +16,7 @@
     "https://johnromanodorazio.com",
     "https://www.johnromanodorazio.com",
     "https://litcal.johnromanodorazio.com",
-    "https://litcal-staging.johnromanodorazio.com",
-    "https://litcal.org",
-    "https://www.litcal.org"
+    "https://litcal-staging.johnromanodorazio.com"
 ];
 
 if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
@@ -48,6 +46,7 @@ public function __construct(){
     }
 
     private function handleGetPostRequests( array $REQUEST ) {
+
         $this->APICore->validateAcceptHeader( true );
         if( $this->APICore->getRequestContentType() === 'application/json' ) {
             $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();

From b81b8681c1d2307d3ad95c0aefc15fca3cb92aa2 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Tue, 10 May 2022 22:09:26 +0200
Subject: [PATCH 080/152] unify DiocesanData and NationalData endpoints

---
 LitCalDiocesanData.php                        | 207 ------------------
 ...RegionalData.php => LitCalRegionalData.php | 195 +++++++++++------
 2 files changed, 132 insertions(+), 270 deletions(-)
 delete mode 100644 LitCalDiocesanData.php
 rename LitCalNationalAndRegionalData.php => LitCalRegionalData.php (58%)

diff --git a/LitCalDiocesanData.php b/LitCalDiocesanData.php
deleted file mode 100644
index 64115987..00000000
--- a/LitCalDiocesanData.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-error_reporting( E_ALL );
-ini_set( 'display_errors', 1 );
-
-include_once( 'includes/enums/AcceptHeader.php' );
-include_once( 'includes/enums/RequestMethod.php' );
-include_once( 'includes/enums/RequestContentType.php' );
-include_once( 'includes/enums/ReturnType.php' );
-include_once( 'includes/APICore.php' );
-
-if( file_exists("allowedOrigins.php") ) {
-    include_once( 'allowedOrigins.php' );
-}
-
-$allowedOrigins = [
-    "https://johnromanodorazio.com",
-    "https://www.johnromanodorazio.com",
-    "https://litcal.johnromanodorazio.com",
-    "https://litcal-staging.johnromanodorazio.com"
-];
-
-if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
-    $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
-}
-
-$LitCalDiocesanData = new LitCalDiocesanData();
-
-$LitCalDiocesanData->APICore->setAllowedOrigins( $allowedOrigins );
-$LitCalDiocesanData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
-
-$LitCalDiocesanData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
-$LitCalDiocesanData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
-$LitCalDiocesanData->Init();
-
-class LitCalDiocesanData {
-
-    private object $DATA;
-    private object $RESPONSE;
-    private ?stdClass $GeneralIndex                 = null;
-
-    public APICore $APICore;
-
-    public function __construct(){
-        $this->APICore                              = new APICore();
-        $this->RESPONSE                             = new stdClass();
-        $this->RESPONSE->requestHeadersReceived     = $this->APICore->getJsonEncodedRequestHeaders();
-    }
-
-    private function handleGetPostRequests( array $REQUEST ) {
-
-        $this->APICore->validateAcceptHeader( true );
-        if( $this->APICore->getRequestContentType() === 'application/json' ) {
-            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
-        } else {
-            $this->DATA = (object)$REQUEST;
-        }
-        $this->retrieveDiocesanCalendar();
-    }
-
-    private function handlePutPatchDeleteRequests( string $requestMethod ) {
-        $this->APICore->validateAcceptHeader( false );
-        $this->APICore->enforceAjaxRequest();
-        $this->APICore->enforceReferer();
-        if( $this->APICore->getRequestContentType() === 'application/json' ) {
-            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
-            if( RequestMethod::PUT === $requestMethod ) {
-                $this->writeDiocesanCalendar();
-            } elseif( RequestMethod::DELETE === $requestMethod ) {
-                $this->deleteDiocesanCalendar();
-            }
-            
-        } else{
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 415 Unsupported Media Type", true, 415 );
-            die( '{"error":"You seem to be forming a strange kind of request? Only \'application/json\' is allowed as the Content Type for the body of the Request when using Request Methods PUT, PATCH, or DELETE: the Content Type for the body of your Request was '.$_SERVER[ 'CONTENT_TYPE' ].' and you are using Request Method ' . $_SERVER[ 'REQUEST_METHOD' ] . '"}' );
-        }
-
-    }
-
-    private function handleRequestedMethod() {
-        switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
-            case RequestMethod::GET:
-                $this->handleGetPostRequests( $_GET );
-                break;
-            case RequestMethod::POST:
-                $this->handleGetPostRequests( $_POST );
-                break;
-            case RequestMethod::PUT:
-            case RequestMethod::PATCH:
-                $this->handlePutPatchDeleteRequests( RequestMethod::PUT );
-                break;
-            case RequestMethod::DELETE:
-                $this->handlePutPatchDeleteRequests( RequestMethod::DELETE );
-                break;
-            case RequestMethod::OPTIONS:
-                //continue;
-                break;
-            default:
-                header( $_SERVER[ "SERVER_PROTOCOL" ]." 405 Method Not Allowed", true, 405 );
-                $errorMessage = '{"error":"You seem to be forming a strange kind of request? Allowed Request Methods are ';
-                $errorMessage .= implode( ' and ', $this->AllowedRequestMethods );
-                $errorMessage .= ', but your Request Method was ' . strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) . '"}';
-                die( $errorMessage );
-        }
-    }
-
-    private function loadIndex() {
-        if( file_exists( "nations/index.json" ) ){
-            $this->GeneralIndex = json_decode( file_get_contents( "nations/index.json" ) );
-        }
-    }
-
-    private function createOrUpdateIndex( string $path, bool $delete = false ) {
-        if( null === $this->GeneralIndex ){
-            $this->GeneralIndex = new stdClass();
-        }
-        $key = strtoupper(preg_replace("/[^a-zA-Z]/","",$this->RESPONSE->Diocese));
-
-        if( $delete ) {
-            if( property_exists( $this->GeneralIndex, $key ) ) {
-                unset( $this->GeneralIndex->$key );
-            }
-        } else {
-            if( !property_exists( $this->GeneralIndex, $key ) ){
-                $this->GeneralIndex->$key = new stdClass();
-            }
-            $this->GeneralIndex->$key->path = $path . "/{$this->RESPONSE->Diocese}.json";
-            $this->GeneralIndex->$key->nation = $this->RESPONSE->Nation;
-            $this->GeneralIndex->$key->diocese = $this->RESPONSE->Diocese;
-            if(property_exists($this->RESPONSE,'Group')){
-                $this->GeneralIndex->$key->group = $this->RESPONSE->Group;
-            }
-        }
-
-        file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex ) . PHP_EOL );
-    }
-
-    private function retrieveDiocesanCalendar() {
-        if( property_exists( $this->DATA, 'key' ) ) {
-            $key = $this->DATA->key;
-            $calendarPath = $this->GeneralIndex->$key->path;
-            if( file_exists( $calendarPath ) ) {
-                echo file_get_contents( $calendarPath );
-                die();
-            }
-        }
-    }
-
-    private function writeDiocesanCalendar() {
-        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-            die( '{"error":"Required parameters were not received"}' );
-        } else {
-            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
-            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
-            $CalData = json_decode( $this->DATA->calendar );
-            if( json_last_error() !== JSON_ERROR_NONE ) {
-                header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-                die( '{"error":"Malformed data received in <calendar> parameters"}' );
-            }
-            if( property_exists( $this->DATA, 'overrides' ) ) {
-                $CalData->Overrides = $this->DATA->overrides;
-            }
-            $this->RESPONSE->Calendar = json_encode( $CalData );
-            if( property_exists( $this->DATA, 'group' ) ) {
-                $this->RESPONSE->Group = strip_tags( $this->DATA->group );
-            }
-            $path = "nations/{$this->RESPONSE->Nation}";
-            if( !file_exists( $path ) ){
-                mkdir( $path, 0755, true );
-            }
-
-            file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
-
-            $this->createOrUpdateIndex( $path );
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
-            die( '{"success":"Diocesan calendar created or updated for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
-
-        }
-    }
-
-    private function deleteDiocesanCalendar() {
-        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-            die( '{"error":"Required parameters were not received"}' );
-        } else {
-            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
-            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
-            $path = "nations/{$this->RESPONSE->Nation}";
-            if( file_exists( $path . "/{$this->RESPONSE->Diocese}.json" ) ){
-                unlink($path . "/{$this->RESPONSE->Diocese}.json");
-            }
-
-            $this->createOrUpdateIndex( $path, true );
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 200 OK", true, 200 );
-            die( '{"success":"Diocesan calendar deleted for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
-
-        }
-    }
-
-    public function Init() {
-        $this->APICore->Init();
-        $this->APICore->setResponseContentTypeHeader();
-        $this->loadIndex();
-        $this->handleRequestedMethod();
-    }
-
-}
diff --git a/LitCalNationalAndRegionalData.php b/LitCalRegionalData.php
similarity index 58%
rename from LitCalNationalAndRegionalData.php
rename to LitCalRegionalData.php
index e598eb5a..0269a0ba 100644
--- a/LitCalNationalAndRegionalData.php
+++ b/LitCalRegionalData.php
@@ -23,19 +23,21 @@
     $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
 }
 
-$LitCalNationalData = new LitCalNationalData();
+$LitCalRegionalData = new LitCalRegionalData();
 
-$LitCalNationalData->APICore->setAllowedOrigins( $allowedOrigins );
-$LitCalNationalData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
+$LitCalRegionalData->APICore->setAllowedOrigins( $allowedOrigins );
+$LitCalRegionalData->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
 
-$LitCalNationalData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
-$LitCalNationalData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
-$LitCalNationalData->Init();
+$LitCalRegionalData->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
+$LitCalRegionalData->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
+$LitCalRegionalData->Init();
 
-class LitCalNationalData {
+class LitCalRegionalData {
 
     private object $DATA;
     private object $RESPONSE;
+    //The General Index is currently only used for diocesan calendars
+    private ?stdClass $GeneralIndex                 = null;
 
     public APICore $APICore;
 
@@ -45,34 +47,6 @@ public function __construct(){
         $this->RESPONSE->requestHeadersReceived     = $this->APICore->getJsonEncodedRequestHeaders();
     }
 
-    private function handleGetPostRequests( array $REQUEST ) {
-
-        $this->APICore->validateAcceptHeader( true );
-        if( $this->APICore->getRequestContentType() === 'application/json' ) {
-            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
-        } else {
-            $this->DATA = (object)$REQUEST;
-        }
-        $this->retrieveNationalCalendar();
-    }
-
-    private function handlePutPatchDeleteRequests( string $requestMethod ) {
-        $this->APICore->validateAcceptHeader( false );
-        $this->APICore->enforceAjaxRequest();
-        $this->APICore->enforceReferer();
-        if( $this->APICore->getRequestContentType() === 'application/json' ) {
-            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
-            if( RequestMethod::PUT === $requestMethod ) {
-                $this->writeNationalCalendar();
-            } elseif( RequestMethod::DELETE === $requestMethod ) {
-                $this->deleteNationalCalendar();
-            }
-        } else{
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 415 Unsupported Media Type", true, 415 );
-            die( '{"error":"You seem to be forming a strange kind of request? Only \'application/json\' is allowed as the Content Type for the body of the Request when using Request Methods PUT, PATCH, or DELETE: the Content Type for the body of your Request was '.$_SERVER[ 'CONTENT_TYPE' ].' and you are using Request Method ' . $_SERVER[ 'REQUEST_METHOD' ] . '"}' );
-        }
-    }
-
     private function handleRequestedMethod() {
         switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
             case RequestMethod::GET:
@@ -100,43 +74,79 @@ private function handleRequestedMethod() {
         }
     }
 
-    private function retrieveNationalCalendar() {
-        if( property_exists( $this->DATA, 'category' ) ) {
-            $category = $this->DATA->category; //nationalCalendar or widerRegionCalendar
-            if( property_exists( $this->DATA, 'key' ) ) {
-                $key = $this->DATA->key;
-                if( $category === "widerRegionCalendar" ) {
+    private function handleGetPostRequests( array $REQUEST ) {
+
+        $this->APICore->validateAcceptHeader( true );
+        if( $this->APICore->getRequestContentType() === 'application/json' ) {
+            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
+        } else {
+            $this->DATA = (object)$REQUEST;
+        }
+        $this->retrieveRegionalCalendar();
+    }
+
+    private function handlePutPatchDeleteRequests( string $requestMethod ) {
+        $this->APICore->validateAcceptHeader( false );
+        $this->APICore->enforceAjaxRequest();
+        $this->APICore->enforceReferer();
+        if( $this->APICore->getRequestContentType() === 'application/json' ) {
+            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
+            if( RequestMethod::PUT === $requestMethod ) {
+                $this->writeRegionalCalendar();
+            } elseif( RequestMethod::DELETE === $requestMethod ) {
+                $this->deleteRegionalCalendar();
+            }
+        } else{
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 415 Unsupported Media Type", true, 415 );
+            die( '{"error":"You seem to be forming a strange kind of request? Only \'application/json\' is allowed as the Content Type for the body of the Request when using Request Methods PUT, PATCH, or DELETE: the Content Type for the body of your Request was '.$_SERVER[ 'CONTENT_TYPE' ].' and you are using Request Method ' . $_SERVER[ 'REQUEST_METHOD' ] . '"}' );
+        }
+    }
+
+    private function retrieveRegionalCalendar() {
+        if( property_exists( $this->DATA, 'category' ) && property_exists( $this->DATA, 'key' ) ) {
+            $category = $this->DATA->category;
+            $key = $this->DATA->key;
+            switch( $category ) {
+                case "diocesanCalendar":
+                    $calendarDataFile = $this->GeneralIndex->$key->path;
+                    break;
+                case "widerRegionCalendar":
                     $calendarDataFile = "nations/{$key}.json";
-                }
-                else if( $category === "nationalCalendar" ) {
+                    break;
+                case "nationalCalendar":
                     $calendarDataFile = "nations/{$key}/{$key}.json";
-                }
-                if( file_exists( $calendarDataFile ) ) {
-                    $response = json_decode( file_get_contents( $calendarDataFile ) );
+                    break;
+            }
+
+            if( file_exists( $calendarDataFile ) ) {
+                if( $category === "diocesanCalendar" ) {
+                    echo file_get_contents( $calendarDataFile );
+                    die();
+                } else {
+                    $this->RESPONSE = json_decode( file_get_contents( $calendarDataFile ) );
                     $uKey = strtoupper( $key );
                     if( $category === "widerRegionCalendar" ) {
-                        $response->isMultilingual = is_dir( "nations/{$uKey}" );
+                        $this->RESPONSE->isMultilingual = is_dir( "nations/{$uKey}" );
                         $locale = strtolower( $this->DATA->locale );
                         if( file_exists( "nations/{$uKey}/{$locale}.json" ) ) {
                             $localeData = json_decode( file_get_contents( "nations/{$uKey}/{$locale}.json" ) );
-                            foreach( $response->LitCal as $idx => $el ) {
-                                $response->LitCal[$idx]->Festivity->name = $localeData->{$response->LitCal[$idx]->Festivity->tag};
+                            foreach( $this->RESPONSE->LitCal as $idx => $el ) {
+                                $this->RESPONSE->LitCal[$idx]->Festivity->name = $localeData->{$response->LitCal[$idx]->Festivity->tag};
                             }
                         }
                     }
-                    $responseStr = json_encode( $response );
-                    echo $responseStr;
-                    die();
-                } else {
-                    header( $_SERVER[ "SERVER_PROTOCOL" ]." 404 Not Found", true, 404 );
-                    echo "{\"message\":\"file $calendarDataFile does not exist\"}";
+                    echo json_encode( $this->RESPONSE );
                     die();
                 }
+            } else {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 404 Not Found", true, 404 );
+                echo "{\"message\":\"file $calendarDataFile does not exist\"}";
+                die();
             }
         }
     }
 
-    private function writeNationalCalendar() {
+    private function writeRegionalCalendar() {
         if( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Metadata' ) && property_exists( $this->DATA, 'Settings' ) ) {
             $region = $this->DATA->Metadata->Region;
             if( $region === 'UNITED STATES' ) {
@@ -176,34 +186,93 @@ private function writeNationalCalendar() {
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
             die( '{"success":"Wider region calendar created or updated for region \"'. $this->DATA->Metadata->WiderRegion .'\""}' );
         }
+        else if ( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Diocese' ) && property_exists( $this->DATA, 'Nation' ) ) {
+            $this->RESPONSE->Nation = strip_tags( $this->DATA->Nation );
+            $this->RESPONSE->Diocese = strip_tags( $this->DATA->Diocese );
+            $CalData = json_decode( $this->DATA->LitCal );
+            if( json_last_error() !== JSON_ERROR_NONE ) {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
+                die( '{"error":"Malformed data received in <LitCal> parameters"}' );
+            }
+            if( property_exists( $this->DATA, 'Overrides' ) ) {
+                $CalData->Overrides = $this->DATA->Overrides;
+            }
+            $this->RESPONSE->Calendar = json_encode( $CalData );
+            if( property_exists( $this->DATA, 'group' ) ) {
+                $this->RESPONSE->Group = strip_tags( $this->DATA->group );
+            }
+            $path = "nations/{$this->RESPONSE->Nation}";
+            if( !file_exists( $path ) ){
+                mkdir( $path, 0755, true );
+            }
+
+            file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
+
+            $this->createOrUpdateIndex( $path );
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
+            die( '{"success":"Diocesan calendar created or updated for diocese \"'. $this->RESPONSE->Diocese .'\""}' );
+
+        }
         else {
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
-            die( '{"error":"Not all required parameters were received (LitCal, Metadata, Settings)"}' );
+            die( '{"error":"Not all required parameters were received (LitCal, Metadata, Settings|NationalCalendars OR LitCal, diocese, nation)"}' );
         }
     }
 
-    private function deleteNationalCalendar() {
-        if( !property_exists( $this->DATA, 'calendar' ) || !property_exists( $this->DATA, 'diocese' ) || !property_exists( $this->DATA, 'nation' ) ) {
+    private function deleteRegionalCalendar() {
+        if( !property_exists( $this->DATA, 'LitCal' ) || !property_exists( $this->DATA, 'Diocese' ) || !property_exists( $this->DATA, 'Nation' ) ) {
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 400 Bad request", true, 400 );
             die( '{"error":"Required parameters were not received"}' );
         } else {
-            $this->RESPONSE->Nation = strip_tags( $this->DATA->nation );
-            $this->RESPONSE->Diocese = strip_tags( $this->DATA->diocese );
+            $this->RESPONSE->Nation = strip_tags( $this->DATA->Nation );
+            $this->RESPONSE->Diocese = strip_tags( $this->DATA->Diocese );
             $path = "nations/{$this->RESPONSE->Nation}";
             if( file_exists( $path . "/{$this->RESPONSE->Diocese}.json" ) ){
                 unlink($path . "/{$this->RESPONSE->Diocese}.json");
             }
 
-            //$this->createOrUpdateIndex( $path, true );
+            $this->createOrUpdateIndex( $path, true );
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 200 OK", true, 200 );
-            die( '{"success":"National calendar deleted for nation \"'. $this->RESPONSE->Diocese .'\""}' );
+            die( '{"success":"Diocesan calendar deleted for nation \"'. $this->RESPONSE->Diocese .'\""}' );
+
+        }
+    }
 
+    private function loadIndex() {
+        if( file_exists( "nations/index.json" ) ){
+            $this->GeneralIndex = json_decode( file_get_contents( "nations/index.json" ) );
         }
     }
 
+    private function createOrUpdateIndex( string $path, bool $delete = false ) {
+        if( null === $this->GeneralIndex ){
+            $this->GeneralIndex = new stdClass();
+        }
+        $key = strtoupper(preg_replace("/[^a-zA-Z]/","",$this->RESPONSE->Diocese));
+
+        if( $delete ) {
+            if( property_exists( $this->GeneralIndex, $key ) ) {
+                unset( $this->GeneralIndex->$key );
+            }
+        } else {
+            if( !property_exists( $this->GeneralIndex, $key ) ){
+                $this->GeneralIndex->$key = new stdClass();
+            }
+            $this->GeneralIndex->$key->path = $path . "/{$this->RESPONSE->Diocese}.json";
+            $this->GeneralIndex->$key->nation = $this->RESPONSE->Nation;
+            $this->GeneralIndex->$key->diocese = $this->RESPONSE->Diocese;
+            if(property_exists($this->RESPONSE,'Group')){
+                $this->GeneralIndex->$key->group = $this->RESPONSE->Group;
+            }
+        }
+
+        file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex ) . PHP_EOL );
+    }
+
     public function Init() {
         $this->APICore->Init();
         $this->APICore->setResponseContentTypeHeader();
+        $this->loadIndex();
         $this->handleRequestedMethod();
     }
 

From 5638ec6950ac5742175d7e6656c18af873b43cfd Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 01:12:14 +0200
Subject: [PATCH 081/152] fix variable refactoring

---
 LitCalRegionalData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LitCalRegionalData.php b/LitCalRegionalData.php
index 0269a0ba..6945b0d8 100644
--- a/LitCalRegionalData.php
+++ b/LitCalRegionalData.php
@@ -131,7 +131,7 @@ private function retrieveRegionalCalendar() {
                         if( file_exists( "nations/{$uKey}/{$locale}.json" ) ) {
                             $localeData = json_decode( file_get_contents( "nations/{$uKey}/{$locale}.json" ) );
                             foreach( $this->RESPONSE->LitCal as $idx => $el ) {
-                                $this->RESPONSE->LitCal[$idx]->Festivity->name = $localeData->{$response->LitCal[$idx]->Festivity->tag};
+                                $this->RESPONSE->LitCal[$idx]->Festivity->name = $localeData->{$this->RESPONSE->LitCal[$idx]->Festivity->tag};
                             }
                         }
                     }

From a837f7b739e215af6eba2337b513200af778d71c Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 01:59:04 +0200
Subject: [PATCH 082/152] ensure color and common always arrays

always pretty print JSON
---
 LitCalRegionalData.php                        |   4 +-
 nations/ITALY/Diocesi di Roma.json            | 799 ++++++++++--------
 ... Sora - Cassino - Aquino - Pontecorvo.json |   6 +-
 nations/ITALY/ITALY.json                      |   4 +-
 ...Archdiocese of Boston (Massachusetts).json |   4 +-
 5 files changed, 477 insertions(+), 340 deletions(-)

diff --git a/LitCalRegionalData.php b/LitCalRegionalData.php
index 6945b0d8..98841beb 100644
--- a/LitCalRegionalData.php
+++ b/LitCalRegionalData.php
@@ -197,7 +197,7 @@ private function writeRegionalCalendar() {
             if( property_exists( $this->DATA, 'Overrides' ) ) {
                 $CalData->Overrides = $this->DATA->Overrides;
             }
-            $this->RESPONSE->Calendar = json_encode( $CalData );
+            $this->RESPONSE->Calendar = json_encode( $CalData, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
             if( property_exists( $this->DATA, 'group' ) ) {
                 $this->RESPONSE->Group = strip_tags( $this->DATA->group );
             }
@@ -266,7 +266,7 @@ private function createOrUpdateIndex( string $path, bool $delete = false ) {
             }
         }
 
-        file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex ) . PHP_EOL );
+        file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE ) . PHP_EOL );
     }
 
     public function Init() {
diff --git a/nations/ITALY/Diocesi di Roma.json b/nations/ITALY/Diocesi di Roma.json
index 8f5c6c04..f2744b75 100644
--- a/nations/ITALY/Diocesi di Roma.json	
+++ b/nations/ITALY/Diocesi di Roma.json	
@@ -1,334 +1,471 @@
 {
-    "LitCal": {
-        "BeatoGregorioXpapa": {
-            "name": "Beato Gregorio X, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 9,
-            "month": 1,
-            "formRowNum": 0,
-            "sinceYear": 1973
-        },
-        "SanVincenzoPallottisacerdote": {
-            "name": "San Vincenzo Pallotti, sacerdote",
-            "color": "white",
-            "grade": 3,
-            "common": "Proper",
-            "day": 22,
-            "month": 1,
-            "formRowNum": 1,
-            "sinceYear": 1973
-        },
-        "BeataLudovicaAlbertoni": {
-            "name": "Beata Ludovica Albertoni",
-            "color": "white",
-            "grade": 2,
-            "common": "Holy Men and Women:For Those Who Practiced Works of Mercy",
-            "day": 1,
-            "month": 2,
-            "formRowNum": 1,
-            "sinceYear": 1973
-        },
-        "SantoIlaropapa": {
-            "name": "Santo Ilaro, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 28,
-            "month": 2,
-            "formRowNum": 2,
-            "sinceYear": 1973
-        },
-        "SanFeliceIIIpapa": {
-            "name": "San Felice III, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 1,
-            "month": 3,
-            "formRowNum": 3,
-            "sinceYear": 1973
-        },
-        "SanMartinoIpapaemartire": {
-            "name": "San Martino I, papa e martire",
-            "color": "red,white",
-            "grade": 3,
-            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
-            "day": 13,
-            "month": 4,
-            "formRowNum": 2,
-            "sinceYear": 1973
-        },
-        "SanBenedettoGiuseppeLabre": {
-            "name": "San Benedetto Giuseppe Labre",
-            "color": "white",
-            "grade": 3,
-            "common": "Proper",
-            "day": 16,
-            "month": 4,
-            "formRowNum": 3,
-            "sinceYear": 1973
-        },
-        "SanLeoneIXpapa": {
-            "name": "San Leone IX, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Proper",
-            "day": 19,
-            "month": 4,
-            "formRowNum": 4,
-            "sinceYear": 1973
-        },
-        "SanPioVpapa": {
-            "name": "San Pio V, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 30,
-            "month": 4,
-            "formRowNum": 5,
-            "sinceYear": 1973
-        },
-        "SanFelicedaCantalicereligioso": {
-            "name": "San Felice da Cantalice, religioso",
-            "color": "white",
-            "grade": 2,
-            "common": "Proper",
-            "day": 18,
-            "month": 5,
-            "formRowNum": 4,
-            "sinceYear": 1973
-        },
-        "SanGiovanniBattistadeRossisacerdote": {
-            "name": "San Giovanni Battista de Rossi, sacerdote",
-            "color": "white",
-            "grade": 3,
-            "common": "Proper",
-            "day": 23,
-            "month": 5,
-            "formRowNum": 6,
-            "sinceYear": 1973
-        },
-        "BeataMariaVergineAuxiliumChristianorum": {
-            "name": "Beata Maria Vergine «Auxilium Christianorum»",
-            "color": "white",
-            "grade": 2,
-            "common": "Proper",
-            "day": 24,
-            "month": 5,
-            "formRowNum": 5,
-            "sinceYear": 1973
-        },
-        "SanGregorioVIIpapa": {
-            "name": "San Gregorio VII, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 25,
-            "month": 5,
-            "formRowNum": 7,
-            "sinceYear": 1973
-        },
-        "SantiMarcellinoePietromartiri": {
-            "name": "Santi Marcellino e Pietro, martiri",
-            "color": "red",
-            "grade": 3,
-            "common": "Martyrs:For Several Martyrs",
-            "day": 2,
-            "month": 6,
-            "formRowNum": 8,
-            "sinceYear": 1973
-        },
-        "BeataAnnaMariaTaigi": {
-            "name": "Beata Anna Maria Taigi",
-            "color": "white",
-            "grade": 3,
-            "common": "Holy Men and Women:For Holy Women",
-            "day": 9,
-            "month": 6,
-            "formRowNum": 9,
-            "sinceYear": 1973
-        },
-        "SantiGiovanniePaolomartiri": {
-            "name": "Santi Giovanni e Paolo, martiri",
-            "color": "red",
-            "grade": 2,
-            "common": "Martyrs",
-            "day": 26,
-            "month": 6,
-            "formRowNum": 6,
-            "sinceYear": 1973
-        },
-        "SantiPietroePaoloApostoliPatroniprincipalidiRoma": {
-            "name": "Santi Pietro e Paolo, Apostoli, Patroni principali di Roma",
-            "color": "red",
-            "grade": 6,
-            "common": "Proper",
-            "day": 29,
-            "month": 6,
-            "formRowNum": 0,
-            "sinceYear": 1973
-        },
-        "SantiPrimiMartiridellaChiesaRomana": {
-            "name": "Santi Primi Martiri della Chiesa Romana",
-            "color": "red",
-            "grade": 3,
-            "common": "Martyrs:For Several Martyrs",
-            "day": 30,
-            "month": 6,
-            "formRowNum": 10,
-            "sinceYear": 1973
-        },
-        "SantaBrigidareligiosa": {
-            "name": "Santa Brigida, religiosa",
-            "color": "white",
-            "grade": 3,
-            "common": "Holy Men and Women:For Religious,Holy Men and Women:For Holy Women",
-            "day": 23,
-            "month": 7,
-            "formRowNum": 11,
-            "sinceYear": 1973
-        },
-        "BeatoInnocenzoXIpapa": {
-            "name": "Beato Innocenzo XI, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 12,
-            "month": 8,
-            "formRowNum": 8,
-            "sinceYear": 1973
-        },
-        "SanSistoIIIpapa": {
-            "name": "San Sisto III, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 19,
-            "month": 8,
-            "formRowNum": 9,
-            "sinceYear": 1973
-        },
-        "SanGasparedelBufalosacerdote": {
-            "name": "San Gaspare del Bufalo, sacerdote",
-            "color": "white",
-            "grade": 3,
-            "common": "Proper",
-            "day": 21,
-            "month": 10,
-            "formRowNum": 13,
-            "sinceYear": 1973
-        },
-        "SanNicolaIpapa": {
-            "name": "San Nicola I, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 13,
-            "month": 11,
-            "formRowNum": 14,
-            "sinceYear": 1973
-        },
-        "SanGelasioIpapa": {
-            "name": "San Gelasio I, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 20,
-            "month": 11,
-            "formRowNum": 10,
-            "sinceYear": 1973
-        },
-        "SanClementeIpapaemartire": {
-            "name": "San Clemente I, papa e martire",
-            "color": "red,white",
-            "grade": 3,
-            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
-            "day": 23,
-            "month": 11,
-            "formRowNum": 15,
-            "sinceYear": 1973
-        },
-        "SanSiriciopapa": {
-            "name": "San Siricio, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 26,
-            "month": 11,
-            "formRowNum": 11,
-            "sinceYear": 1973
-        },
-        "SanLeonardodaPortoMauriziosacerdote": {
-            "name": "San Leonardo da Porto Maurizio, sacerdote",
-            "color": "white",
-            "grade": 2,
-            "common": "Holy Men and Women:For Religious",
-            "day": 26,
-            "month": 11,
-            "formRowNum": 12,
-            "sinceYear": 1973
-        },
-        "SanDamasoIpapa": {
-            "name": "San Damaso I, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 11,
-            "month": 12,
-            "formRowNum": 16,
-            "sinceYear": 1973
-        },
-        "DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma": {
-            "name": "Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma",
-            "color": "white",
-            "grade": 4,
-            "common": "Dedication of a Church",
-            "day": 9,
-            "month": 11,
-            "formRowNum": 1,
-            "sinceYear": 1973
-        },
-        "SanGiovanniPaoloIIpapa": {
-            "name": "San Giovanni Paolo II, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 22,
-            "month": 10,
-            "formRowNum": 17,
-            "sinceYear": 2014
-        },
-        "BeatoUrbanoIIpapa": {
-            "name": "Beato Urbano II, papa",
-            "color": "white",
-            "grade": 2,
-            "common": "Pastors:For a Pope",
-            "day": 28,
-            "month": 7,
-            "formRowNum": 7,
-            "sinceYear": 1973
-        },
-        "SantAgatonepapa": {
-            "name": "Sant'Agatone, papa",
-            "color": "white",
-            "grade": 3,
-            "common": "Pastors:For a Pope",
-            "day": 10,
-            "month": 1,
-            "formRowNum": 0,
-            "sinceYear": 1973
-        },
-        "SanCallistoIpapaemartire": {
-            "name": "San Callisto I, papa e martire",
-            "color": "red,white",
-            "grade": 3,
-            "common": "Martyrs:For One Martyr,Pastors:For a Pope",
-            "day": 14,
-            "month": 10,
-            "formRowNum": 12,
-            "sinceYear": 1970
-        }
+    "BeatoGregorioXpapa": {
+        "name": "Beato Gregorio X, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 9,
+        "month": 1,
+        "formRowNum": 0,
+        "sinceYear": 1973
+    },
+    "SanVincenzoPallottisacerdote": {
+        "name": "San Vincenzo Pallotti, sacerdote",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Proper"
+        ],
+        "day": 22,
+        "month": 1,
+        "formRowNum": 1,
+        "sinceYear": 1973
+    },
+    "BeataLudovicaAlbertoni": {
+        "name": "Beata Ludovica Albertoni",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
+        "day": 1,
+        "month": 2,
+        "formRowNum": 1,
+        "sinceYear": 1973
+    },
+    "SantoIlaropapa": {
+        "name": "Santo Ilaro, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 28,
+        "month": 2,
+        "formRowNum": 2,
+        "sinceYear": 1973
+    },
+    "SanFeliceIIIpapa": {
+        "name": "San Felice III, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 1,
+        "month": 3,
+        "formRowNum": 3,
+        "sinceYear": 1973
+    },
+    "SanMartinoIpapaemartire": {
+        "name": "San Martino I, papa e martire",
+        "color": [
+            "red",
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
+        "day": 13,
+        "month": 4,
+        "formRowNum": 2,
+        "sinceYear": 1973
+    },
+    "SanBenedettoGiuseppeLabre": {
+        "name": "San Benedetto Giuseppe Labre",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Proper"
+        ],
+        "day": 16,
+        "month": 4,
+        "formRowNum": 3,
+        "sinceYear": 1973
+    },
+    "SanLeoneIXpapa": {
+        "name": "San Leone IX, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Proper"
+        ],
+        "day": 19,
+        "month": 4,
+        "formRowNum": 4,
+        "sinceYear": 1973
+    },
+    "SanPioVpapa": {
+        "name": "San Pio V, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 30,
+        "month": 4,
+        "formRowNum": 5,
+        "sinceYear": 1973
+    },
+    "SanFelicedaCantalicereligioso": {
+        "name": "San Felice da Cantalice, religioso",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Proper"
+        ],
+        "day": 18,
+        "month": 5,
+        "formRowNum": 4,
+        "sinceYear": 1973
+    },
+    "SanGiovanniBattistadeRossisacerdote": {
+        "name": "San Giovanni Battista de Rossi, sacerdote",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Proper"
+        ],
+        "day": 23,
+        "month": 5,
+        "formRowNum": 6,
+        "sinceYear": 1973
+    },
+    "BeataMariaVergineAuxiliumChristianorum": {
+        "name": "Beata Maria Vergine «Auxilium Christianorum»",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Proper"
+        ],
+        "day": 24,
+        "month": 5,
+        "formRowNum": 5,
+        "sinceYear": 1973
+    },
+    "SanGregorioVIIpapa": {
+        "name": "San Gregorio VII, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 25,
+        "month": 5,
+        "formRowNum": 7,
+        "sinceYear": 1973
+    },
+    "SantiMarcellinoePietromartiri": {
+        "name": "Santi Marcellino e Pietro, martiri",
+        "color": [
+            "red"
+        ],
+        "grade": 3,
+        "common": [
+            "Martyrs:For Several Martyrs"
+        ],
+        "day": 2,
+        "month": 6,
+        "formRowNum": 8,
+        "sinceYear": 1973
+    },
+    "BeataAnnaMariaTaigi": {
+        "name": "Beata Anna Maria Taigi",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Holy Men and Women:For Holy Women"
+        ],
+        "day": 9,
+        "month": 6,
+        "formRowNum": 9,
+        "sinceYear": 1973
+    },
+    "SantiGiovanniePaolomartiri": {
+        "name": "Santi Giovanni e Paolo, martiri",
+        "color": [
+            "red"
+        ],
+        "grade": 2,
+        "common": [
+            "Martyrs"
+        ],
+        "day": 26,
+        "month": 6,
+        "formRowNum": 6,
+        "sinceYear": 1973
+    },
+    "SantiPietroePaoloApostoliPatroniprincipalidiRoma": {
+        "name": "Santi Pietro e Paolo, Apostoli, Patroni principali di Roma",
+        "color": [
+            "red"
+        ],
+        "grade": 6,
+        "common": [
+            "Proper"
+        ],
+        "day": 29,
+        "month": 6,
+        "formRowNum": 0,
+        "sinceYear": 1973
+    },
+    "SantiPrimiMartiridellaChiesaRomana": {
+        "name": "Santi Primi Martiri della Chiesa Romana",
+        "color": [
+            "red"
+        ],
+        "grade": 3,
+        "common": [
+            "Martyrs:For Several Martyrs"
+        ],
+        "day": 30,
+        "month": 6,
+        "formRowNum": 10,
+        "sinceYear": 1973
+    },
+    "SantaBrigidareligiosa": {
+        "name": "Santa Brigida, religiosa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Holy Women"
+        ],
+        "day": 23,
+        "month": 7,
+        "formRowNum": 11,
+        "sinceYear": 1973
+    },
+    "BeatoInnocenzoXIpapa": {
+        "name": "Beato Innocenzo XI, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 12,
+        "month": 8,
+        "formRowNum": 8,
+        "sinceYear": 1973
+    },
+    "SanSistoIIIpapa": {
+        "name": "San Sisto III, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 19,
+        "month": 8,
+        "formRowNum": 9,
+        "sinceYear": 1973
+    },
+    "SanGasparedelBufalosacerdote": {
+        "name": "San Gaspare del Bufalo, sacerdote",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Proper"
+        ],
+        "day": 21,
+        "month": 10,
+        "formRowNum": 13,
+        "sinceYear": 1973
+    },
+    "SanNicolaIpapa": {
+        "name": "San Nicola I, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 13,
+        "month": 11,
+        "formRowNum": 14,
+        "sinceYear": 1973
+    },
+    "SanGelasioIpapa": {
+        "name": "San Gelasio I, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 20,
+        "month": 11,
+        "formRowNum": 10,
+        "sinceYear": 1973
+    },
+    "SanClementeIpapaemartire": {
+        "name": "San Clemente I, papa e martire",
+        "color": [
+            "red",
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
+        "day": 23,
+        "month": 11,
+        "formRowNum": 15,
+        "sinceYear": 1973
+    },
+    "SanSiriciopapa": {
+        "name": "San Siricio, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 26,
+        "month": 11,
+        "formRowNum": 11,
+        "sinceYear": 1973
+    },
+    "SanLeonardodaPortoMauriziosacerdote": {
+        "name": "San Leonardo da Porto Maurizio, sacerdote",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Holy Men and Women:For Religious"
+        ],
+        "day": 26,
+        "month": 11,
+        "formRowNum": 12,
+        "sinceYear": 1973
+    },
+    "SanDamasoIpapa": {
+        "name": "San Damaso I, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 11,
+        "month": 12,
+        "formRowNum": 16,
+        "sinceYear": 1973
+    },
+    "DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma": {
+        "name": "Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma",
+        "color": [
+            "white"
+        ],
+        "grade": 4,
+        "common": [
+            "Dedication of a Church"
+        ],
+        "day": 9,
+        "month": 11,
+        "formRowNum": 1,
+        "sinceYear": 1973
+    },
+    "SanGiovanniPaoloIIpapa": {
+        "name": "San Giovanni Paolo II, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 22,
+        "month": 10,
+        "formRowNum": 17,
+        "sinceYear": 2014
+    },
+    "BeatoUrbanoIIpapa": {
+        "name": "Beato Urbano II, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 2,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 28,
+        "month": 7,
+        "formRowNum": 7,
+        "sinceYear": 1973
+    },
+    "SantAgatonepapa": {
+        "name": "Sant'Agatone, papa",
+        "color": [
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Pastors:For a Pope"
+        ],
+        "day": 10,
+        "month": 1,
+        "formRowNum": 0,
+        "sinceYear": 1973
+    },
+    "SanCallistoIpapaemartire": {
+        "name": "San Callisto I, papa e martire",
+        "color": [
+            "red",
+            "white"
+        ],
+        "grade": 3,
+        "common": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
+        "day": 14,
+        "month": 10,
+        "formRowNum": 12,
+        "sinceYear": 1970
     }
 }
diff --git a/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json
index d9e85c3a..afb210cd 100644
--- a/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json	
+++ b/nations/ITALY/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json	
@@ -2,9 +2,9 @@
     "LitCal": {
         "DedicazionedellaChiesaMadrediCassinoinCassino": {
             "name": "Dedicazione della Chiesa Madre di Cassino (in Cassino)",
-            "color": "white",
+            "color": ["white"],
             "grade": 6,
-            "common": "Dedication of a Church",
+            "common": ["Dedication of a Church"],
             "day": 5,
             "month": 6,
             "formRowNum": 1,
@@ -16,7 +16,7 @@
                 "white"
             ],
             "grade": 4,
-            "common": "Proper",
+            "common": ["Proper"],
             "day": 27,
             "month": 5,
             "formRowNum": 0,
diff --git a/nations/ITALY/ITALY.json b/nations/ITALY/ITALY.json
index 12e00f16..41a4abf2 100644
--- a/nations/ITALY/ITALY.json
+++ b/nations/ITALY/ITALY.json
@@ -4,7 +4,7 @@
             "Festivity": {
                 "tag": "StCatherineSiena",
                 "name": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 29,
                 "month": 4
@@ -20,7 +20,7 @@
             "Festivity": {
                 "tag": "StFrancisAssisi",
                 "name": "San Francesco d'Assisi, patrono d'Italia",
-                "color": "white",
+                "color": ["white"],
                 "grade": 4,
                 "day": 29,
                 "month": 4
diff --git a/nations/USA/Archdiocese of Boston (Massachusetts).json b/nations/USA/Archdiocese of Boston (Massachusetts).json
index a15867da..ca16943c 100644
--- a/nations/USA/Archdiocese of Boston (Massachusetts).json	
+++ b/nations/USA/Archdiocese of Boston (Massachusetts).json	
@@ -2,9 +2,9 @@
     "LitCal": {
         "DedicationoftheCathedraloftheHolyCross": {
             "name": "Dedication of the Cathedral of the Holy Cross",
-            "color": "white",
+            "color": ["white"],
             "grade": 4,
-            "common": "Dedication of a Church",
+            "common": ["Dedication of a Church"],
             "day": 8,
             "month": 12,
             "formRowNum": 1,

From 4f7c11f106496a7d31c504444927182676b567c4 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 02:04:47 +0200
Subject: [PATCH 083/152] fix missing LitCal param!

---
 nations/ITALY/Diocesi di Roma.json | 938 +++++++++++++++--------------
 1 file changed, 470 insertions(+), 468 deletions(-)

diff --git a/nations/ITALY/Diocesi di Roma.json b/nations/ITALY/Diocesi di Roma.json
index f2744b75..f161286d 100644
--- a/nations/ITALY/Diocesi di Roma.json	
+++ b/nations/ITALY/Diocesi di Roma.json	
@@ -1,471 +1,473 @@
 {
-    "BeatoGregorioXpapa": {
-        "name": "Beato Gregorio X, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 9,
-        "month": 1,
-        "formRowNum": 0,
-        "sinceYear": 1973
-    },
-    "SanVincenzoPallottisacerdote": {
-        "name": "San Vincenzo Pallotti, sacerdote",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Proper"
-        ],
-        "day": 22,
-        "month": 1,
-        "formRowNum": 1,
-        "sinceYear": 1973
-    },
-    "BeataLudovicaAlbertoni": {
-        "name": "Beata Ludovica Albertoni",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Holy Men and Women:For Those Who Practiced Works of Mercy"
-        ],
-        "day": 1,
-        "month": 2,
-        "formRowNum": 1,
-        "sinceYear": 1973
-    },
-    "SantoIlaropapa": {
-        "name": "Santo Ilaro, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 28,
-        "month": 2,
-        "formRowNum": 2,
-        "sinceYear": 1973
-    },
-    "SanFeliceIIIpapa": {
-        "name": "San Felice III, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 1,
-        "month": 3,
-        "formRowNum": 3,
-        "sinceYear": 1973
-    },
-    "SanMartinoIpapaemartire": {
-        "name": "San Martino I, papa e martire",
-        "color": [
-            "red",
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Martyrs:For One Martyr",
-            "Pastors:For a Pope"
-        ],
-        "day": 13,
-        "month": 4,
-        "formRowNum": 2,
-        "sinceYear": 1973
-    },
-    "SanBenedettoGiuseppeLabre": {
-        "name": "San Benedetto Giuseppe Labre",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Proper"
-        ],
-        "day": 16,
-        "month": 4,
-        "formRowNum": 3,
-        "sinceYear": 1973
-    },
-    "SanLeoneIXpapa": {
-        "name": "San Leone IX, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Proper"
-        ],
-        "day": 19,
-        "month": 4,
-        "formRowNum": 4,
-        "sinceYear": 1973
-    },
-    "SanPioVpapa": {
-        "name": "San Pio V, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 30,
-        "month": 4,
-        "formRowNum": 5,
-        "sinceYear": 1973
-    },
-    "SanFelicedaCantalicereligioso": {
-        "name": "San Felice da Cantalice, religioso",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Proper"
-        ],
-        "day": 18,
-        "month": 5,
-        "formRowNum": 4,
-        "sinceYear": 1973
-    },
-    "SanGiovanniBattistadeRossisacerdote": {
-        "name": "San Giovanni Battista de Rossi, sacerdote",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Proper"
-        ],
-        "day": 23,
-        "month": 5,
-        "formRowNum": 6,
-        "sinceYear": 1973
-    },
-    "BeataMariaVergineAuxiliumChristianorum": {
-        "name": "Beata Maria Vergine «Auxilium Christianorum»",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Proper"
-        ],
-        "day": 24,
-        "month": 5,
-        "formRowNum": 5,
-        "sinceYear": 1973
-    },
-    "SanGregorioVIIpapa": {
-        "name": "San Gregorio VII, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 25,
-        "month": 5,
-        "formRowNum": 7,
-        "sinceYear": 1973
-    },
-    "SantiMarcellinoePietromartiri": {
-        "name": "Santi Marcellino e Pietro, martiri",
-        "color": [
-            "red"
-        ],
-        "grade": 3,
-        "common": [
-            "Martyrs:For Several Martyrs"
-        ],
-        "day": 2,
-        "month": 6,
-        "formRowNum": 8,
-        "sinceYear": 1973
-    },
-    "BeataAnnaMariaTaigi": {
-        "name": "Beata Anna Maria Taigi",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Holy Men and Women:For Holy Women"
-        ],
-        "day": 9,
-        "month": 6,
-        "formRowNum": 9,
-        "sinceYear": 1973
-    },
-    "SantiGiovanniePaolomartiri": {
-        "name": "Santi Giovanni e Paolo, martiri",
-        "color": [
-            "red"
-        ],
-        "grade": 2,
-        "common": [
-            "Martyrs"
-        ],
-        "day": 26,
-        "month": 6,
-        "formRowNum": 6,
-        "sinceYear": 1973
-    },
-    "SantiPietroePaoloApostoliPatroniprincipalidiRoma": {
-        "name": "Santi Pietro e Paolo, Apostoli, Patroni principali di Roma",
-        "color": [
-            "red"
-        ],
-        "grade": 6,
-        "common": [
-            "Proper"
-        ],
-        "day": 29,
-        "month": 6,
-        "formRowNum": 0,
-        "sinceYear": 1973
-    },
-    "SantiPrimiMartiridellaChiesaRomana": {
-        "name": "Santi Primi Martiri della Chiesa Romana",
-        "color": [
-            "red"
-        ],
-        "grade": 3,
-        "common": [
-            "Martyrs:For Several Martyrs"
-        ],
-        "day": 30,
-        "month": 6,
-        "formRowNum": 10,
-        "sinceYear": 1973
-    },
-    "SantaBrigidareligiosa": {
-        "name": "Santa Brigida, religiosa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Holy Men and Women:For Religious",
-            "Holy Men and Women:For Holy Women"
-        ],
-        "day": 23,
-        "month": 7,
-        "formRowNum": 11,
-        "sinceYear": 1973
-    },
-    "BeatoInnocenzoXIpapa": {
-        "name": "Beato Innocenzo XI, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 12,
-        "month": 8,
-        "formRowNum": 8,
-        "sinceYear": 1973
-    },
-    "SanSistoIIIpapa": {
-        "name": "San Sisto III, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 19,
-        "month": 8,
-        "formRowNum": 9,
-        "sinceYear": 1973
-    },
-    "SanGasparedelBufalosacerdote": {
-        "name": "San Gaspare del Bufalo, sacerdote",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Proper"
-        ],
-        "day": 21,
-        "month": 10,
-        "formRowNum": 13,
-        "sinceYear": 1973
-    },
-    "SanNicolaIpapa": {
-        "name": "San Nicola I, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 13,
-        "month": 11,
-        "formRowNum": 14,
-        "sinceYear": 1973
-    },
-    "SanGelasioIpapa": {
-        "name": "San Gelasio I, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 20,
-        "month": 11,
-        "formRowNum": 10,
-        "sinceYear": 1973
-    },
-    "SanClementeIpapaemartire": {
-        "name": "San Clemente I, papa e martire",
-        "color": [
-            "red",
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Martyrs:For One Martyr",
-            "Pastors:For a Pope"
-        ],
-        "day": 23,
-        "month": 11,
-        "formRowNum": 15,
-        "sinceYear": 1973
-    },
-    "SanSiriciopapa": {
-        "name": "San Siricio, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 26,
-        "month": 11,
-        "formRowNum": 11,
-        "sinceYear": 1973
-    },
-    "SanLeonardodaPortoMauriziosacerdote": {
-        "name": "San Leonardo da Porto Maurizio, sacerdote",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Holy Men and Women:For Religious"
-        ],
-        "day": 26,
-        "month": 11,
-        "formRowNum": 12,
-        "sinceYear": 1973
-    },
-    "SanDamasoIpapa": {
-        "name": "San Damaso I, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 11,
-        "month": 12,
-        "formRowNum": 16,
-        "sinceYear": 1973
-    },
-    "DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma": {
-        "name": "Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma",
-        "color": [
-            "white"
-        ],
-        "grade": 4,
-        "common": [
-            "Dedication of a Church"
-        ],
-        "day": 9,
-        "month": 11,
-        "formRowNum": 1,
-        "sinceYear": 1973
-    },
-    "SanGiovanniPaoloIIpapa": {
-        "name": "San Giovanni Paolo II, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 22,
-        "month": 10,
-        "formRowNum": 17,
-        "sinceYear": 2014
-    },
-    "BeatoUrbanoIIpapa": {
-        "name": "Beato Urbano II, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 2,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 28,
-        "month": 7,
-        "formRowNum": 7,
-        "sinceYear": 1973
-    },
-    "SantAgatonepapa": {
-        "name": "Sant'Agatone, papa",
-        "color": [
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Pastors:For a Pope"
-        ],
-        "day": 10,
-        "month": 1,
-        "formRowNum": 0,
-        "sinceYear": 1973
-    },
-    "SanCallistoIpapaemartire": {
-        "name": "San Callisto I, papa e martire",
-        "color": [
-            "red",
-            "white"
-        ],
-        "grade": 3,
-        "common": [
-            "Martyrs:For One Martyr",
-            "Pastors:For a Pope"
-        ],
-        "day": 14,
-        "month": 10,
-        "formRowNum": 12,
-        "sinceYear": 1970
+    "LitCal": {
+        "BeatoGregorioXpapa": {
+            "name": "Beato Gregorio X, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 9,
+            "month": 1,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SanVincenzoPallottisacerdote": {
+            "name": "San Vincenzo Pallotti, sacerdote",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Proper"
+            ],
+            "day": 22,
+            "month": 1,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "BeataLudovicaAlbertoni": {
+            "name": "Beata Ludovica Albertoni",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Holy Men and Women:For Those Who Practiced Works of Mercy"
+            ],
+            "day": 1,
+            "month": 2,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "SantoIlaropapa": {
+            "name": "Santo Ilaro, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 28,
+            "month": 2,
+            "formRowNum": 2,
+            "sinceYear": 1973
+        },
+        "SanFeliceIIIpapa": {
+            "name": "San Felice III, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 1,
+            "month": 3,
+            "formRowNum": 3,
+            "sinceYear": 1973
+        },
+        "SanMartinoIpapaemartire": {
+            "name": "San Martino I, papa e martire",
+            "color": [
+                "red",
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Martyrs:For One Martyr",
+                "Pastors:For a Pope"
+            ],
+            "day": 13,
+            "month": 4,
+            "formRowNum": 2,
+            "sinceYear": 1973
+        },
+        "SanBenedettoGiuseppeLabre": {
+            "name": "San Benedetto Giuseppe Labre",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Proper"
+            ],
+            "day": 16,
+            "month": 4,
+            "formRowNum": 3,
+            "sinceYear": 1973
+        },
+        "SanLeoneIXpapa": {
+            "name": "San Leone IX, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Proper"
+            ],
+            "day": 19,
+            "month": 4,
+            "formRowNum": 4,
+            "sinceYear": 1973
+        },
+        "SanPioVpapa": {
+            "name": "San Pio V, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 30,
+            "month": 4,
+            "formRowNum": 5,
+            "sinceYear": 1973
+        },
+        "SanFelicedaCantalicereligioso": {
+            "name": "San Felice da Cantalice, religioso",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Proper"
+            ],
+            "day": 18,
+            "month": 5,
+            "formRowNum": 4,
+            "sinceYear": 1973
+        },
+        "SanGiovanniBattistadeRossisacerdote": {
+            "name": "San Giovanni Battista de Rossi, sacerdote",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Proper"
+            ],
+            "day": 23,
+            "month": 5,
+            "formRowNum": 6,
+            "sinceYear": 1973
+        },
+        "BeataMariaVergineAuxiliumChristianorum": {
+            "name": "Beata Maria Vergine «Auxilium Christianorum»",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Proper"
+            ],
+            "day": 24,
+            "month": 5,
+            "formRowNum": 5,
+            "sinceYear": 1973
+        },
+        "SanGregorioVIIpapa": {
+            "name": "San Gregorio VII, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 25,
+            "month": 5,
+            "formRowNum": 7,
+            "sinceYear": 1973
+        },
+        "SantiMarcellinoePietromartiri": {
+            "name": "Santi Marcellino e Pietro, martiri",
+            "color": [
+                "red"
+            ],
+            "grade": 3,
+            "common": [
+                "Martyrs:For Several Martyrs"
+            ],
+            "day": 2,
+            "month": 6,
+            "formRowNum": 8,
+            "sinceYear": 1973
+        },
+        "BeataAnnaMariaTaigi": {
+            "name": "Beata Anna Maria Taigi",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Holy Men and Women:For Holy Women"
+            ],
+            "day": 9,
+            "month": 6,
+            "formRowNum": 9,
+            "sinceYear": 1973
+        },
+        "SantiGiovanniePaolomartiri": {
+            "name": "Santi Giovanni e Paolo, martiri",
+            "color": [
+                "red"
+            ],
+            "grade": 2,
+            "common": [
+                "Martyrs"
+            ],
+            "day": 26,
+            "month": 6,
+            "formRowNum": 6,
+            "sinceYear": 1973
+        },
+        "SantiPietroePaoloApostoliPatroniprincipalidiRoma": {
+            "name": "Santi Pietro e Paolo, Apostoli, Patroni principali di Roma",
+            "color": [
+                "red"
+            ],
+            "grade": 6,
+            "common": [
+                "Proper"
+            ],
+            "day": 29,
+            "month": 6,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SantiPrimiMartiridellaChiesaRomana": {
+            "name": "Santi Primi Martiri della Chiesa Romana",
+            "color": [
+                "red"
+            ],
+            "grade": 3,
+            "common": [
+                "Martyrs:For Several Martyrs"
+            ],
+            "day": 30,
+            "month": 6,
+            "formRowNum": 10,
+            "sinceYear": 1973
+        },
+        "SantaBrigidareligiosa": {
+            "name": "Santa Brigida, religiosa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Holy Men and Women:For Religious",
+                "Holy Men and Women:For Holy Women"
+            ],
+            "day": 23,
+            "month": 7,
+            "formRowNum": 11,
+            "sinceYear": 1973
+        },
+        "BeatoInnocenzoXIpapa": {
+            "name": "Beato Innocenzo XI, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 12,
+            "month": 8,
+            "formRowNum": 8,
+            "sinceYear": 1973
+        },
+        "SanSistoIIIpapa": {
+            "name": "San Sisto III, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 19,
+            "month": 8,
+            "formRowNum": 9,
+            "sinceYear": 1973
+        },
+        "SanGasparedelBufalosacerdote": {
+            "name": "San Gaspare del Bufalo, sacerdote",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Proper"
+            ],
+            "day": 21,
+            "month": 10,
+            "formRowNum": 13,
+            "sinceYear": 1973
+        },
+        "SanNicolaIpapa": {
+            "name": "San Nicola I, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 13,
+            "month": 11,
+            "formRowNum": 14,
+            "sinceYear": 1973
+        },
+        "SanGelasioIpapa": {
+            "name": "San Gelasio I, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 20,
+            "month": 11,
+            "formRowNum": 10,
+            "sinceYear": 1973
+        },
+        "SanClementeIpapaemartire": {
+            "name": "San Clemente I, papa e martire",
+            "color": [
+                "red",
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Martyrs:For One Martyr",
+                "Pastors:For a Pope"
+            ],
+            "day": 23,
+            "month": 11,
+            "formRowNum": 15,
+            "sinceYear": 1973
+        },
+        "SanSiriciopapa": {
+            "name": "San Siricio, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 26,
+            "month": 11,
+            "formRowNum": 11,
+            "sinceYear": 1973
+        },
+        "SanLeonardodaPortoMauriziosacerdote": {
+            "name": "San Leonardo da Porto Maurizio, sacerdote",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Holy Men and Women:For Religious"
+            ],
+            "day": 26,
+            "month": 11,
+            "formRowNum": 12,
+            "sinceYear": 1973
+        },
+        "SanDamasoIpapa": {
+            "name": "San Damaso I, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 11,
+            "month": 12,
+            "formRowNum": 16,
+            "sinceYear": 1973
+        },
+        "DedicazionedellaBasilicaPapaledelSSSalvatoreCattedralediRoma": {
+            "name": "Dedicazione della Basilica Papale del SS. Salvatore, Cattedrale di Roma",
+            "color": [
+                "white"
+            ],
+            "grade": 4,
+            "common": [
+                "Dedication of a Church"
+            ],
+            "day": 9,
+            "month": 11,
+            "formRowNum": 1,
+            "sinceYear": 1973
+        },
+        "SanGiovanniPaoloIIpapa": {
+            "name": "San Giovanni Paolo II, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 22,
+            "month": 10,
+            "formRowNum": 17,
+            "sinceYear": 2014
+        },
+        "BeatoUrbanoIIpapa": {
+            "name": "Beato Urbano II, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 2,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 28,
+            "month": 7,
+            "formRowNum": 7,
+            "sinceYear": 1973
+        },
+        "SantAgatonepapa": {
+            "name": "Sant'Agatone, papa",
+            "color": [
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Pastors:For a Pope"
+            ],
+            "day": 10,
+            "month": 1,
+            "formRowNum": 0,
+            "sinceYear": 1973
+        },
+        "SanCallistoIpapaemartire": {
+            "name": "San Callisto I, papa e martire",
+            "color": [
+                "red",
+                "white"
+            ],
+            "grade": 3,
+            "common": [
+                "Martyrs:For One Martyr",
+                "Pastors:For a Pope"
+            ],
+            "day": 14,
+            "month": 10,
+            "formRowNum": 12,
+            "sinceYear": 1970
+        }
     }
 }

From 7e9e894e5320ace19eadcdd656e90f5a7ac5e911 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 02:46:42 +0200
Subject: [PATCH 084/152] ensure color and common are arrays

---
 .../memorialsFromDecrees.json                 |  40 +-
 .../propriumdesanctis_1970.json               | 748 +++++++++---------
 .../propriumdesanctis_2002.json               | 164 +++-
 .../propriumdesanctis_2008.json               |  25 +-
 .../propriumdesanctis_ITALY_1983.json         |  69 +-
 .../propriumdesanctis_USA_2011.json           | 127 ++-
 schemas/CommonDef.json                        |  65 +-
 schemas/DiocesanCalendar.json                 |   9 +-
 schemas/MemorialsFromDecrees.json             |   9 +-
 schemas/NationalCalendar.json                 |   9 +-
 schemas/PropriumDeSanctis.json                |   9 +-
 schemas/WiderRegionCalendar.json              |   9 +-
 12 files changed, 720 insertions(+), 563 deletions(-)

diff --git a/data/memorialsFromDecrees/memorialsFromDecrees.json b/data/memorialsFromDecrees/memorialsFromDecrees.json
index 0ef0149f..ead73359 100644
--- a/data/memorialsFromDecrees/memorialsFromDecrees.json
+++ b/data/memorialsFromDecrees/memorialsFromDecrees.json
@@ -25,9 +25,9 @@
         "Festivity": {
             "TAG": "MaryMotherChurch",
             "GRADE": 3,
-            "COMMON": "Proper",
+            "COMMON": ["Proper"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "mobile",
             "READINGS": {
                 "FIRST_READING": "",
@@ -70,9 +70,9 @@
             "GRADE": 2,
             "MONTH": 10,
             "DAY": 11,
-            "COMMON": "Pastors:For a Pope",
+            "COMMON": ["Pastors:For a Pope"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -102,9 +102,9 @@
             "GRADE": 2,
             "MONTH": 10,
             "DAY": 22,
-            "COMMON": "Pastors:For a Pope",
+            "COMMON": ["Pastors:For a Pope"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -134,9 +134,9 @@
             "GRADE": 2,
             "MONTH": 12,
             "DAY": 10,
-            "COMMON": "Blessed Virgin Mary",
+            "COMMON": ["Blessed Virgin Mary"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -166,9 +166,9 @@
             "GRADE": 2,
             "MONTH": 5,
             "DAY": 29,
-            "COMMON": "Pastors:For a Pope",
+            "COMMON": ["Pastors:For a Pope"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -199,9 +199,9 @@
             "GRADE": 2,
             "MONTH": 10,
             "DAY": 5,
-            "COMMON": "Holy Men and Women:For Religious",
+            "COMMON": ["Holy Men and Women:For Religious"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -231,9 +231,9 @@
             "GRADE": 2,
             "MONTH": 2,
             "DAY": 27,
-            "COMMON": "Holy Men and Women:For an Abbot,Doctors",
+            "COMMON": ["Holy Men and Women:For an Abbot", "Doctors"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -264,9 +264,9 @@
             "GRADE": 2,
             "MONTH": 5,
             "DAY": 10,
-            "COMMON": "Pastors:For One Pastor,Doctors",
+            "COMMON": ["Pastors:For One Pastor", "Doctors"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -297,9 +297,9 @@
             "GRADE": 2,
             "MONTH": 9,
             "DAY": 17,
-            "COMMON": "Virgins:For One Virgin,Doctors",
+            "COMMON": ["Virgins:For One Virgin", "Doctors"],
             "CALENDAR": "GENERAL ROMAN",
-            "COLOR": "white",
+            "COLOR": ["white"],
             "TYPE": "fixed",
             "READINGS": {
                 "FIRST_READING": "",
@@ -327,7 +327,7 @@
     {
         "Festivity": {
             "TAG": "StThereseChildJesus",
-            "COMMON": "Proper"
+            "COMMON": ["Proper"]
         },
         "Metadata": {
             "action": "makeDoctor",
@@ -347,7 +347,7 @@
     {
         "Festivity": {
             "TAG": "StIrenaeus",
-            "COMMON": "Proper"
+            "COMMON": ["Proper"]
         },
         "Metadata": {
             "action": "makeDoctor",
diff --git a/data/propriumdesanctis_1970/propriumdesanctis_1970.json b/data/propriumdesanctis_1970/propriumdesanctis_1970.json
index 3a682243..97321c3d 100644
--- a/data/propriumdesanctis_1970/propriumdesanctis_1970.json
+++ b/data/propriumdesanctis_1970/propriumdesanctis_1970.json
@@ -4,9 +4,9 @@
         "DAY": 2,
         "TAG": "StsBasilGreg",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ef 4, 1-7.11-13",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -20,9 +20,9 @@
         "DAY": 7,
         "TAG": "StRayPenyafort",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor",
+        "COMMON": ["Pastors:For One Pastor"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2 Cor 5, 14-20",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -36,9 +36,9 @@
         "DAY": 13,
         "TAG": "StHilaryPoitiers",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Gv 2, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -52,9 +52,9 @@
         "DAY": 17,
         "TAG": "StAnthonyEgypt",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ef 6, 10-13.18",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -68,9 +68,9 @@
         "DAY": 20,
         "TAG": "StFabianPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Pope",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "1 Pt 5, 1-4",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -84,9 +84,9 @@
         "DAY": 20,
         "TAG": "StSebastian",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr",
+        "COMMON": ["Martyrs:For One Martyr"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "1 Pt 3, 14-17",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -100,9 +100,9 @@
         "DAY": 21,
         "TAG": "StAgnes",
         "GRADE": 3,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 26-31",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -116,9 +116,9 @@
         "DAY": 22,
         "TAG": "StVincentDeacon",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr",
+        "COMMON": ["Martyrs:For One Martyr"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "2 Cor 4, 7-15",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -132,9 +132,9 @@
         "DAY": 24,
         "TAG": "StFrancisDeSales",
         "GRADE": 3,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ef 3, 8-12",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -148,9 +148,9 @@
         "DAY": 25,
         "TAG": "ConversionStPaul",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "At 22, 3-16|At 9, 1-22",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -164,9 +164,9 @@
         "DAY": 26,
         "TAG": "StsTimothyTitus",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2Tim 1, 1-8|Tito 1, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -180,9 +180,9 @@
         "DAY": 27,
         "TAG": "StAngelaMerici",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For Educators",
+        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 7-11",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -196,9 +196,9 @@
         "DAY": 28,
         "TAG": "StThomasAquinas",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor,Doctors",
+        "COMMON": ["Pastors:For One Pastor", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Sap 7, 7-10.15-16",
             "RESPONSORIAL_PSALM": "Salmo 119",
@@ -212,9 +212,9 @@
         "DAY": 31,
         "TAG": "StJohnBosco",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Educators",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Fil 4, 4-9",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -228,9 +228,9 @@
         "DAY": 2,
         "TAG": "Presentation",
         "GRADE": 5,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Mal 3, 1-4",
             "RESPONSORIAL_PSALM": "Sal 24",
@@ -244,9 +244,9 @@
         "DAY": 3,
         "TAG": "StBlase",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "Rm 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -260,9 +260,9 @@
         "DAY": 3,
         "TAG": "StAnsgar",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Pastors:For Missionaries",
+        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Is 52, 7-10",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -276,9 +276,9 @@
         "DAY": 5,
         "TAG": "StAgatha",
         "GRADE": 3,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 26-31",
             "RESPONSORIAL_PSALM": "Salmo 31",
@@ -292,9 +292,9 @@
         "DAY": 6,
         "TAG": "StsPaulMiki",
         "GRADE": 3,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Gal 2, 19-20",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -308,9 +308,9 @@
         "DAY": 8,
         "TAG": "StJeromeEmiliani",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Educators",
+        "COMMON": ["Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Tb 12, 6-13",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -324,9 +324,9 @@
         "DAY": 10,
         "TAG": "StScholastica",
         "GRADE": 3,
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For a Nun",
+        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ct 8, 6-7",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -340,9 +340,9 @@
         "DAY": 11,
         "TAG": "LadyLourdes",
         "GRADE": 2,
-        "COMMON": "Blessed Virgin Mary",
+        "COMMON": ["Blessed Virgin Mary"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Is 66, 10-14c",
             "RESPONSORIAL_PSALM": "Gdt Gdt 13, 18-19",
@@ -356,9 +356,9 @@
         "DAY": 14,
         "TAG": "StsCyrilMethodius",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "At 13, 46-49|Is 52, 7-10",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -372,9 +372,9 @@
         "DAY": 17,
         "TAG": "SevenHolyFounders",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": ["Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Rm 8, 26-30",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -388,9 +388,9 @@
         "DAY": 21,
         "TAG": "StPeterDamian",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2 Tm 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -404,9 +404,9 @@
         "DAY": 22,
         "TAG": "ChairStPeter",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Pt 5, 1-4",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -420,9 +420,9 @@
         "DAY": 23,
         "TAG": "StPolycarp",
         "GRADE": 3,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "Ap 2, 8-11",
             "RESPONSORIAL_PSALM": "Salmo 31",
@@ -436,9 +436,9 @@
         "DAY": 4,
         "TAG": "StCasimir",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": ["Holy Men and Women:For One Saint"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-14",
             "RESPONSORIAL_PSALM": "Salmo 15",
@@ -452,9 +452,9 @@
         "DAY": 7,
         "TAG": "StsPerpetuaFelicity",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Rm 8, 31b-39",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -468,9 +468,9 @@
         "DAY": 8,
         "TAG": "StJohnGod",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Gv 3, 14-18",
             "RESPONSORIAL_PSALM": "Salmo 112",
@@ -484,9 +484,9 @@
         "DAY": 9,
         "TAG": "StFrancesRome",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious,Holy Men and Women:For Holy Women",
+        "COMMON": ["Holy Men and Women:For Religious","Holy Men and Women:For Holy Women"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Pr 31, 10-13.19-20.30-31",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -500,9 +500,9 @@
         "DAY": 17,
         "TAG": "StPatrick",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Pastors:For Missionaries",
+        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 7-11",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -516,9 +516,9 @@
         "DAY": 18,
         "TAG": "StCyrilJerusalem",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 19",
@@ -532,9 +532,9 @@
         "DAY": 19,
         "TAG": "StJoseph",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2Sam 7, 4-5a.12-14a.16",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -548,9 +548,9 @@
         "DAY": 23,
         "TAG": "StTuribius",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop",
+        "COMMON": ["Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2 Tm 1, 13-14; 2, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -564,9 +564,9 @@
         "DAY": 25,
         "TAG": "Annunciation",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Is 7, 10-14; 8, 10c",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -580,9 +580,9 @@
         "DAY": 2,
         "TAG": "StFrancisPaola",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": ["Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-14",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -596,9 +596,9 @@
         "DAY": 4,
         "TAG": "StIsidore",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2 Cor 4, 1-2.5-7",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -612,9 +612,9 @@
         "DAY": 5,
         "TAG": "StVincentFerrer",
         "GRADE": 2,
-        "COMMON": "Pastors:For Missionaries",
+        "COMMON": ["Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2 Tm 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -628,9 +628,9 @@
         "DAY": 7,
         "TAG": "StJohnBaptistDeLaSalle",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Educators",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Tim 1, 13-14; 2, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 1",
@@ -644,9 +644,9 @@
         "DAY": 11,
         "TAG": "StStanislaus",
         "GRADE": 3,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "Ap 12, 10-12a",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -660,9 +660,9 @@
         "DAY": 13,
         "TAG": "StMartinPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Pope",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "2 Tm 2, 8-13; 3, 10-12",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -676,9 +676,9 @@
         "DAY": 21,
         "TAG": "StAnselm",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ef 3, 14-19",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -692,9 +692,9 @@
         "DAY": 23,
         "TAG": "StGeorge",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr",
+        "COMMON": ["Martyrs:For One Martyr"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Ap 21, 5-7",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -708,9 +708,9 @@
         "DAY": 24,
         "TAG": "StFidelisSigmaringen",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For One Pastor",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For One Pastor"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "Col 1, 24-29",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -724,9 +724,9 @@
         "DAY": 25,
         "TAG": "StMarkEvangelist",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "1Pt 5, 5b-14",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -740,9 +740,9 @@
         "DAY": 28,
         "TAG": "StPeterChanel",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For Missionaries",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "1 Cor 1, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -756,9 +756,9 @@
         "DAY": 29,
         "TAG": "StCatherineSiena",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Gv 1, 5 – 2, 2",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -772,9 +772,9 @@
         "DAY": 30,
         "TAG": "StPiusV",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Pope",
+        "COMMON": ["Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Cor 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -788,9 +788,9 @@
         "DAY": 1,
         "TAG": "StJosephWorker",
         "GRADE": 2,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Gen 1, 26 – 2, 3|Col 3, 14-15.17.23-24",
             "RESPONSORIAL_PSALM": "Salmo 90",
@@ -804,9 +804,9 @@
         "DAY": 2,
         "TAG": "StAthanasius",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -820,9 +820,9 @@
         "DAY": 3,
         "TAG": "StsPhilipJames",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "1Cor 15, 1-8a",
             "RESPONSORIAL_PSALM": "Salmo 19",
@@ -836,9 +836,9 @@
         "DAY": 12,
         "TAG": "StsNereusAchilleus",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Ap 7, 9-17",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -852,9 +852,9 @@
         "DAY": 12,
         "TAG": "StPancras",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr",
+        "COMMON": ["Martyrs:For One Martyr"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Ap 19, 1.5-9a",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -868,9 +868,9 @@
         "DAY": 14,
         "TAG": "StMatthiasAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "At 1, 15-17.20-26",
             "RESPONSORIAL_PSALM": "Salmo 113",
@@ -884,9 +884,9 @@
         "DAY": 18,
         "TAG": "StJohnIPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Pope",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "Ap 3, 14b.20-22",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -900,9 +900,9 @@
         "DAY": 20,
         "TAG": "StBernardineSiena",
         "GRADE": 2,
-        "COMMON": "Pastors:For Missionaries,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "At 4, 8-12",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -916,9 +916,9 @@
         "DAY": 25,
         "TAG": "StBedeVenerable",
         "GRADE": 2,
-        "COMMON": "Doctors,Holy Men and Women:For a Monk",
+        "COMMON": ["Doctors", "Holy Men and Women:For a Monk"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Cor 2, 10b-16",
             "RESPONSORIAL_PSALM": "Salmo 119",
@@ -932,9 +932,9 @@
         "DAY": 25,
         "TAG": "StGregoryVII",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Pope",
+        "COMMON": ["Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "At 20, 17-18a.28-32.36",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -948,9 +948,9 @@
         "DAY": 25,
         "TAG": "StMaryMagdalenePazzi",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For Religious",
+        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Cor 7, 25-35",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -964,9 +964,9 @@
         "DAY": 26,
         "TAG": "StPhilipNeri",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Fil 4, 4-9",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -980,9 +980,9 @@
         "DAY": 27,
         "TAG": "StAugustineCanterbury",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Pastors:For Missionaries",
+        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1 Ts 2, 2b-8",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -996,9 +996,9 @@
         "DAY": 31,
         "TAG": "Visitation",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Sof 3, 14-18|Rm 12, 9-16b",
             "RESPONSORIAL_PSALM": "Is 12, 2-6",
@@ -1012,9 +1012,9 @@
         "DAY": 1,
         "TAG": "StJustinMartyr",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -1028,9 +1028,9 @@
         "DAY": 2,
         "TAG": "StsMarcellinusPeter",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "2 Cor 6, 4-10",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -1044,9 +1044,9 @@
         "DAY": 3,
         "TAG": "StsCharlesLwanga",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "Macc 7, 1-2.9-14",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -1060,9 +1060,9 @@
         "DAY": 5,
         "TAG": "StBoniface",
         "GRADE": 3,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For Missionaries",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "At 26, 19-23",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -1076,9 +1076,9 @@
         "DAY": 6,
         "TAG": "StNorbert",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For a Bishop", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Ez 34, 11-16",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -1092,9 +1092,9 @@
         "DAY": 9,
         "TAG": "StEphrem",
         "GRADE": 2,
-        "COMMON": "Doctors",
+        "COMMON": ["Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Col 3, 12-17",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -1108,9 +1108,9 @@
         "DAY": 11,
         "TAG": "StBarnabasAp",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "At 11, 21b-26; 13, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 98",
@@ -1124,9 +1124,9 @@
         "DAY": 13,
         "TAG": "StAnthonyPadua",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor,Doctors,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For One Pastor,Doctors", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Is 61, 1-3a",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -1140,9 +1140,9 @@
         "DAY": 19,
         "TAG": "StRomuald",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For an Abbot",
+        "COMMON": ["Holy Men and Women:For an Abbot"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-10",
             "RESPONSORIAL_PSALM": "Salmo 131",
@@ -1156,9 +1156,9 @@
         "DAY": 21,
         "TAG": "StAloysiusGonzaga",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "1Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -1172,9 +1172,9 @@
         "DAY": 22,
         "TAG": "StPaulinusNola",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop",
+        "COMMON": ["Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "2Cor 8, 9-15",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -1188,9 +1188,9 @@
         "DAY": 22,
         "TAG": "StsJohnFisherThomasMore",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 12-19",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -1204,9 +1204,9 @@
         "DAY": 24,
         "TAG": "NativityJohnBaptist",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "VIGIL" : {
                 "FIRST_READING": "Ger 1, 4-10",
@@ -1229,9 +1229,9 @@
         "DAY": 27,
         "TAG": "StCyrilAlexandria",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1245,9 +1245,9 @@
         "DAY": 28,
         "TAG": "StIrenaeus",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1261,9 +1261,9 @@
         "DAY": 29,
         "TAG": "StsPeterPaulAp",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1277,9 +1277,9 @@
         "DAY": 30,
         "TAG": "FirstMartyrsRome",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1293,9 +1293,9 @@
         "DAY": 3,
         "TAG": "StThomasAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1309,9 +1309,9 @@
         "DAY": 4,
         "TAG": "StElizabethPortugal",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1325,9 +1325,9 @@
         "DAY": 5,
         "TAG": "StAnthonyZaccaria",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious,Holy Men and Women:For Educators",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious", "Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1341,9 +1341,9 @@
         "DAY": 6,
         "TAG": "StMariaGoretti",
         "GRADE": 2,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1357,9 +1357,9 @@
         "DAY": 11,
         "TAG": "StBenedict",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1373,9 +1373,9 @@
         "DAY": 13,
         "TAG": "StHenry",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": ["Holy Men and Women:For One Saint"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1389,9 +1389,9 @@
         "DAY": 14,
         "TAG": "StCamillusDeLellis",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1405,9 +1405,9 @@
         "DAY": 15,
         "TAG": "StBonaventure",
         "GRADE": 3,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1421,9 +1421,9 @@
         "DAY": 16,
         "TAG": "LadyMountCarmel",
         "GRADE": 2,
-        "COMMON": "Blessed Virgin Mary",
+        "COMMON": ["Blessed Virgin Mary"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1437,9 +1437,9 @@
         "DAY": 21,
         "TAG": "StLawrenceBrindisi",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Doctors,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For One Pastor,Doctors", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1453,9 +1453,9 @@
         "DAY": 22,
         "TAG": "StMaryMagdalene",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1469,9 +1469,9 @@
         "DAY": 23,
         "TAG": "StBridget",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious,Holy Men and Women:For Holy Women",
+        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Holy Women"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1485,9 +1485,9 @@
         "DAY": 25,
         "TAG": "StJamesAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1501,9 +1501,9 @@
         "DAY": 26,
         "TAG": "StsJoachimAnne",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1517,9 +1517,9 @@
         "DAY": 29,
         "TAG": "StMartha",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1533,9 +1533,9 @@
         "DAY": 30,
         "TAG": "StPeterChrysologus",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1549,9 +1549,9 @@
         "DAY": 31,
         "TAG": "StIgnatiusLoyola",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1565,9 +1565,9 @@
         "DAY": 1,
         "TAG": "StAlphonsusMariaDeLiguori",
         "GRADE": 3,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1581,9 +1581,9 @@
         "DAY": 2,
         "TAG": "StEusebius",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop",
+        "COMMON": ["Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1597,9 +1597,9 @@
         "DAY": 4,
         "TAG": "StJeanVianney",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor",
+        "COMMON": ["Pastors:For One Pastor"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1613,9 +1613,9 @@
         "DAY": 5,
         "TAG": "DedicationStMaryMajor",
         "GRADE": 2,
-        "COMMON": "Blessed Virgin Mary",
+        "COMMON": ["Blessed Virgin Mary"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1629,9 +1629,9 @@
         "DAY": 6,
         "TAG": "Transfiguration",
         "GRADE": 5,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1645,9 +1645,9 @@
         "DAY": 7,
         "TAG": "StSixtusIIPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1661,9 +1661,9 @@
         "DAY": 7,
         "TAG": "StCajetan",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1677,9 +1677,9 @@
         "DAY": 8,
         "TAG": "StDominic",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1693,9 +1693,9 @@
         "DAY": 10,
         "TAG": "StLawrenceDeacon",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1709,9 +1709,9 @@
         "DAY": 11,
         "TAG": "StClare",
         "GRADE": 3,
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For a Nun",
+        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1725,9 +1725,9 @@
         "DAY": 12,
         "TAG": "StJaneFrancesDeChantal",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": ["Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1741,9 +1741,9 @@
         "DAY": 13,
         "TAG": "StsPontianHippolytus",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs,Pastors:For Several Pastors",
+        "COMMON": ["Martyrs:For Several Martyrs", "Pastors:For Several Pastors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1757,9 +1757,9 @@
         "DAY": 15,
         "TAG": "Assumption",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1773,9 +1773,9 @@
         "DAY": 16,
         "TAG": "StStephenHungary",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": ["Holy Men and Women:For One Saint"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1789,9 +1789,9 @@
         "DAY": 19,
         "TAG": "StJohnEudes",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1805,9 +1805,9 @@
         "DAY": 20,
         "TAG": "StBernardClairvaux",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1821,9 +1821,9 @@
         "DAY": 21,
         "TAG": "StPiusX",
         "GRADE": 3,
-        "COMMON": "Pastors:For a Pope",
+        "COMMON": ["Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1837,9 +1837,9 @@
         "DAY": 22,
         "TAG": "QueenshipMary",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1853,9 +1853,9 @@
         "DAY": 23,
         "TAG": "StRoseLima",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": ["Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1869,9 +1869,9 @@
         "DAY": 24,
         "TAG": "StBartholomewAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1885,9 +1885,9 @@
         "DAY": 25,
         "TAG": "StLouis",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": ["Holy Men and Women:For One Saint"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1901,9 +1901,9 @@
         "DAY": 25,
         "TAG": "StJosephCalasanz",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Educators",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1917,9 +1917,9 @@
         "DAY": 27,
         "TAG": "StMonica",
         "GRADE": 3,
-        "COMMON": "Holy Men and Women:For Holy Women",
+        "COMMON": ["Holy Men and Women:For Holy Women"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1933,9 +1933,9 @@
         "DAY": 28,
         "TAG": "StAugustineHippo",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1949,9 +1949,9 @@
         "DAY": 29,
         "TAG": "BeheadingJohnBaptist",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1965,9 +1965,9 @@
         "DAY": 3,
         "TAG": "StGregoryGreat",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1981,9 +1981,9 @@
         "DAY": 8,
         "TAG": "NativityVirginMary",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1997,9 +1997,9 @@
         "DAY": 13,
         "TAG": "StJohnChrysostom",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2013,9 +2013,9 @@
         "DAY": 14,
         "TAG": "ExaltationCross",
         "GRADE": 5,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2029,9 +2029,9 @@
         "DAY": 15,
         "TAG": "LadySorrows",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2045,9 +2045,9 @@
         "DAY": 16,
         "TAG": "StsCorneliusCyprian",
         "GRADE": 3,
-        "COMMON": "Martyrs:For Several Martyrs,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For Several Martyrs", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2061,9 +2061,9 @@
         "DAY": 17,
         "TAG": "StRobertBellarmine",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2077,9 +2077,9 @@
         "DAY": 19,
         "TAG": "StJanuarius",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2093,9 +2093,9 @@
         "DAY": 21,
         "TAG": "StMatthewEvangelist",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2109,9 +2109,9 @@
         "DAY": 26,
         "TAG": "StsCosmasDamian",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2125,9 +2125,9 @@
         "DAY": 27,
         "TAG": "StVincentDePaul",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2141,9 +2141,9 @@
         "DAY": 28,
         "TAG": "StWenceslaus",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr",
+        "COMMON": ["Martyrs:For One Martyr"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2157,9 +2157,9 @@
         "DAY": 29,
         "TAG": "StsArchangels",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2173,9 +2173,9 @@
         "DAY": 30,
         "TAG": "StJerome",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2189,9 +2189,9 @@
         "DAY": 1,
         "TAG": "StThereseChildJesus",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2205,9 +2205,9 @@
         "DAY": 2,
         "TAG": "GuardianAngels",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2221,9 +2221,9 @@
         "DAY": 4,
         "TAG": "StFrancisAssisi",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2237,9 +2237,9 @@
         "DAY": 6,
         "TAG": "StBruno",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For a Monk",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For a Monk"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2253,9 +2253,9 @@
         "DAY": 7,
         "TAG": "LadyRosary",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2269,9 +2269,9 @@
         "DAY": 9,
         "TAG": "StDenis",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": ["Martyrs:For Several Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2285,9 +2285,9 @@
         "DAY": 9,
         "TAG": "StJohnLeonardi",
         "GRADE": 2,
-        "COMMON": "Pastors:For Missionaries,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2301,9 +2301,9 @@
         "DAY": 14,
         "TAG": "StCallistusIPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Pope",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2317,9 +2317,9 @@
         "DAY": 15,
         "TAG": "StTeresaJesus",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2333,9 +2333,9 @@
         "DAY": 16,
         "TAG": "StHedwig",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious,Holy Men and Women:For Holy Women",
+        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Holy Women"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2349,9 +2349,9 @@
         "DAY": 16,
         "TAG": "StMargaretAlacoque",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": ["Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2365,9 +2365,9 @@
         "DAY": 17,
         "TAG": "StIgnatiusAntioch",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2381,9 +2381,9 @@
         "DAY": 18,
         "TAG": "StLukeEvangelist",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2397,9 +2397,9 @@
         "DAY": 19,
         "TAG": "StsJeanBrebeuf",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Missionary Martyrs",
+        "COMMON": ["Martyrs:For Missionary Martyrs"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2413,9 +2413,9 @@
         "DAY": 19,
         "TAG": "StPaulCross",
         "GRADE": 2,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2429,9 +2429,9 @@
         "DAY": 23,
         "TAG": "StJohnCapistrano",
         "GRADE": 2,
-        "COMMON": "Pastors:For Missionaries,Holy Men and Women:For Religious",
+        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2445,9 +2445,9 @@
         "DAY": 24,
         "TAG": "StAnthonyMaryClaret",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Pastors:For Missionaries",
+        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2461,9 +2461,9 @@
         "DAY": 28,
         "TAG": "StSimonStJudeAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2477,9 +2477,9 @@
         "DAY": 1,
         "TAG": "AllSaints",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2493,9 +2493,9 @@
         "DAY": 2,
         "TAG": "AllSouls",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "purple",
+        "COLOR": ["purple"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2509,9 +2509,9 @@
         "DAY": 3,
         "TAG": "StMartinPorres",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": ["Holy Men and Women:For Religious"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2525,9 +2525,9 @@
         "DAY": 4,
         "TAG": "StCharlesBorromeo",
         "GRADE": 3,
-        "COMMON": "Pastors:For a Bishop",
+        "COMMON": ["Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2541,9 +2541,9 @@
         "DAY": 9,
         "TAG": "DedicationLateran",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2557,9 +2557,9 @@
         "DAY": 10,
         "TAG": "StLeoGreat",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2573,9 +2573,9 @@
         "DAY": 11,
         "TAG": "StMartinTours",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2589,9 +2589,9 @@
         "DAY": 12,
         "TAG": "StJosaphat",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2605,9 +2605,9 @@
         "DAY": 15,
         "TAG": "StAlbertGreat",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop,Doctors",
+        "COMMON": ["Pastors:For a Bishop", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2621,9 +2621,9 @@
         "DAY": 16,
         "TAG": "StMargaretScotland",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2637,9 +2637,9 @@
         "DAY": 16,
         "TAG": "StGertrudeGreat",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For a Nun",
+        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2653,9 +2653,9 @@
         "DAY": 17,
         "TAG": "StElizabethHungary",
         "GRADE": 3,
-        "COMMON": "Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2669,9 +2669,9 @@
         "DAY": 18,
         "TAG": "DedicationStsPeterPaul",
         "GRADE": 2,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2685,9 +2685,9 @@
         "DAY": 21,
         "TAG": "PresentationMary",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2701,9 +2701,9 @@
         "DAY": 22,
         "TAG": "StCecilia",
         "GRADE": 3,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2717,9 +2717,9 @@
         "DAY": 23,
         "TAG": "StClementIPope",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Pope",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2733,9 +2733,9 @@
         "DAY": 23,
         "TAG": "StColumban",
         "GRADE": 2,
-        "COMMON": "Pastors:For Missionaries,Holy Men and Women:For an Abbot",
+        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For an Abbot"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2749,9 +2749,9 @@
         "DAY": 30,
         "TAG": "StAndrewAp",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2765,9 +2765,9 @@
         "DAY": 3,
         "TAG": "StFrancisXavier",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2781,9 +2781,9 @@
         "DAY": 4,
         "TAG": "StJohnDamascene",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Doctors",
+        "COMMON": ["Pastors:For One Pastor", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2797,9 +2797,9 @@
         "DAY": 6,
         "TAG": "StNicholas",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Bishop",
+        "COMMON": ["Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2813,9 +2813,9 @@
         "DAY": 7,
         "TAG": "StAmbrose",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2829,9 +2829,9 @@
         "DAY": 8,
         "TAG": "ImmaculateConception",
         "GRADE": 6,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2845,9 +2845,9 @@
         "DAY": 11,
         "TAG": "StDamasusIPope",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Pope",
+        "COMMON": ["Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2861,9 +2861,9 @@
         "DAY": 13,
         "TAG": "StLucySyracuse",
         "GRADE": 3,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2877,9 +2877,9 @@
         "DAY": 14,
         "TAG": "StJohnCross",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2893,9 +2893,9 @@
         "DAY": 21,
         "TAG": "StPeterCanisius",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Doctors",
+        "COMMON": ["Pastors:For One Pastor", "Doctors"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2909,9 +2909,9 @@
         "DAY": 23,
         "TAG": "StJohnKanty",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2925,9 +2925,9 @@
         "DAY": 26,
         "TAG": "StStephenProtomartyr",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2941,9 +2941,9 @@
         "DAY": 27,
         "TAG": "StJohnEvangelist",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2957,9 +2957,9 @@
         "DAY": 28,
         "TAG": "HolyInnocents",
         "GRADE": 4,
-        "COMMON": "Proper",
+        "COMMON": ["Proper"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": ["red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2973,9 +2973,9 @@
         "DAY": 29,
         "TAG": "StThomasBecket",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": ["white", "red"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2989,9 +2989,9 @@
         "DAY": 31,
         "TAG": "StSylvesterIPope",
         "GRADE": 2,
-        "COMMON": "Pastors:For a Pope",
+        "COMMON": ["Pastors:For a Pope"],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": ["white"],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/data/propriumdesanctis_2002/propriumdesanctis_2002.json b/data/propriumdesanctis_2002/propriumdesanctis_2002.json
index 0619f91e..b620bd53 100644
--- a/data/propriumdesanctis_2002/propriumdesanctis_2002.json
+++ b/data/propriumdesanctis_2002/propriumdesanctis_2002.json
@@ -4,9 +4,13 @@
         "DAY": 3,
         "TAG": "NameJesus",
         "GRADE": 2,
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -20,9 +24,13 @@
         "DAY": 8,
         "TAG": "StJosephineBakhita",
         "GRADE": 2,
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -36,9 +44,15 @@
         "DAY": 23,
         "TAG": "StAdalbert",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -52,9 +66,13 @@
         "DAY": 28,
         "TAG": "StLouisGrignionMontfort",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor",
+        "COMMON": [
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -68,9 +86,13 @@
         "DAY": 13,
         "TAG": "LadyFatima",
         "GRADE": 2,
-        "COMMON": "Blessed Virgin Mary",
+        "COMMON": [
+            "Blessed Virgin Mary"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -84,9 +106,13 @@
         "DAY": 21,
         "TAG": "StChristopherMagallanes",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -100,9 +126,13 @@
         "DAY": 22,
         "TAG": "StRitaCascia",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -116,9 +146,13 @@
         "DAY": 9,
         "TAG": "StAugustineZhaoRong",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -132,9 +166,15 @@
         "DAY": 20,
         "TAG": "StApollinaris",
         "GRADE": 2,
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -148,9 +188,14 @@
         "DAY": 24,
         "TAG": "StSharbelMakhluf",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For a Monk",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For a Monk"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -164,9 +209,14 @@
         "DAY": 2,
         "TAG": "StPeterJulianEymard",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -180,9 +230,15 @@
         "DAY": 9,
         "TAG": "StEdithStein",
         "GRADE": 2,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -196,9 +252,14 @@
         "DAY": 14,
         "TAG": "StMaximilianKolbe",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -212,9 +273,14 @@
         "DAY": 9,
         "TAG": "StPeterClaver",
         "GRADE": 2,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -228,9 +294,13 @@
         "DAY": 12,
         "TAG": "HolyNameMary",
         "GRADE": 2,
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -244,9 +314,13 @@
         "DAY": 20,
         "TAG": "StAndrewKimTaegon",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -260,9 +334,13 @@
         "DAY": 28,
         "TAG": "StsLawrenceRuiz",
         "GRADE": 2,
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -276,9 +354,13 @@
         "DAY": 24,
         "TAG": "StAndrewDungLac",
         "GRADE": 3,
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -292,9 +374,15 @@
         "DAY": 25,
         "TAG": "StCatherineAlexandria",
         "GRADE": 2,
-        "COMMON": "Martyrs:For a Virgin Martyr,Virgins:For One Virgin",
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/data/propriumdesanctis_2008/propriumdesanctis_2008.json b/data/propriumdesanctis_2008/propriumdesanctis_2008.json
index 15439f52..82cf0d82 100644
--- a/data/propriumdesanctis_2008/propriumdesanctis_2008.json
+++ b/data/propriumdesanctis_2008/propriumdesanctis_2008.json
@@ -4,9 +4,14 @@
         "DAY": 23,
         "TAG": "StPioPietrelcina",
         "GRADE": 3,
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -20,9 +25,13 @@
         "DAY": 12,
         "TAG": "LadyGuadalupe",
         "GRADE": 2,
-        "COMMON": "Blessed Virgin Mary",
+        "COMMON": [
+            "Blessed Virgin Mary"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -36,9 +45,13 @@
         "DAY": 9,
         "TAG": "JuanDiego",
         "GRADE": 2,
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json b/data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json
index dd3d20ef..986d9c5a 100644
--- a/data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json
+++ b/data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json
@@ -6,9 +6,15 @@
         "NAME": "Sant'Adalberto, vescovo e martire",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Martyrs:For One Martyr,Pastors:For a Bishop",
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -24,9 +30,13 @@
         "NAME": "San Luigi Grignon de Montfort",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For One Pastor",
+        "COMMON": [
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -42,9 +52,14 @@
         "NAME": "San Pietro Giuliani, sacerdote",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Religious",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -60,9 +75,14 @@
         "NAME": "San Massimiliano Kolbe, sacerdote e martire",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -78,9 +98,14 @@
         "NAME": "San Pietro Claver, sacerdote",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -96,9 +121,13 @@
         "NAME": "Santi Andrea Kim Taegon, sacerdote, Paolo Chong Hasang e compagni martiri",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -114,9 +143,13 @@
         "NAME": "Santi Lorenzo Ruiz e compagni martiri",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Martyrs:For Several Martyrs",
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -132,9 +165,13 @@
         "NAME": "Sant'Andrea Dung-Lac e compagni martiri",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "",
-        "COLOR": "red",
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
index 393b5d2e..4fb07512 100644
--- a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
+++ b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
@@ -6,9 +6,13 @@
         "NAME": "Saint Elizabeth Ann Seton, Religious",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -24,9 +28,13 @@
         "NAME": "Saint John Neumann, Bishop",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Proper",
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -42,9 +50,13 @@
         "NAME": "Saint André Bessette, Religious",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Holy Men and Women:For Religious",
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -60,9 +72,15 @@
         "NAME": "Day of Prayer for the Legal Protection of Unborn Children",
         "GRADE": 3,
         "DISPLAYGRADE": "National Day of Prayer",
-        "COMMON": "Masses and Prayers for Various Needs and Occasions:For Giving Thanks to God for the Gift of Human Life,Preservation of Peace and Justice",
+        "COMMON": [
+            "Masses and Prayers for Various Needs and Occasions:For Giving Thanks to God for the Gift of Human Life",
+            "Preservation of Peace and Justice"
+        ],
         "CALENDAR": "",
-        "COLOR": "purple,white",
+        "COLOR": [
+            "purple",
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -78,9 +96,13 @@
         "NAME": "Saint Katharine Drexel, Virgin",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -96,9 +118,13 @@
         "NAME": "Saint Damien de Veuster, Priest",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For Missionaries",
+        "COMMON": [
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -114,9 +140,13 @@
         "NAME": "Saint Isidore",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Holy Men and Women:For One Saint",
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -132,9 +162,14 @@
         "NAME": "Blessed Junípero Serra, Priest",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For One Pastor,Pastors:For Missionaries",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -150,9 +185,13 @@
         "NAME": "Independence Day",
         "GRADE": 3,
         "DISPLAYGRADE": "National Holiday",
-        "COMMON": "",
+        "COMMON": [
+            ""
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -168,9 +207,13 @@
         "NAME": "Blessed Kateri Tekakwitha, Virgin",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -186,9 +229,14 @@
         "NAME": "Saint Peter Claver, Priest",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Pastors:For One Pastor,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -204,9 +252,13 @@
         "NAME": "Blessed Marie Rose Durocher, Virgin",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -222,9 +274,14 @@
         "NAME": "Saint Frances Xavier Cabrini, Virgin",
         "GRADE": 3,
         "DISPLAYGRADE": "",
-        "COMMON": "Virgins:For One Virgin,Holy Men and Women:For Those Who Practiced Works of Mercy",
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -240,9 +297,13 @@
         "NAME": "Saint Rose Philippine Duchesne, Virgin",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Virgins:For One Virgin",
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "",
-        "COLOR": "white",
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -258,9 +319,15 @@
         "NAME": "Blessed Miguel Agustín Pro, Priest and Martyr",
         "GRADE": 2,
         "DISPLAYGRADE": "",
-        "COMMON": "Martyrs:For One Martyr,Pastors:For One Pastor",
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "",
-        "COLOR": "white,red",
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 179eea83..0728ee4c 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -28,32 +28,32 @@
                     "Doctors",
                     "Virgins",
                     "Holy Men and Women",
-                    "For One Martyr",
-                    "For Several Martyrs",
-                    "For Missionary Martyrs",
-                    "For One Missionary Martyr",
-                    "For Several Missionary Martyrs",
-                    "For a Virgin Martyr",
-                    "For a Holy Woman Martyr",
-                    "For a Pope",
-                    "For a Bishop",
-                    "For One Pastor",
-                    "For Several Pastors",
-                    "For Founders of a Church",
-                    "For One Founder",
-                    "For Several Founders",
-                    "For Missionaries",
-                    "For One Virgin",
-                    "For Several Virgins",
-                    "For Several Saints",
-                    "For One Saint",
-                    "For an Abbot",
-                    "For a Monk",
-                    "For a Nun",
-                    "For Religious",
-                    "For Those Who Practiced Works of Mercy",
-                    "For Educators",
-                    "For Holy Women"
+                    "Martyrs:For One Martyr",
+                    "Martyrs:For Several Martyrs",
+                    "Martyrs:For Missionary Martyrs",
+                    "Martyrs:For One Missionary Martyr",
+                    "Martyrs:For Several Missionary Martyrs",
+                    "Martyrs:For a Virgin Martyr",
+                    "Martyrs:For a Holy Woman Martyr",
+                    "Pastors:For a Pope",
+                    "Pastors:For a Bishop",
+                    "Pastors:For One Pastor",
+                    "Pastors:For Several Pastors",
+                    "Pastors:For Founders of a Church",
+                    "Pastors:For One Founder",
+                    "Pastors:For Several Founders",
+                    "Pastors:For Missionaries",
+                    "Virgins:For One Virgin",
+                    "Virgins:For Several Virgins",
+                    "Holy Men and Women:For Several Saints",
+                    "Holy Men and Women:For One Saint",
+                    "Holy Men and Women:For an Abbot",
+                    "Holy Men and Women:For a Monk",
+                    "Holy Men and Women:For a Nun",
+                    "Holy Men and Women:For Religious",
+                    "Holy Men and Women:For Those Who Practiced Works of Mercy",
+                    "Holy Men and Women:For Educators",
+                    "Holy Men and Women:For Holy Women"
                 ]
             },
             "title": "Common"
@@ -265,19 +265,6 @@
             ],
             "title": "DecreeURL"
         },
-        "ColorString": {
-            "type": "string",
-            "description": "This is defined simply for backwards compatibility. In the latest work on the API, arrays are supported, and should be expected. Once this definition is clear everywhere, we can remove this definition...",
-            "enum": [
-                "white",
-                "red",
-                "green",
-                "purple",
-                "pink",
-                "white,red"
-            ],
-            "title": "ColorString"
-        },
         "Missals": {
             "type": "array",
             "description": "Missals as defined in the PHP RomanMissal enum, from which data for the current calendar is drawn",
diff --git a/schemas/DiocesanCalendar.json b/schemas/DiocesanCalendar.json
index f67d65f1..273fd682 100644
--- a/schemas/DiocesanCalendar.json
+++ b/schemas/DiocesanCalendar.json
@@ -29,14 +29,7 @@
                     "type": "string"
                 },
                 "color": {
-                    "anyOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
-                        },
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "grade": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
diff --git a/schemas/MemorialsFromDecrees.json b/schemas/MemorialsFromDecrees.json
index 29ab74fd..8e1c3437 100644
--- a/schemas/MemorialsFromDecrees.json
+++ b/schemas/MemorialsFromDecrees.json
@@ -39,14 +39,7 @@
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Calendar"
                 },
                 "COLOR": {
-                    "anyOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
-                        },
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "TYPE": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitFeastType"
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index 6e3247b4..9e374f2a 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -54,14 +54,7 @@
                     "type": "string"
                 },
                 "color": {
-                    "anyOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
-                        },
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "grade": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
diff --git a/schemas/PropriumDeSanctis.json b/schemas/PropriumDeSanctis.json
index 2fb2e764..59e84f04 100644
--- a/schemas/PropriumDeSanctis.json
+++ b/schemas/PropriumDeSanctis.json
@@ -28,14 +28,7 @@
                     "$ref": "#/definitions/Calendar"
                 },
                 "COLOR": {
-                    "anyOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
-                        },
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "READINGS": {
                     "$ref": "#/definitions/Readings"
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 5e0865b6..75dc96b8 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -51,14 +51,7 @@
                     "type": "string"
                 },
                 "color": {
-                    "anyOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/ColorString"
-                        },
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "grade": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"

From 1574c01ab4c66bdbcad1f050ea9e2aa580e2d7a1 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 12:00:29 +0200
Subject: [PATCH 085/152] add untilYear to nationalCalendar schema

and missing readings from USA.json
---
 nations/USA/USA.json          | 8 +++++++-
 schemas/CommonDef.json        | 3 ++-
 schemas/NationalCalendar.json | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/nations/USA/USA.json b/nations/USA/USA.json
index e211f3b6..4fa55bb2 100644
--- a/nations/USA/USA.json
+++ b/nations/USA/USA.json
@@ -108,7 +108,13 @@
                 "day": null,
                 "month": null,
                 "common": [],
-                "readings": "",
+                "readings": {
+                    "FIRST_READING": "",
+                    "RESPONSORIAL_PSALM": "",
+                    "SECOND_READING": "",
+                    "ALLELUIA_VERSE": "",
+                    "GOSPEL": ""
+                },
                 "strtotime": "fourth thursday of november"
             },
             "Metadata": {
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 0728ee4c..d24bad8d 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -294,7 +294,8 @@
             "enum": [
                 "createNew",
                 "makePatron"
-            ]
+            ],
+            "title": "WiderRegionCalendarAction"
         },
         "NationalCalendarAction": {
             "type": "string",
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index 9e374f2a..d9afce8b 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -108,6 +108,9 @@
                 "sinceYear": {
                     "type": "integer"
                 },
+                "untilYear": {
+                    "type": "integer"
+                },
                 "missal": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
                 },

From a70f38350e6eca9e44979ad900c1b8e75787bd92 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 12:38:09 +0200
Subject: [PATCH 086/152] add DISPLAYGRADE and NAME props to propriumdesanctis
 schema

---
 .../propriumdesanctis_1970.json               | 1591 +++++++++++++----
 schemas/CommonDef.json                        |    1 +
 schemas/NationalCalendar.json                 |    4 +-
 schemas/PropriumDeSanctis.json                |   35 +-
 4 files changed, 1238 insertions(+), 393 deletions(-)

diff --git a/data/propriumdesanctis_1970/propriumdesanctis_1970.json b/data/propriumdesanctis_1970/propriumdesanctis_1970.json
index 97321c3d..ff5469e2 100644
--- a/data/propriumdesanctis_1970/propriumdesanctis_1970.json
+++ b/data/propriumdesanctis_1970/propriumdesanctis_1970.json
@@ -4,9 +4,13 @@
         "DAY": 2,
         "TAG": "StsBasilGreg",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ef 4, 1-7.11-13",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -20,9 +24,13 @@
         "DAY": 7,
         "TAG": "StRayPenyafort",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor"],
+        "COMMON": [
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Cor 5, 14-20",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -36,9 +44,14 @@
         "DAY": 13,
         "TAG": "StHilaryPoitiers",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Gv 2, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -52,9 +65,13 @@
         "DAY": 17,
         "TAG": "StAnthonyEgypt",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ef 6, 10-13.18",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -68,9 +85,15 @@
         "DAY": 20,
         "TAG": "StFabianPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Pt 5, 1-4",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -84,9 +107,13 @@
         "DAY": 20,
         "TAG": "StSebastian",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr"],
+        "COMMON": [
+            "Martyrs:For One Martyr"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Pt 3, 14-17",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -100,9 +127,15 @@
         "DAY": 21,
         "TAG": "StAgnes",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 26-31",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -116,9 +149,13 @@
         "DAY": 22,
         "TAG": "StVincentDeacon",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr"],
+        "COMMON": [
+            "Martyrs:For One Martyr"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Cor 4, 7-15",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -132,9 +169,14 @@
         "DAY": 24,
         "TAG": "StFrancisDeSales",
         "GRADE": 3,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ef 3, 8-12",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -148,9 +190,13 @@
         "DAY": 25,
         "TAG": "ConversionStPaul",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "At 22, 3-16|At 9, 1-22",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -164,9 +210,13 @@
         "DAY": 26,
         "TAG": "StsTimothyTitus",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2Tim 1, 1-8|Tito 1, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -180,9 +230,14 @@
         "DAY": 27,
         "TAG": "StAngelaMerici",
         "GRADE": 2,
-        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 7-11",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -196,9 +251,14 @@
         "DAY": 28,
         "TAG": "StThomasAquinas",
         "GRADE": 3,
-        "COMMON": ["Pastors:For One Pastor", "Doctors"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Sap 7, 7-10.15-16",
             "RESPONSORIAL_PSALM": "Salmo 119",
@@ -212,9 +272,14 @@
         "DAY": 31,
         "TAG": "StJohnBosco",
         "GRADE": 3,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Fil 4, 4-9",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -228,9 +293,13 @@
         "DAY": 2,
         "TAG": "Presentation",
         "GRADE": 5,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Mal 3, 1-4",
             "RESPONSORIAL_PSALM": "Sal 24",
@@ -244,9 +313,15 @@
         "DAY": 3,
         "TAG": "StBlase",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Rm 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -260,9 +335,14 @@
         "DAY": 3,
         "TAG": "StAnsgar",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Is 52, 7-10",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -276,9 +356,15 @@
         "DAY": 5,
         "TAG": "StAgatha",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 26-31",
             "RESPONSORIAL_PSALM": "Salmo 31",
@@ -292,9 +378,13 @@
         "DAY": 6,
         "TAG": "StsPaulMiki",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Gal 2, 19-20",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -308,9 +398,13 @@
         "DAY": 8,
         "TAG": "StJeromeEmiliani",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Tb 12, 6-13",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -324,9 +418,14 @@
         "DAY": 10,
         "TAG": "StScholastica",
         "GRADE": 3,
-        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For a Nun"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ct 8, 6-7",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -340,9 +439,13 @@
         "DAY": 11,
         "TAG": "LadyLourdes",
         "GRADE": 2,
-        "COMMON": ["Blessed Virgin Mary"],
+        "COMMON": [
+            "Blessed Virgin Mary"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Is 66, 10-14c",
             "RESPONSORIAL_PSALM": "Gdt Gdt 13, 18-19",
@@ -356,9 +459,13 @@
         "DAY": 14,
         "TAG": "StsCyrilMethodius",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "At 13, 46-49|Is 52, 7-10",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -372,9 +479,13 @@
         "DAY": 17,
         "TAG": "SevenHolyFounders",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Rm 8, 26-30",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -388,9 +499,14 @@
         "DAY": 21,
         "TAG": "StPeterDamian",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Tm 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -404,9 +520,13 @@
         "DAY": 22,
         "TAG": "ChairStPeter",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Pt 5, 1-4",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -420,9 +540,15 @@
         "DAY": 23,
         "TAG": "StPolycarp",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 2, 8-11",
             "RESPONSORIAL_PSALM": "Salmo 31",
@@ -436,9 +562,13 @@
         "DAY": 4,
         "TAG": "StCasimir",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For One Saint"],
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-14",
             "RESPONSORIAL_PSALM": "Salmo 15",
@@ -452,9 +582,13 @@
         "DAY": 7,
         "TAG": "StsPerpetuaFelicity",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Rm 8, 31b-39",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -468,9 +602,14 @@
         "DAY": 8,
         "TAG": "StJohnGod",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Gv 3, 14-18",
             "RESPONSORIAL_PSALM": "Salmo 112",
@@ -484,9 +623,14 @@
         "DAY": 9,
         "TAG": "StFrancesRome",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious","Holy Men and Women:For Holy Women"],
+        "COMMON": [
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Holy Women"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Pr 31, 10-13.19-20.30-31",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -500,9 +644,14 @@
         "DAY": 17,
         "TAG": "StPatrick",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 7-11",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -516,9 +665,14 @@
         "DAY": 18,
         "TAG": "StCyrilJerusalem",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 19",
@@ -532,9 +686,13 @@
         "DAY": 19,
         "TAG": "StJoseph",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2Sam 7, 4-5a.12-14a.16",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -548,9 +706,13 @@
         "DAY": 23,
         "TAG": "StTuribius",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop"],
+        "COMMON": [
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Tm 1, 13-14; 2, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -564,9 +726,13 @@
         "DAY": 25,
         "TAG": "Annunciation",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Is 7, 10-14; 8, 10c",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -580,9 +746,13 @@
         "DAY": 2,
         "TAG": "StFrancisPaola",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-14",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -596,9 +766,14 @@
         "DAY": 4,
         "TAG": "StIsidore",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Cor 4, 1-2.5-7",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -612,9 +787,13 @@
         "DAY": 5,
         "TAG": "StVincentFerrer",
         "GRADE": 2,
-        "COMMON": ["Pastors:For Missionaries"],
+        "COMMON": [
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Tm 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -628,9 +807,14 @@
         "DAY": 7,
         "TAG": "StJohnBaptistDeLaSalle",
         "GRADE": 3,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Tim 1, 13-14; 2, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 1",
@@ -644,9 +828,15 @@
         "DAY": 11,
         "TAG": "StStanislaus",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 12, 10-12a",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -660,9 +850,15 @@
         "DAY": 13,
         "TAG": "StMartinPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Tm 2, 8-13; 3, 10-12",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -676,9 +872,14 @@
         "DAY": 21,
         "TAG": "StAnselm",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ef 3, 14-19",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -692,9 +893,13 @@
         "DAY": 23,
         "TAG": "StGeorge",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr"],
+        "COMMON": [
+            "Martyrs:For One Martyr"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 21, 5-7",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -708,9 +913,15 @@
         "DAY": 24,
         "TAG": "StFidelisSigmaringen",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For One Pastor"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Col 1, 24-29",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -724,9 +935,13 @@
         "DAY": 25,
         "TAG": "StMarkEvangelist",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1Pt 5, 5b-14",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -740,9 +955,15 @@
         "DAY": 28,
         "TAG": "StPeterChanel",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Cor 1, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -756,9 +977,13 @@
         "DAY": 29,
         "TAG": "StCatherineSiena",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Gv 1, 5 – 2, 2",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -772,9 +997,13 @@
         "DAY": 30,
         "TAG": "StPiusV",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Pope"],
+        "COMMON": [
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Cor 4, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -788,9 +1017,13 @@
         "DAY": 1,
         "TAG": "StJosephWorker",
         "GRADE": 2,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Gen 1, 26 – 2, 3|Col 3, 14-15.17.23-24",
             "RESPONSORIAL_PSALM": "Salmo 90",
@@ -804,9 +1037,13 @@
         "DAY": 2,
         "TAG": "StAthanasius",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -820,9 +1057,13 @@
         "DAY": 3,
         "TAG": "StsPhilipJames",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1Cor 15, 1-8a",
             "RESPONSORIAL_PSALM": "Salmo 19",
@@ -836,9 +1077,13 @@
         "DAY": 12,
         "TAG": "StsNereusAchilleus",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 7, 9-17",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -852,9 +1097,13 @@
         "DAY": 12,
         "TAG": "StPancras",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr"],
+        "COMMON": [
+            "Martyrs:For One Martyr"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 19, 1.5-9a",
             "RESPONSORIAL_PSALM": "Salmo 103",
@@ -868,9 +1117,13 @@
         "DAY": 14,
         "TAG": "StMatthiasAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "At 1, 15-17.20-26",
             "RESPONSORIAL_PSALM": "Salmo 113",
@@ -884,9 +1137,15 @@
         "DAY": 18,
         "TAG": "StJohnIPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Ap 3, 14b.20-22",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -900,9 +1159,14 @@
         "DAY": 20,
         "TAG": "StBernardineSiena",
         "GRADE": 2,
-        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For Missionaries",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "At 4, 8-12",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -916,9 +1180,14 @@
         "DAY": 25,
         "TAG": "StBedeVenerable",
         "GRADE": 2,
-        "COMMON": ["Doctors", "Holy Men and Women:For a Monk"],
+        "COMMON": [
+            "Doctors",
+            "Holy Men and Women:For a Monk"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Cor 2, 10b-16",
             "RESPONSORIAL_PSALM": "Salmo 119",
@@ -932,9 +1201,13 @@
         "DAY": 25,
         "TAG": "StGregoryVII",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Pope"],
+        "COMMON": [
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "At 20, 17-18a.28-32.36",
             "RESPONSORIAL_PSALM": "Salmo 110",
@@ -948,9 +1221,14 @@
         "DAY": 25,
         "TAG": "StMaryMagdalenePazzi",
         "GRADE": 2,
-        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Cor 7, 25-35",
             "RESPONSORIAL_PSALM": "Salmo 148",
@@ -964,9 +1242,13 @@
         "DAY": 26,
         "TAG": "StPhilipNeri",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Fil 4, 4-9",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -980,9 +1262,14 @@
         "DAY": 27,
         "TAG": "StAugustineCanterbury",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Ts 2, 2b-8",
             "RESPONSORIAL_PSALM": "Salmo 96",
@@ -996,9 +1283,13 @@
         "DAY": 31,
         "TAG": "Visitation",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Sof 3, 14-18|Rm 12, 9-16b",
             "RESPONSORIAL_PSALM": "Is 12, 2-6",
@@ -1012,9 +1303,13 @@
         "DAY": 1,
         "TAG": "StJustinMartyr",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1Cor 1, 18-25",
             "RESPONSORIAL_PSALM": "Salmo 34",
@@ -1028,9 +1323,13 @@
         "DAY": 2,
         "TAG": "StsMarcellinusPeter",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "2 Cor 6, 4-10",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -1044,9 +1343,13 @@
         "DAY": 3,
         "TAG": "StsCharlesLwanga",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "Macc 7, 1-2.9-14",
             "RESPONSORIAL_PSALM": "Salmo 124",
@@ -1060,9 +1363,15 @@
         "DAY": 5,
         "TAG": "StBoniface",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "At 26, 19-23",
             "RESPONSORIAL_PSALM": "Salmo 117",
@@ -1076,9 +1385,14 @@
         "DAY": 6,
         "TAG": "StNorbert",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Ez 34, 11-16",
             "RESPONSORIAL_PSALM": "Salmo 23",
@@ -1092,9 +1406,13 @@
         "DAY": 9,
         "TAG": "StEphrem",
         "GRADE": 2,
-        "COMMON": ["Doctors"],
+        "COMMON": [
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Col 3, 12-17",
             "RESPONSORIAL_PSALM": "Salmo 37",
@@ -1108,9 +1426,13 @@
         "DAY": 11,
         "TAG": "StBarnabasAp",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "At 11, 21b-26; 13, 1-3",
             "RESPONSORIAL_PSALM": "Salmo 98",
@@ -1124,9 +1446,15 @@
         "DAY": 13,
         "TAG": "StAnthonyPadua",
         "GRADE": 3,
-        "COMMON": ["Pastors:For One Pastor,Doctors", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Doctors",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Is 61, 1-3a",
             "RESPONSORIAL_PSALM": "Salmo 89",
@@ -1140,9 +1468,13 @@
         "DAY": 19,
         "TAG": "StRomuald",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For an Abbot"],
+        "COMMON": [
+            "Holy Men and Women:For an Abbot"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "Fil 3, 8-10",
             "RESPONSORIAL_PSALM": "Salmo 131",
@@ -1156,9 +1488,13 @@
         "DAY": 21,
         "TAG": "StAloysiusGonzaga",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "1Gv 5, 1-5",
             "RESPONSORIAL_PSALM": "Salmo 16",
@@ -1172,9 +1508,13 @@
         "DAY": 22,
         "TAG": "StPaulinusNola",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop"],
+        "COMMON": [
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "2Cor 8, 9-15",
             "RESPONSORIAL_PSALM": "Salmo 40",
@@ -1188,9 +1528,13 @@
         "DAY": 22,
         "TAG": "StsJohnFisherThomasMore",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "1 Pt 4, 12-19",
             "RESPONSORIAL_PSALM": "Salmo 126",
@@ -1204,18 +1548,22 @@
         "DAY": 24,
         "TAG": "NativityJohnBaptist",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
-            "VIGIL" : {
+            "VIGIL": {
                 "FIRST_READING": "Ger 1, 4-10",
                 "RESPONSORIAL_PSALM": "Salmo 71",
                 "SECOND_READING": "1Pt 1, 8-12",
                 "ALLELUIA_VERSE": " Gv 1, 7; Lc 1, 17 ",
                 "GOSPEL": "Lc 1, 5-17"
             },
-            "DAY" : {
+            "DAY": {
                 "FIRST_READING": "Ger 1, 4-10",
                 "RESPONSORIAL_PSALM": "Salmo 71",
                 "SECOND_READING": "1Pt 1, 8-12",
@@ -1229,9 +1577,14 @@
         "DAY": 27,
         "TAG": "StCyrilAlexandria",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1245,9 +1598,14 @@
         "DAY": 28,
         "TAG": "StIrenaeus",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1261,9 +1619,13 @@
         "DAY": 29,
         "TAG": "StsPeterPaulAp",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1277,9 +1639,13 @@
         "DAY": 30,
         "TAG": "FirstMartyrsRome",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1293,9 +1659,13 @@
         "DAY": 3,
         "TAG": "StThomasAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1309,9 +1679,13 @@
         "DAY": 4,
         "TAG": "StElizabethPortugal",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1325,9 +1699,15 @@
         "DAY": 5,
         "TAG": "StAnthonyZaccaria",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious", "Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1341,9 +1721,15 @@
         "DAY": 6,
         "TAG": "StMariaGoretti",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1357,9 +1743,13 @@
         "DAY": 11,
         "TAG": "StBenedict",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1373,9 +1763,13 @@
         "DAY": 13,
         "TAG": "StHenry",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For One Saint"],
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1389,9 +1783,13 @@
         "DAY": 14,
         "TAG": "StCamillusDeLellis",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1405,9 +1803,14 @@
         "DAY": 15,
         "TAG": "StBonaventure",
         "GRADE": 3,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1421,9 +1824,13 @@
         "DAY": 16,
         "TAG": "LadyMountCarmel",
         "GRADE": 2,
-        "COMMON": ["Blessed Virgin Mary"],
+        "COMMON": [
+            "Blessed Virgin Mary"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1437,9 +1844,15 @@
         "DAY": 21,
         "TAG": "StLawrenceBrindisi",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor,Doctors", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Doctors",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1453,9 +1866,13 @@
         "DAY": 22,
         "TAG": "StMaryMagdalene",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1469,9 +1886,14 @@
         "DAY": 23,
         "TAG": "StBridget",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Holy Women"],
+        "COMMON": [
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Holy Women"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1485,9 +1907,13 @@
         "DAY": 25,
         "TAG": "StJamesAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1501,9 +1927,13 @@
         "DAY": 26,
         "TAG": "StsJoachimAnne",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1517,9 +1947,13 @@
         "DAY": 29,
         "TAG": "StMartha",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1533,9 +1967,14 @@
         "DAY": 30,
         "TAG": "StPeterChrysologus",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1549,9 +1988,13 @@
         "DAY": 31,
         "TAG": "StIgnatiusLoyola",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1565,9 +2008,14 @@
         "DAY": 1,
         "TAG": "StAlphonsusMariaDeLiguori",
         "GRADE": 3,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1581,9 +2029,13 @@
         "DAY": 2,
         "TAG": "StEusebius",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop"],
+        "COMMON": [
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1597,9 +2049,13 @@
         "DAY": 4,
         "TAG": "StJeanVianney",
         "GRADE": 3,
-        "COMMON": ["Pastors:For One Pastor"],
+        "COMMON": [
+            "Pastors:For One Pastor"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1613,9 +2069,13 @@
         "DAY": 5,
         "TAG": "DedicationStMaryMajor",
         "GRADE": 2,
-        "COMMON": ["Blessed Virgin Mary"],
+        "COMMON": [
+            "Blessed Virgin Mary"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1629,9 +2089,13 @@
         "DAY": 6,
         "TAG": "Transfiguration",
         "GRADE": 5,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1645,9 +2109,13 @@
         "DAY": 7,
         "TAG": "StSixtusIIPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1661,9 +2129,14 @@
         "DAY": 7,
         "TAG": "StCajetan",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1677,9 +2150,13 @@
         "DAY": 8,
         "TAG": "StDominic",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1693,9 +2170,14 @@
         "DAY": 10,
         "TAG": "StLawrenceDeacon",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1709,9 +2191,14 @@
         "DAY": 11,
         "TAG": "StClare",
         "GRADE": 3,
-        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For a Nun"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1725,9 +2212,13 @@
         "DAY": 12,
         "TAG": "StJaneFrancesDeChantal",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1741,9 +2232,15 @@
         "DAY": 13,
         "TAG": "StsPontianHippolytus",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs", "Pastors:For Several Pastors"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs",
+            "Pastors:For Several Pastors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1757,9 +2254,13 @@
         "DAY": 15,
         "TAG": "Assumption",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1773,9 +2274,13 @@
         "DAY": 16,
         "TAG": "StStephenHungary",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For One Saint"],
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1789,9 +2294,14 @@
         "DAY": 19,
         "TAG": "StJohnEudes",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1805,9 +2315,13 @@
         "DAY": 20,
         "TAG": "StBernardClairvaux",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1821,9 +2335,13 @@
         "DAY": 21,
         "TAG": "StPiusX",
         "GRADE": 3,
-        "COMMON": ["Pastors:For a Pope"],
+        "COMMON": [
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1837,9 +2355,13 @@
         "DAY": 22,
         "TAG": "QueenshipMary",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1853,9 +2375,13 @@
         "DAY": 23,
         "TAG": "StRoseLima",
         "GRADE": 2,
-        "COMMON": ["Virgins:For One Virgin"],
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1869,9 +2395,13 @@
         "DAY": 24,
         "TAG": "StBartholomewAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1885,9 +2415,13 @@
         "DAY": 25,
         "TAG": "StLouis",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For One Saint"],
+        "COMMON": [
+            "Holy Men and Women:For One Saint"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1901,9 +2435,14 @@
         "DAY": 25,
         "TAG": "StJosephCalasanz",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Educators"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Educators"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1917,9 +2456,13 @@
         "DAY": 27,
         "TAG": "StMonica",
         "GRADE": 3,
-        "COMMON": ["Holy Men and Women:For Holy Women"],
+        "COMMON": [
+            "Holy Men and Women:For Holy Women"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1933,9 +2476,13 @@
         "DAY": 28,
         "TAG": "StAugustineHippo",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1949,9 +2496,13 @@
         "DAY": 29,
         "TAG": "BeheadingJohnBaptist",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1965,9 +2516,13 @@
         "DAY": 3,
         "TAG": "StGregoryGreat",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1981,9 +2536,13 @@
         "DAY": 8,
         "TAG": "NativityVirginMary",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -1997,9 +2556,13 @@
         "DAY": 13,
         "TAG": "StJohnChrysostom",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2013,9 +2576,13 @@
         "DAY": 14,
         "TAG": "ExaltationCross",
         "GRADE": 5,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2029,9 +2596,13 @@
         "DAY": 15,
         "TAG": "LadySorrows",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2045,9 +2616,15 @@
         "DAY": 16,
         "TAG": "StsCorneliusCyprian",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For Several Martyrs", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2061,9 +2638,14 @@
         "DAY": 17,
         "TAG": "StRobertBellarmine",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2077,9 +2659,15 @@
         "DAY": 19,
         "TAG": "StJanuarius",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2093,9 +2681,13 @@
         "DAY": 21,
         "TAG": "StMatthewEvangelist",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2109,9 +2701,13 @@
         "DAY": 26,
         "TAG": "StsCosmasDamian",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2125,9 +2721,13 @@
         "DAY": 27,
         "TAG": "StVincentDePaul",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2141,9 +2741,13 @@
         "DAY": 28,
         "TAG": "StWenceslaus",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr"],
+        "COMMON": [
+            "Martyrs:For One Martyr"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2157,9 +2761,13 @@
         "DAY": 29,
         "TAG": "StsArchangels",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2173,9 +2781,13 @@
         "DAY": 30,
         "TAG": "StJerome",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2189,9 +2801,13 @@
         "DAY": 1,
         "TAG": "StThereseChildJesus",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2205,9 +2821,13 @@
         "DAY": 2,
         "TAG": "GuardianAngels",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2221,9 +2841,13 @@
         "DAY": 4,
         "TAG": "StFrancisAssisi",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2237,9 +2861,14 @@
         "DAY": 6,
         "TAG": "StBruno",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For a Monk"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For a Monk"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2253,9 +2882,13 @@
         "DAY": 7,
         "TAG": "LadyRosary",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2269,9 +2902,13 @@
         "DAY": 9,
         "TAG": "StDenis",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Several Martyrs"],
+        "COMMON": [
+            "Martyrs:For Several Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2285,9 +2922,14 @@
         "DAY": 9,
         "TAG": "StJohnLeonardi",
         "GRADE": 2,
-        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Pastors:For Missionaries",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2301,9 +2943,15 @@
         "DAY": 14,
         "TAG": "StCallistusIPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2317,9 +2965,13 @@
         "DAY": 15,
         "TAG": "StTeresaJesus",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2333,9 +2985,14 @@
         "DAY": 16,
         "TAG": "StHedwig",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious", "Holy Men and Women:For Holy Women"],
+        "COMMON": [
+            "Holy Men and Women:For Religious",
+            "Holy Men and Women:For Holy Women"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2349,9 +3006,13 @@
         "DAY": 16,
         "TAG": "StMargaretAlacoque",
         "GRADE": 2,
-        "COMMON": ["Virgins:For One Virgin"],
+        "COMMON": [
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2365,9 +3026,14 @@
         "DAY": 17,
         "TAG": "StIgnatiusAntioch",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2381,9 +3047,13 @@
         "DAY": 18,
         "TAG": "StLukeEvangelist",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2397,9 +3067,13 @@
         "DAY": 19,
         "TAG": "StsJeanBrebeuf",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For Missionary Martyrs"],
+        "COMMON": [
+            "Martyrs:For Missionary Martyrs"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2413,9 +3087,13 @@
         "DAY": 19,
         "TAG": "StPaulCross",
         "GRADE": 2,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2429,9 +3107,14 @@
         "DAY": 23,
         "TAG": "StJohnCapistrano",
         "GRADE": 2,
-        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Pastors:For Missionaries",
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2445,9 +3128,14 @@
         "DAY": 24,
         "TAG": "StAnthonyMaryClaret",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Pastors:For Missionaries"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Pastors:For Missionaries"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2461,9 +3149,13 @@
         "DAY": 28,
         "TAG": "StSimonStJudeAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2477,9 +3169,13 @@
         "DAY": 1,
         "TAG": "AllSaints",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2493,9 +3189,13 @@
         "DAY": 2,
         "TAG": "AllSouls",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["purple"],
+        "COLOR": [
+            "purple"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2509,9 +3209,13 @@
         "DAY": 3,
         "TAG": "StMartinPorres",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Religious"],
+        "COMMON": [
+            "Holy Men and Women:For Religious"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2525,9 +3229,13 @@
         "DAY": 4,
         "TAG": "StCharlesBorromeo",
         "GRADE": 3,
-        "COMMON": ["Pastors:For a Bishop"],
+        "COMMON": [
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2541,9 +3249,13 @@
         "DAY": 9,
         "TAG": "DedicationLateran",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2557,9 +3269,13 @@
         "DAY": 10,
         "TAG": "StLeoGreat",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2573,9 +3289,13 @@
         "DAY": 11,
         "TAG": "StMartinTours",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2589,9 +3309,14 @@
         "DAY": 12,
         "TAG": "StJosaphat",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2605,9 +3330,14 @@
         "DAY": 15,
         "TAG": "StAlbertGreat",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop", "Doctors"],
+        "COMMON": [
+            "Pastors:For a Bishop",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2621,9 +3351,13 @@
         "DAY": 16,
         "TAG": "StMargaretScotland",
         "GRADE": 2,
-        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2637,9 +3371,14 @@
         "DAY": 16,
         "TAG": "StGertrudeGreat",
         "GRADE": 2,
-        "COMMON": ["Virgins:For One Virgin", "Holy Men and Women:For a Nun"],
+        "COMMON": [
+            "Virgins:For One Virgin",
+            "Holy Men and Women:For a Nun"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2653,9 +3392,13 @@
         "DAY": 17,
         "TAG": "StElizabethHungary",
         "GRADE": 3,
-        "COMMON": ["Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2669,9 +3412,13 @@
         "DAY": 18,
         "TAG": "DedicationStsPeterPaul",
         "GRADE": 2,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2685,9 +3432,13 @@
         "DAY": 21,
         "TAG": "PresentationMary",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2701,9 +3452,15 @@
         "DAY": 22,
         "TAG": "StCecilia",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2717,9 +3474,15 @@
         "DAY": 23,
         "TAG": "StClementIPope",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Pope"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2733,9 +3496,14 @@
         "DAY": 23,
         "TAG": "StColumban",
         "GRADE": 2,
-        "COMMON": ["Pastors:For Missionaries", "Holy Men and Women:For an Abbot"],
+        "COMMON": [
+            "Pastors:For Missionaries",
+            "Holy Men and Women:For an Abbot"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2749,9 +3517,13 @@
         "DAY": 30,
         "TAG": "StAndrewAp",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2765,9 +3537,13 @@
         "DAY": 3,
         "TAG": "StFrancisXavier",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2781,9 +3557,14 @@
         "DAY": 4,
         "TAG": "StJohnDamascene",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Doctors"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2797,9 +3578,13 @@
         "DAY": 6,
         "TAG": "StNicholas",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Bishop"],
+        "COMMON": [
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2813,9 +3598,13 @@
         "DAY": 7,
         "TAG": "StAmbrose",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2829,9 +3618,13 @@
         "DAY": 8,
         "TAG": "ImmaculateConception",
         "GRADE": 6,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2845,9 +3638,13 @@
         "DAY": 11,
         "TAG": "StDamasusIPope",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Pope"],
+        "COMMON": [
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2861,9 +3658,15 @@
         "DAY": 13,
         "TAG": "StLucySyracuse",
         "GRADE": 3,
-        "COMMON": ["Martyrs:For a Virgin Martyr", "Virgins:For One Virgin"],
+        "COMMON": [
+            "Martyrs:For a Virgin Martyr",
+            "Virgins:For One Virgin"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2877,9 +3680,13 @@
         "DAY": 14,
         "TAG": "StJohnCross",
         "GRADE": 3,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2893,9 +3700,14 @@
         "DAY": 21,
         "TAG": "StPeterCanisius",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Doctors"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Doctors"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2909,9 +3721,14 @@
         "DAY": 23,
         "TAG": "StJohnKanty",
         "GRADE": 2,
-        "COMMON": ["Pastors:For One Pastor", "Holy Men and Women:For Those Who Practiced Works of Mercy"],
+        "COMMON": [
+            "Pastors:For One Pastor",
+            "Holy Men and Women:For Those Who Practiced Works of Mercy"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2925,9 +3742,13 @@
         "DAY": 26,
         "TAG": "StStephenProtomartyr",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2941,9 +3762,13 @@
         "DAY": 27,
         "TAG": "StJohnEvangelist",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2957,9 +3782,13 @@
         "DAY": 28,
         "TAG": "HolyInnocents",
         "GRADE": 4,
-        "COMMON": ["Proper"],
+        "COMMON": [
+            "Proper"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["red"],
+        "COLOR": [
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2973,9 +3802,15 @@
         "DAY": 29,
         "TAG": "StThomasBecket",
         "GRADE": 2,
-        "COMMON": ["Martyrs:For One Martyr", "Pastors:For a Bishop"],
+        "COMMON": [
+            "Martyrs:For One Martyr",
+            "Pastors:For a Bishop"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white", "red"],
+        "COLOR": [
+            "white",
+            "red"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
@@ -2989,9 +3824,13 @@
         "DAY": 31,
         "TAG": "StSylvesterIPope",
         "GRADE": 2,
-        "COMMON": ["Pastors:For a Pope"],
+        "COMMON": [
+            "Pastors:For a Pope"
+        ],
         "CALENDAR": "GENERAL ROMAN",
-        "COLOR": ["white"],
+        "COLOR": [
+            "white"
+        ],
         "READINGS": {
             "FIRST_READING": "",
             "RESPONSORIAL_PSALM": "",
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index d24bad8d..14f8ddb8 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -248,6 +248,7 @@
         "Calendar": {
             "type": "string",
             "enum": [
+                "",
                 "GENERAL ROMAN"
             ],
             "title": "Calendar"
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index d9afce8b..14dab4dd 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -60,7 +60,7 @@
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "day": {
-                    "anyOf": [
+                    "oneOf": [
                         {
                             "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                         },
@@ -70,7 +70,7 @@
                     ]
                 },
                 "month": {
-                    "anyOf": [
+                    "oneOf": [
                         {
                             "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                         },
diff --git a/schemas/PropriumDeSanctis.json b/schemas/PropriumDeSanctis.json
index 59e84f04..a21ac911 100644
--- a/schemas/PropriumDeSanctis.json
+++ b/schemas/PropriumDeSanctis.json
@@ -18,9 +18,15 @@
                 "TAG": {
                     "type": "string"
                 },
+                "NAME": {
+                    "type": "string"
+                },
                 "GRADE": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
+                "DISPLAYGRADE": {
+                    "type": "string"
+                },
                 "COMMON": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
                 },
@@ -31,7 +37,14 @@
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },
                 "READINGS": {
-                    "$ref": "#/definitions/Readings"
+                    "oneOf": [
+                        {
+                            "$ref": "#/definitions/LiturgicalEventWithVigilMass"
+                        },
+                        {
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -46,19 +59,6 @@
             ],
             "title": "PropriumDeSanctis"
         },
-        "Readings": {
-            "type": "object",
-            "additionalProperties": false,
-            "anyOf": [
-                {
-                    "$ref": "#/definitions/LiturgicalEventWithVigilMass"
-                },
-                {
-                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
-                }
-            ],
-            "title": "Readings"
-        },
         "LiturgicalEventWithVigilMass": {
             "type": "object",
             "additionalProperties": false,
@@ -69,7 +69,12 @@
                 "DAY": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 }
-            }
+            },
+            "required": [
+                "VIGIL",
+                "DAY"
+            ],
+            "title": "LiturgicalEventWithMass"
         },
         "Calendar": {
             "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Calendar"

From a9ac10eb96a3a5c409d306812d4d65e98d4b4dd6 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 13:02:16 +0200
Subject: [PATCH 087/152] add USA Masses x various occasions to commons enum

---
 .../propriumdesanctis_USA_2011.json                           | 2 +-
 schemas/CommonDef.json                                        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
index 4fb07512..6ea86aad 100644
--- a/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
+++ b/data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json
@@ -186,7 +186,7 @@
         "GRADE": 3,
         "DISPLAYGRADE": "National Holiday",
         "COMMON": [
-            ""
+            "Proper"
         ],
         "CALENDAR": "",
         "COLOR": [
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 14f8ddb8..82787d76 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -53,7 +53,9 @@
                     "Holy Men and Women:For Religious",
                     "Holy Men and Women:For Those Who Practiced Works of Mercy",
                     "Holy Men and Women:For Educators",
-                    "Holy Men and Women:For Holy Women"
+                    "Holy Men and Women:For Holy Women",
+                    "Masses and Prayers for Various Needs and Occasions:For Giving Thanks to God for the Gift of Human Life",
+                    "Preservation of Peace and Justice"
                 ]
             },
             "title": "Common"

From bd2ba8ba4a8ff99a25002cc6835b44280ee00e60 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 13:50:15 +0200
Subject: [PATCH 088/152] attempt pattern approach for URL

---
 nations/Europe.json              |  8 +++++++-
 schemas/CommonDef.json           | 10 +---------
 schemas/WiderRegionCalendar.json |  3 +++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/nations/Europe.json b/nations/Europe.json
index e8a2c302..77c951b0 100644
--- a/nations/Europe.json
+++ b/nations/Europe.json
@@ -112,7 +112,13 @@
                     "Martyrs:For a Virgin Martyr",
                     "Virgins:For One Virgin"
                 ],
-                "readings": ""
+                "readings": {
+                    "FIRST_READING": "",
+                    "RESPONSORIAL_PSALM": "",
+                    "SECOND_READING": "",
+                    "ALLELUIA_VERSE": "",
+                    "GOSPEL": ""
+                }
             },
             "Metadata": {
                 "action": "createNew",
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 82787d76..cef7477b 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -257,15 +257,7 @@
         },
         "DecreeURL": {
             "type": "string",
-            "format": "uri",
-            "qt-uri-protocols": [
-                "http",
-                "https"
-            ],
-            "qt-uri-extensions": [
-                ".html",
-                ".pdf"
-            ],
+            "pattern": "^https?:\\\/\\\/(www\\.)?[a-zA-Z]{1,50}\\.[a-zA-Z]{1,6}([-a-zA-Z0-9()@:%._+~\\\/]*)\\.(html|pdf)$",
             "title": "DecreeURL"
         },
         "Missals": {
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 75dc96b8..1dabad07 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -50,6 +50,9 @@
                 "tag": {
                     "type": "string"
                 },
+                "name": {
+                    "type": "string"
+                },
                 "color": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },

From fabf7b65a2996695e510768272d84741c2bf8c3e Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 13:55:42 +0200
Subject: [PATCH 089/152] fix Languages pattern

---
 schemas/WiderRegionCalendar.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 1dabad07..50217ec2 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -130,7 +130,7 @@
                     "type": "array",
                     "items": {
                         "type": "string",
-                        "pattern": "[A-Z]{2}"
+                        "pattern": "[a-z]{2}_[A-Z1-9]{2,3}"
                     }
                 },
                 "WiderRegion": {

From 8b8ae2a50ad926b4ebcb932aacc0d66d26eb969b Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 14:12:46 +0200
Subject: [PATCH 090/152] use propertnames enum for country names

---
 schemas/WiderRegionCalendar.json | 265 ++++++++++++++++++++++++++++++-
 1 file changed, 259 insertions(+), 6 deletions(-)

diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 50217ec2..554947fd 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -111,15 +111,268 @@
         },
         "NationalCalendars": {
             "type": "object",
-            "additionalProperties": {
-                "$ref": "#/definitions/NationalCalendarVals"
+            "propertyNames": {
+                "enum": [
+                    "Afghanistan",
+                    "Åland Islands",
+                    "Albania",
+                    "Algeria",
+                    "American Samoa",
+                    "Andorra",
+                    "Angola",
+                    "Anguilla",
+                    "Antigua & Barbuda",
+                    "Argentina",
+                    "Armenia",
+                    "Aruba",
+                    "Australia",
+                    "Austria",
+                    "Azerbaijan",
+                    "Bahamas",
+                    "Bahrain",
+                    "Bangladesh",
+                    "Barbados",
+                    "Belarus",
+                    "Belgium",
+                    "Belize",
+                    "Benin",
+                    "Bermuda",
+                    "Bhutan",
+                    "Bolivia",
+                    "Bosnia & Herzegovina",
+                    "Botswana",
+                    "Brazil",
+                    "British Indian Ocean Territory",
+                    "British Virgin Islands",
+                    "Brunei",
+                    "Bulgaria",
+                    "Burkina Faso",
+                    "Burundi",
+                    "Cambodia",
+                    "Cameroon",
+                    "Canada",
+                    "Canary Islands",
+                    "Cape Verde",
+                    "Caribbean Netherlands",
+                    "Cayman Islands",
+                    "Central African Republic",
+                    "Ceuta & Melilla",
+                    "Chad",
+                    "Chile",
+                    "China",
+                    "Christmas Island",
+                    "Cocos (Keeling) Islands",
+                    "Colombia",
+                    "Comoros",
+                    "Congo - Brazzaville",
+                    "Congo - Kinshasa",
+                    "Cook Islands",
+                    "Costa Rica",
+                    "Côte d’Ivoire",
+                    "Croatia",
+                    "Cuba",
+                    "Curaçao",
+                    "Cyprus",
+                    "Czechia",
+                    "Denmark",
+                    "Diego Garcia",
+                    "Djibouti",
+                    "Dominica",
+                    "Dominican Republic",
+                    "Ecuador",
+                    "Egypt",
+                    "El Salvador",
+                    "Equatorial Guinea",
+                    "Eritrea",
+                    "Estonia",
+                    "Eswatini",
+                    "Ethiopia",
+                    "Europe",
+                    "Falkland Islands",
+                    "Faroe Islands",
+                    "Fiji",
+                    "Finland",
+                    "France",
+                    "French Guiana",
+                    "French Polynesia",
+                    "Gabon",
+                    "Gambia",
+                    "Georgia",
+                    "Germany",
+                    "Ghana",
+                    "Gibraltar",
+                    "Greece",
+                    "Greenland",
+                    "Grenada",
+                    "Guadeloupe",
+                    "Guam",
+                    "Guatemala",
+                    "Guernsey",
+                    "Guinea",
+                    "Guinea-Bissau",
+                    "Guyana",
+                    "Haiti",
+                    "Honduras",
+                    "Hong Kong SAR China",
+                    "Hungary",
+                    "Iceland",
+                    "India",
+                    "Indonesia",
+                    "Iran",
+                    "Iraq",
+                    "Ireland",
+                    "Isle of Man",
+                    "Israel",
+                    "Italy",
+                    "Jamaica",
+                    "Japan",
+                    "Jersey",
+                    "Jordan",
+                    "Kazakhstan",
+                    "Kenya",
+                    "Kiribati",
+                    "Kosovo",
+                    "Kuwait",
+                    "Kyrgyzstan",
+                    "Laos",
+                    "Latin America",
+                    "Latvia",
+                    "Lebanon",
+                    "Lesotho",
+                    "Liberia",
+                    "Libya",
+                    "Liechtenstein",
+                    "Lithuania",
+                    "Luxembourg",
+                    "Macao SAR China",
+                    "Madagascar",
+                    "Malawi",
+                    "Malaysia",
+                    "Mali",
+                    "Malta",
+                    "Marshall Islands",
+                    "Martinique",
+                    "Mauritania",
+                    "Mauritius",
+                    "Mayotte",
+                    "Mexico",
+                    "Micronesia",
+                    "Moldova",
+                    "Monaco",
+                    "Mongolia",
+                    "Montenegro",
+                    "Montserrat",
+                    "Morocco",
+                    "Mozambique",
+                    "Myanmar (Burma)",
+                    "Namibia",
+                    "Nauru",
+                    "Nepal",
+                    "Netherlands",
+                    "New Caledonia",
+                    "New Zealand",
+                    "Nicaragua",
+                    "Niger",
+                    "Nigeria",
+                    "Niue",
+                    "Norfolk Island",
+                    "North Korea",
+                    "North Macedonia",
+                    "Northern Mariana Islands",
+                    "Norway",
+                    "Oman",
+                    "Pakistan",
+                    "Palau",
+                    "Palestinian Territories",
+                    "Panama",
+                    "Papua New Guinea",
+                    "Paraguay",
+                    "Peru",
+                    "Philippines",
+                    "Pitcairn Islands",
+                    "Poland",
+                    "Portugal",
+                    "Puerto Rico",
+                    "Qatar",
+                    "Réunion",
+                    "Romania",
+                    "Russia",
+                    "Rwanda",
+                    "Samoa",
+                    "San Marino",
+                    "São Tomé & Príncipe",
+                    "Saudi Arabia",
+                    "Senegal",
+                    "Serbia",
+                    "Seychelles",
+                    "Sierra Leone",
+                    "Singapore",
+                    "Sint Maarten",
+                    "Slovakia",
+                    "Slovenia",
+                    "Solomon Islands",
+                    "Somalia",
+                    "South Africa",
+                    "South Korea",
+                    "South Sudan",
+                    "Spain",
+                    "Sri Lanka",
+                    "St. Barthélemy",
+                    "St. Helena",
+                    "St. Kitts & Nevis",
+                    "St. Lucia",
+                    "St. Martin",
+                    "St. Pierre & Miquelon",
+                    "St. Vincent & Grenadines",
+                    "Sudan",
+                    "Suriname",
+                    "Svalbard & Jan Mayen",
+                    "Sweden",
+                    "Switzerland",
+                    "Syria",
+                    "Taiwan",
+                    "Tajikistan",
+                    "Tanzania",
+                    "Thailand",
+                    "Timor-Leste",
+                    "Togo",
+                    "Tokelau",
+                    "Tonga",
+                    "Trinidad & Tobago",
+                    "Tunisia",
+                    "Turkey",
+                    "Turkmenistan",
+                    "Turks & Caicos Islands",
+                    "Tuvalu",
+                    "U.S. Outlying Islands",
+                    "U.S. Virgin Islands",
+                    "Uganda",
+                    "Ukraine",
+                    "United Arab Emirates",
+                    "United Kingdom",
+                    "United States",
+                    "Uruguay",
+                    "Uzbekistan",
+                    "Vanuatu",
+                    "Vatican City",
+                    "Venezuela",
+                    "Vietnam",
+                    "Wallis & Futuna",
+                    "Western Sahara",
+                    "World",
+                    "Yemen",
+                    "Zambia",
+                    "Zimbabwe"
+                ]
+            },
+            "patternProperties": {
+                "": {
+                    "type": "string",
+                    "pattern": "[A-Z1-9]{2,3}"
+                }
             },
             "title": "NationalCalendars"
         },
-        "NationalCalendarVals": {
-            "type": "string",
-            "description": "a key value pair where the key is the uppercased country name in English, and the value is the corresponding two letter ISO code for the same country; this is useful for discovery of National Calendars that use this same WiderRegion Calendar"
-        },
         "CalendarMetadata": {
             "type": "object",
             "properties": {

From 85066b8e946117609c5a944987c943b127d084ea Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 11 May 2022 16:43:40 +0200
Subject: [PATCH 091/152] create schema for the index of diocesan calendars

---
 nations/index.json |  20 +++-
 schemas/Index.json | 286 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 schemas/Index.json

diff --git a/nations/index.json b/nations/index.json
index 8afa2a4b..c2856930 100644
--- a/nations/index.json
+++ b/nations/index.json
@@ -1 +1,19 @@
-{"DIOCESIDIROMA":{"path":"nations\/ITALY\/Diocesi di Roma.json","nation":"ITALY","diocese":"Diocesi di Roma","group":"Diocesi del Lazio"},"ARCHDIOCESEOFBOSTONMASSACHUSETTS":{"path":"nations\/USA\/Archdiocese of Boston (Massachusetts).json","nation":"USA","diocese":"Archdiocese of Boston (Massachusetts)"},"DIOCESIDISORACASSINOAQUINOPONTECORVO":{"path":"nations\/ITALY\/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json","nation":"ITALY","diocese":"Diocesi di Sora - Cassino - Aquino - Pontecorvo","group":"Diocesi del Lazio"}}
+{
+    "DIOCESIDIROMA": {
+        "path": "nations\/ITALY\/Diocesi di Roma.json",
+        "nation": "ITALY",
+        "diocese": "Diocesi di Roma",
+        "group": "Diocesi del Lazio"
+    },
+    "ARCHDIOCESEOFBOSTONMASSACHUSETTS": {
+        "path": "nations\/USA\/Archdiocese of Boston (Massachusetts).json",
+        "nation": "USA",
+        "diocese": "Archdiocese of Boston (Massachusetts)"
+    },
+    "DIOCESIDISORACASSINOAQUINOPONTECORVO": {
+        "path": "nations\/ITALY\/Diocesi di Sora - Cassino - Aquino - Pontecorvo.json",
+        "nation": "ITALY",
+        "diocese": "Diocesi di Sora - Cassino - Aquino - Pontecorvo",
+        "group": "Diocesi del Lazio"
+    }
+}
diff --git a/schemas/Index.json b/schemas/Index.json
new file mode 100644
index 00000000..233c670d
--- /dev/null
+++ b/schemas/Index.json
@@ -0,0 +1,286 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/Index",
+    "definitions": {
+        "Index": {
+            "type": "object",
+            "patternProperties": {
+                "[A-Z]{1,255}": {
+                    "type": "object",
+                    "properties": {
+                        "path": {
+                            "type": "string",
+                            "pattern": "^nations\\\/[A-Z &()\\-]+\\\/[a-zA-Z0-9 ()-]+\\.json$"
+                        },
+                        "nation": {
+                            "type": "string",
+                            "enum": [
+                                "AFGHANISTAN",
+                                "ÅLAND ISLANDS",
+                                "ALBANIA",
+                                "ALGERIA",
+                                "AMERICAN SAMOA",
+                                "ANDORRA",
+                                "ANGOLA",
+                                "ANGUILLA",
+                                "ANTIGUA & BARBUDA",
+                                "ARGENTINA",
+                                "ARMENIA",
+                                "ARUBA",
+                                "AUSTRALIA",
+                                "AUSTRIA",
+                                "AZERBAIJAN",
+                                "BAHAMAS",
+                                "BAHRAIN",
+                                "BANGLADESH",
+                                "BARBADOS",
+                                "BELARUS",
+                                "BELGIUM",
+                                "BELIZE",
+                                "BENIN",
+                                "BERMUDA",
+                                "BHUTAN",
+                                "BOLIVIA",
+                                "BOSNIA & HERZEGOVINA",
+                                "BOTSWANA",
+                                "BRAZIL",
+                                "BRITISH INDIAN OCEAN TERRITORY",
+                                "BRITISH VIRGIN ISLANDS",
+                                "BRUNEI",
+                                "BULGARIA",
+                                "BURKINA FASO",
+                                "BURUNDI",
+                                "CAMBODIA",
+                                "CAMEROON",
+                                "CANADA",
+                                "CANARY ISLANDS",
+                                "CAPE VERDE",
+                                "CARIBBEAN NETHERLANDS",
+                                "CAYMAN ISLANDS",
+                                "CENTRAL AFRICAN REPUBLIC",
+                                "CEUTA & MELILLA",
+                                "CHAD",
+                                "CHILE",
+                                "CHINA",
+                                "CHRISTMAS ISLAND",
+                                "COCOS (KEELING) ISLANDS",
+                                "COLOMBIA",
+                                "COMOROS",
+                                "CONGO - BRAZZAVILLE",
+                                "CONGO - KINSHASA",
+                                "COOK ISLANDS",
+                                "COSTA RICA",
+                                "CÔTE D’IVOIRE",
+                                "CROATIA",
+                                "CUBA",
+                                "CURAÇAO",
+                                "CYPRUS",
+                                "CZECHIA",
+                                "DENMARK",
+                                "DIEGO GARCIA",
+                                "DJIBOUTI",
+                                "DOMINICA",
+                                "DOMINICAN REPUBLIC",
+                                "ECUADOR",
+                                "EGYPT",
+                                "EL SALVADOR",
+                                "EQUATORIAL GUINEA",
+                                "ERITREA",
+                                "ESTONIA",
+                                "ESWATINI",
+                                "ETHIOPIA",
+                                "EUROPE",
+                                "FALKLAND ISLANDS",
+                                "FAROE ISLANDS",
+                                "FIJI",
+                                "FINLAND",
+                                "FRANCE",
+                                "FRENCH GUIANA",
+                                "FRENCH POLYNESIA",
+                                "GABON",
+                                "GAMBIA",
+                                "GEORGIA",
+                                "GERMANY",
+                                "GHANA",
+                                "GIBRALTAR",
+                                "GREECE",
+                                "GREENLAND",
+                                "GRENADA",
+                                "GUADELOUPE",
+                                "GUAM",
+                                "GUATEMALA",
+                                "GUERNSEY",
+                                "GUINEA",
+                                "GUINEA-BISSAU",
+                                "GUYANA",
+                                "HAITI",
+                                "HONDURAS",
+                                "HONG KONG SAR CHINA",
+                                "HUNGARY",
+                                "ICELAND",
+                                "INDIA",
+                                "INDONESIA",
+                                "IRAN",
+                                "IRAQ",
+                                "IRELAND",
+                                "ISLE OF MAN",
+                                "ISRAEL",
+                                "ITALY",
+                                "JAMAICA",
+                                "JAPAN",
+                                "JERSEY",
+                                "JORDAN",
+                                "KAZAKHSTAN",
+                                "KENYA",
+                                "KIRIBATI",
+                                "KOSOVO",
+                                "KUWAIT",
+                                "KYRGYZSTAN",
+                                "LAOS",
+                                "LATIN AMERICA",
+                                "LATVIA",
+                                "LEBANON",
+                                "LESOTHO",
+                                "LIBERIA",
+                                "LIBYA",
+                                "LIECHTENSTEIN",
+                                "LITHUANIA",
+                                "LUXEMBOURG",
+                                "MACAO SAR CHINA",
+                                "MADAGASCAR",
+                                "MALAWI",
+                                "MALAYSIA",
+                                "MALI",
+                                "MALTA",
+                                "MARSHALL ISLANDS",
+                                "MARTINIQUE",
+                                "MAURITANIA",
+                                "MAURITIUS",
+                                "MAYOTTE",
+                                "MEXICO",
+                                "MICRONESIA",
+                                "MOLDOVA",
+                                "MONACO",
+                                "MONGOLIA",
+                                "MONTENEGRO",
+                                "MONTSERRAT",
+                                "MOROCCO",
+                                "MOZAMBIQUE",
+                                "MYANMAR (BURMA)",
+                                "NAMIBIA",
+                                "NAURU",
+                                "NEPAL",
+                                "NETHERLANDS",
+                                "NEW CALEDONIA",
+                                "NEW ZEALAND",
+                                "NICARAGUA",
+                                "NIGER",
+                                "NIGERIA",
+                                "NIUE",
+                                "NORFOLK ISLAND",
+                                "NORTH KOREA",
+                                "NORTH MACEDONIA",
+                                "NORTHERN MARIANA ISLANDS",
+                                "NORWAY",
+                                "OMAN",
+                                "PAKISTAN",
+                                "PALAU",
+                                "PALESTINIAN TERRITORIES",
+                                "PANAMA",
+                                "PAPUA NEW GUINEA",
+                                "PARAGUAY",
+                                "PERU",
+                                "PHILIPPINES",
+                                "PITCAIRN ISLANDS",
+                                "POLAND",
+                                "PORTUGAL",
+                                "PUERTO RICO",
+                                "QATAR",
+                                "RÉUNION",
+                                "ROMANIA",
+                                "RUSSIA",
+                                "RWANDA",
+                                "SAMOA",
+                                "SAN MARINO",
+                                "SÃO TOMÉ & PRÍNCIPE",
+                                "SAUDI ARABIA",
+                                "SENEGAL",
+                                "SERBIA",
+                                "SEYCHELLES",
+                                "SIERRA LEONE",
+                                "SINGAPORE",
+                                "SINT MAARTEN",
+                                "SLOVAKIA",
+                                "SLOVENIA",
+                                "SOLOMON ISLANDS",
+                                "SOMALIA",
+                                "SOUTH AFRICA",
+                                "SOUTH KOREA",
+                                "SOUTH SUDAN",
+                                "SPAIN",
+                                "SRI LANKA",
+                                "ST. BARTHÉLEMY",
+                                "ST. HELENA",
+                                "ST. KITTS & NEVIS",
+                                "ST. LUCIA",
+                                "ST. MARTIN",
+                                "ST. PIERRE & MIQUELON",
+                                "ST. VINCENT & GRENADINES",
+                                "SUDAN",
+                                "SURINAME",
+                                "SVALBARD & JAN MAYEN",
+                                "SWEDEN",
+                                "SWITZERLAND",
+                                "SYRIA",
+                                "TAIWAN",
+                                "TAJIKISTAN",
+                                "TANZANIA",
+                                "THAILAND",
+                                "TIMOR-LESTE",
+                                "TOGO",
+                                "TOKELAU",
+                                "TONGA",
+                                "TRINIDAD & TOBAGO",
+                                "TUNISIA",
+                                "TURKEY",
+                                "TURKMENISTAN",
+                                "TURKS & CAICOS ISLANDS",
+                                "TUVALU",
+                                "U.S. OUTLYING ISLANDS",
+                                "U.S. VIRGIN ISLANDS",
+                                "UGANDA",
+                                "UKRAINE",
+                                "UNITED ARAB EMIRATES",
+                                "UNITED KINGDOM",
+                                "USA",
+                                "URUGUAY",
+                                "UZBEKISTAN",
+                                "VANUATU",
+                                "VATICAN CITY",
+                                "VENEZUELA",
+                                "VIETNAM",
+                                "WALLIS & FUTUNA",
+                                "WESTERN SAHARA",
+                                "WORLD",
+                                "YEMEN",
+                                "ZAMBIA",
+                                "ZIMBABWE"
+                            ]
+                        },
+                        "diocese": {
+                            "type": "string"
+                        },
+                        "group": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "path",
+                        "nation",
+                        "diocese"
+                    ]
+                }
+            }
+        }
+    }
+}

From 3938a278a7fe78bdda30d5d77de6766baa9c7ea1 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Thu, 12 May 2022 15:29:15 +0200
Subject: [PATCH 092/152] add swaggest/json-schema library

---
 .gitignore    |   2 +
 composer.json |   5 ++
 composer.lock | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 251 insertions(+)
 create mode 100644 composer.json
 create mode 100644 composer.lock

diff --git a/.gitignore b/.gitignore
index 8ea1721c..9a6f3815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ LiturgicalCalendar.iml
 .idea
 engineCache/*
 allowedOrigins.php
+vendor/*
+
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..2a0f21ae
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "swaggest/json-schema": "^0.12"
+    }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..4d9bca9e
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,244 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "d04d28f060eb58ca81c9f79e28dfc6af",
+    "packages": [
+        {
+            "name": "phplang/scope-exit",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phplang/scope-exit.git",
+                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phplang/scope-exit/zipball/239b73abe89f9414aa85a7ca075ec9445629192b",
+                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpLang\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Sara Golemon",
+                    "email": "pollita@php.net",
+                    "homepage": "https://twitter.com/SaraMG",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Emulation of SCOPE_EXIT construct from C++",
+            "homepage": "https://github.com/phplang/scope-exit",
+            "keywords": [
+                "cleanup",
+                "exit",
+                "scope"
+            ],
+            "support": {
+                "issues": "https://github.com/phplang/scope-exit/issues",
+                "source": "https://github.com/phplang/scope-exit/tree/master"
+            },
+            "time": "2016-09-17T00:15:18+00:00"
+        },
+        {
+            "name": "swaggest/json-diff",
+            "version": "v3.8.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/swaggest/json-diff.git",
+                "reference": "bb3e3b4e9d842bb2e48f31ea568d0459968d1d42"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/swaggest/json-diff/zipball/bb3e3b4e9d842bb2e48f31ea568d0459968d1d42",
+                "reference": "bb3e3b4e9d842bb2e48f31ea568d0459968d1d42",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.23"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Swaggest\\JsonDiff\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Viacheslav Poturaev",
+                    "email": "vearutop@gmail.com"
+                }
+            ],
+            "description": "JSON diff/rearrange/patch/pointer library for PHP",
+            "support": {
+                "issues": "https://github.com/swaggest/json-diff/issues",
+                "source": "https://github.com/swaggest/json-diff/tree/v3.8.3"
+            },
+            "time": "2021-09-25T22:09:03+00:00"
+        },
+        {
+            "name": "swaggest/json-schema",
+            "version": "v0.12.39",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/swaggest/php-json-schema.git",
+                "reference": "193ba39cce1ffa2d55ddd5445315e945a63298a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/swaggest/php-json-schema/zipball/193ba39cce1ffa2d55ddd5445315e945a63298a2",
+                "reference": "193ba39cce1ffa2d55ddd5445315e945a63298a2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.4",
+                "phplang/scope-exit": "^1.0",
+                "swaggest/json-diff": "^3.8.2",
+                "symfony/polyfill-mbstring": "^1.19"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.23"
+            },
+            "suggest": {
+                "ext-mbstring": "For better performance"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Swaggest\\JsonSchema\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Viacheslav Poturaev",
+                    "email": "vearutop@gmail.com"
+                }
+            ],
+            "description": "High definition PHP structures with JSON-schema based validation",
+            "support": {
+                "email": "vearutop@gmail.com",
+                "issues": "https://github.com/swaggest/php-json-schema/issues",
+                "source": "https://github.com/swaggest/php-json-schema/tree/v0.12.39"
+            },
+            "time": "2021-10-15T18:12:27+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-11-30T18:21:41+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}

From 85702b023e78159d140cdb301f06d22f0cad4efe Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 13 May 2022 13:45:16 +0200
Subject: [PATCH 093/152] create LitSchema and implement schema validation

---
 LitCalRegionalData.php       | 66 ++++++++++++++++++++++++++++++------
 includes/enums/LitSchema.php | 23 +++++++++++++
 2 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 includes/enums/LitSchema.php

diff --git a/LitCalRegionalData.php b/LitCalRegionalData.php
index 98841beb..bb0289f4 100644
--- a/LitCalRegionalData.php
+++ b/LitCalRegionalData.php
@@ -3,10 +3,14 @@
 ini_set( 'display_errors', 1 );
 
 include_once( 'includes/enums/AcceptHeader.php' );
+include_once( 'includes/enums/LitSchema.php' );
 include_once( 'includes/enums/RequestMethod.php' );
 include_once( 'includes/enums/RequestContentType.php' );
 include_once( 'includes/enums/ReturnType.php' );
 include_once( 'includes/APICore.php' );
+include_once( 'vendor/autoload.php' );
+
+use Swaggest\JsonSchema\Schema;
 
 if( file_exists("allowedOrigins.php") ) {
     include_once( 'allowedOrigins.php' );
@@ -156,10 +160,18 @@ private function writeRegionalCalendar() {
             if( !file_exists( $path ) ) {
                 mkdir( $path, 0755, true );
             }
-            $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
-            file_put_contents( $path . "/{$region}.json",  $data . PHP_EOL );
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
-            die( '{"success":"National calendar created or updated for nation \"'. $this->DATA->Metadata->Region .'\""}' );
+
+            $test = $this->validateDataAgainstSchema( $this->DATA, LitSchema::NATIONAL );
+            if( $test === true ) {
+                $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
+                file_put_contents( $path . "/{$region}.json",  $data . PHP_EOL );
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
+                die( '{"success":"National calendar created or updated for nation \"'. $this->DATA->Metadata->Region .'\""}' );
+            } else {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+                die( json_encode( $test ) );
+            }
+
         }
         else if ( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Metadata' ) && property_exists( $this->DATA, 'NationalCalendars' ) ) {
             $this->DATA->Metadata->WiderRegion = ucfirst( strtolower( $this->DATA->Metadata->WiderRegion ) );
@@ -181,10 +193,18 @@ private function writeRegionalCalendar() {
                     }
                 }
             }
-            $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
-            file_put_contents( "nations/{$this->DATA->Metadata->WiderRegion}.json",  $data . PHP_EOL );
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
-            die( '{"success":"Wider region calendar created or updated for region \"'. $this->DATA->Metadata->WiderRegion .'\""}' );
+
+            $test = $this->validateDataAgainstSchema( $this->DATA, LitSchema::WIDERREGION );
+            if( $test === true ) {
+                $data = json_encode( $this->DATA, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE );
+                file_put_contents( "nations/{$this->DATA->Metadata->WiderRegion}.json",  $data . PHP_EOL );
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
+                die( '{"success":"Wider region calendar created or updated for region \"'. $this->DATA->Metadata->WiderRegion .'\""}' );
+            } else {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+                die( json_encode( $test ) );
+            }
+
         }
         else if ( property_exists( $this->DATA, 'LitCal' ) && property_exists( $this->DATA, 'Diocese' ) && property_exists( $this->DATA, 'Nation' ) ) {
             $this->RESPONSE->Nation = strip_tags( $this->DATA->Nation );
@@ -206,7 +226,13 @@ private function writeRegionalCalendar() {
                 mkdir( $path, 0755, true );
             }
 
-            file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
+            $test = $this->validateDataAgainstSchema( $CalData, LitSchema::DIOCESAN );
+            if( $test === true ) {
+                file_put_contents( $path . "/{$this->RESPONSE->Diocese}.json", $this->RESPONSE->Calendar . PHP_EOL );
+            } else {
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+                die( json_encode( $test ) );
+            }
 
             $this->createOrUpdateIndex( $path );
             header( $_SERVER[ "SERVER_PROTOCOL" ]." 201 Created", true, 201 );
@@ -266,7 +292,27 @@ private function createOrUpdateIndex( string $path, bool $delete = false ) {
             }
         }
 
-        file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE ) . PHP_EOL );
+        $test = $this->validateDataAgainstSchema( $this->GeneralIndex, LitSchema::INDEX );
+        if( $test === true ) {
+            file_put_contents( "nations/index.json", json_encode( $this->GeneralIndex, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE ) . PHP_EOL );
+        } else {
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+            die( json_encode( $test ) );
+        }
+
+    }
+
+    private function validateDataAgainstSchema( object $data, string $schemaUrl ) : bool {
+        $result = new stdClass();
+        $schema = Schema::import( $schemaUrl );
+        try {
+            $validation = $schema->in($data);
+            return true;
+        } catch (Exception $e) {
+            $result->error = LitSchema::ERROR_MESSAGES[ $schemaUrl ] . PHP_EOL . $e->getMessage();
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+            die( json_encode( $result ) );
+        }
     }
 
     public function Init() {
diff --git a/includes/enums/LitSchema.php b/includes/enums/LitSchema.php
new file mode 100644
index 00000000..99142319
--- /dev/null
+++ b/includes/enums/LitSchema.php
@@ -0,0 +1,23 @@
+<?php
+
+class LitSchema {
+
+    const INDEX             = "https://litcal.org/api/dev/schemas/Index.json";
+    const DIOCESAN          = "https://litcal.org/api/dev/schemas/DiocesanCalendar.json";
+    const NATIONAL          = "https://litcal.org/api/dev/schemas/NationalCalendar.json";
+    const PROPRIUMDESANCTIS = "https://litcal.org/api/dev/schemas/PropriumDeSanctis.json";
+    const WIDERREGION       = "https://litcal.org/api/dev/schemas/WiderRegionCalendar.json";
+    const DECREEMEMORIALS   = "https://litcal.org/api/dev/schemas/MemorialsFromDecrees.json";
+    const I18N              = "https://litcal.org/api/dev/schemas/LitCalTranslation.json";
+
+    const ERROR_MESSAGES = [
+        LitSchema::INDEX             => "Schema validation error: Index not updated",
+        LitSchema::DIOCESAN          => "Schema validation error: Diocesan Calendar not created / updated",
+        LitSchema::NATIONAL          => "Schema validation error: National Calendar not created / updated",
+        LitSchema::PROPRIUMDESANCTIS => "Schema validation error: Proprium de Sanctis data not created / updated",
+        LitSchema::WIDERREGION       => "Schema validation error: Wider Region data not created / updated",
+        LitSchema::DECREEMEMORIALS   => "Schema validation error: Memorials from Decrees data not created / updated",
+        LitSchema::I18N              => "Schema validation error: Translation data not created / updated"
+    ];
+
+}

From a296cc556ef5d166e5cea4b66c2ddd2fd83334f0 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 13 May 2022 18:23:16 +0200
Subject: [PATCH 094/152] test adding WiderRegion calendar w/schema validation

---
 nations/ASIA/ja_JP.json      |  3 +++
 nations/ASIA/zh_Hans_CN.json |  3 +++
 nations/Asia.json            | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 nations/ASIA/ja_JP.json
 create mode 100644 nations/ASIA/zh_Hans_CN.json
 create mode 100644 nations/Asia.json

diff --git a/nations/ASIA/ja_JP.json b/nations/ASIA/ja_JP.json
new file mode 100644
index 00000000..858f4551
--- /dev/null
+++ b/nations/ASIA/ja_JP.json
@@ -0,0 +1,3 @@
+{
+    "StFrancisXavier": ""
+}
\ No newline at end of file
diff --git a/nations/ASIA/zh_Hans_CN.json b/nations/ASIA/zh_Hans_CN.json
new file mode 100644
index 00000000..858f4551
--- /dev/null
+++ b/nations/ASIA/zh_Hans_CN.json
@@ -0,0 +1,3 @@
+{
+    "StFrancisXavier": ""
+}
\ No newline at end of file
diff --git a/nations/Asia.json b/nations/Asia.json
new file mode 100644
index 00000000..93768a40
--- /dev/null
+++ b/nations/Asia.json
@@ -0,0 +1,42 @@
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "StFrancisXavier",
+                "name": "San Francesco Saverio, sacerdote",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 3,
+                "month": 12
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1970,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/john-paul-ii\/%s\/apost_exhortations\/documents\/hf_jp-ii_exh_06111999_ecclesia-in-asia.html",
+                "decreeLangs": {
+                    "DE": "de",
+                    "EN": "en",
+                    "ES": "es",
+                    "FR": "fr",
+                    "IT": "it",
+                    "PT": "pt",
+                    "ZH": "zh"
+                }
+            }
+        }
+    ],
+    "NationalCalendars": {
+        "China": "CN",
+        "Japan": "JP"
+    },
+    "Metadata": {
+        "IsMultilingual": true,
+        "Languages": [
+            "zh_Hans_CN",
+            "ja_JP"
+        ],
+        "WiderRegion": "Asia"
+    }
+}

From 8a66bf4ab497f3c0e9dff64262c737a0f12bbb55 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 14 May 2022 18:07:51 +0200
Subject: [PATCH 095/152] day/month and strtotime mutually exclusive

---
 schemas/NationalCalendar.json | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index 14dab4dd..f8be2743 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -90,11 +90,25 @@
                     "description": "supports PHP strtotime string format"
                 }
             },
-            "required": [
-                "day",
-                "month",
-                "name",
-                "tag"
+            "anyOf": [
+                {
+                    "required": [
+                        "day",
+                        "month",
+                        "name",
+                        "tag"
+                    ]
+                },
+                {
+                    "required": [
+                        "strtotime",
+                        "name",
+                        "tag",
+                        "common",
+                        "color",
+                        "grade"
+                    ]
+                }
             ],
             "title": "Festivity"
         },

From 3f79b058b666061b71a44b8c3bc7a710c0a25f95 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 14 May 2022 18:10:34 +0200
Subject: [PATCH 096/152] day/month and strotime mutually exclusive

---
 nations/USA/USA.json | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/nations/USA/USA.json b/nations/USA/USA.json
index 4fa55bb2..99f25a9c 100644
--- a/nations/USA/USA.json
+++ b/nations/USA/USA.json
@@ -74,9 +74,9 @@
             "Festivity": {
                 "tag": "StsJeanBrebeuf",
                 "name": "Saints John de Brébeuf and Isaac Jogues, Priests, and Companions, Martyrs",
+                "grade": 3,
                 "day": 19,
-                "month": 10,
-                "grade": 3
+                "month": 10
             },
             "Metadata": {
                 "action": "setProperty",
@@ -105,17 +105,8 @@
                     "white"
                 ],
                 "grade": 3,
-                "day": null,
-                "month": null,
-                "common": [],
-                "readings": {
-                    "FIRST_READING": "",
-                    "RESPONSORIAL_PSALM": "",
-                    "SECOND_READING": "",
-                    "ALLELUIA_VERSE": "",
-                    "GOSPEL": ""
-                },
-                "strtotime": "fourth thursday of november"
+                "strtotime": "fourth thursday of november",
+                "common": []
             },
             "Metadata": {
                 "action": "createNew",

From 5e82f30e2ca0386a8445080a5173d36a7675dff3 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 14 May 2022 18:11:49 +0200
Subject: [PATCH 097/152] day/month no longer need null cases if mutually
 exclusive with strtotime

---
 schemas/NationalCalendar.json | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index f8be2743..a6029c01 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -60,24 +60,10 @@
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
                 },
                 "day": {
-                    "oneOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Day"
                 },
                 "month": {
-                    "oneOf": [
-                        {
-                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Month"
                 },
                 "common": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"

From 4decc12dd019a11c2fb0d632df9c34298750f5fa Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 14 May 2022 18:20:52 +0200
Subject: [PATCH 098/152] make sure metadata region is always in english

---
 nations/ITALY/ITALY.json | 110 ++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 53 deletions(-)

diff --git a/nations/ITALY/ITALY.json b/nations/ITALY/ITALY.json
index 41a4abf2..ac224b40 100644
--- a/nations/ITALY/ITALY.json
+++ b/nations/ITALY/ITALY.json
@@ -1,53 +1,57 @@
-{
-    "LitCal": [
-        {
-            "Festivity": {
-                "tag": "StCatherineSiena",
-                "name": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia",
-                "color": ["white"],
-                "grade": 4,
-                "day": 29,
-                "month": 4
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1939,
-                "untilYear": 1999,
-                "decreeURL": "https://www.vatican.va/content/pius-xii/it/briefs/documents/hf_p-xii_brief_19390618_patroni-italia.html"
-            }
-        },
-        {
-            "Festivity": {
-                "tag": "StFrancisAssisi",
-                "name": "San Francesco d'Assisi, patrono d'Italia",
-                "color": ["white"],
-                "grade": 4,
-                "day": 29,
-                "month": 4
-            },
-            "Metadata": {
-                "action": "makePatron",
-                "sinceYear": 1939,
-                "decreeURL": "https://www.vatican.va/content/pius-xii/it/briefs/documents/hf_p-xii_brief_19390618_patroni-italia.html"
-            }
-        }
-    ],
-    "Settings": {
-        "Epiphany": "JAN6",
-        "Ascension": "SUNDAY",
-        "CorpusChristi": "SUNDAY",
-        "Locale": "IT"
-    },
-    "Metadata": {
-        "Region": "ITALIA",
-        "WiderRegion": {
-            "name": "Europe",
-            "jsonFile": "nations\/Europe.json",
-            "i18nFile": "nations\/EUROPE\/it.json"
-        },
-        "Missals": [
-            "ITALY_1983",
-            "ITALY_2020"
-        ]
-    }
-}
+{
+    "LitCal": [
+        {
+            "Festivity": {
+                "tag": "StCatherineSiena",
+                "name": "Santa Caterina da Siena, vergine e dottore della Chiesa, patrona d'Italia",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 29,
+                "month": 4
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1939,
+                "untilYear": 1999,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/pius-xii\/it\/briefs\/documents\/hf_p-xii_brief_19390618_patroni-italia.html"
+            }
+        },
+        {
+            "Festivity": {
+                "tag": "StFrancisAssisi",
+                "name": "San Francesco d'Assisi, patrono d'Italia",
+                "color": [
+                    "white"
+                ],
+                "grade": 4,
+                "day": 29,
+                "month": 4
+            },
+            "Metadata": {
+                "action": "makePatron",
+                "sinceYear": 1939,
+                "decreeURL": "https:\/\/www.vatican.va\/content\/pius-xii\/it\/briefs\/documents\/hf_p-xii_brief_19390618_patroni-italia.html"
+            }
+        }
+    ],
+    "Settings": {
+        "Epiphany": "JAN6",
+        "Ascension": "SUNDAY",
+        "CorpusChristi": "SUNDAY",
+        "Locale": "IT"
+    },
+    "Metadata": {
+        "Region": "ITALY",
+        "WiderRegion": {
+            "name": "Europe",
+            "jsonFile": "nations\/Europe.json",
+            "i18nFile": "nations\/EUROPE\/it.json"
+        },
+        "Missals": [
+            "ITALY_1983",
+            "ITALY_2020"
+        ]
+    }
+}

From 552eaa3a8a08e1872865b030e6006a7d2e3f2ca9 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 14 May 2022 19:19:53 +0200
Subject: [PATCH 099/152] define the only possible names for nations dots are
 switched out with underscores

---
 schemas/NationalCalendar.json | 254 +++++++++++++++++++++++++++++++++-
 1 file changed, 253 insertions(+), 1 deletion(-)

diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index a6029c01..bcbe2dde 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -142,7 +142,259 @@
             "additionalProperties": false,
             "properties": {
                 "Region": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "AFGHANISTAN",
+                        "ALBANIA",
+                        "ALGERIA",
+                        "U_S_ OUTLYING ISLANDS",
+                        "LATIN AMERICA",
+                        "ANDORRA",
+                        "ANGOLA",
+                        "ANGUILLA",
+                        "ANTIGUA & BARBUDA",
+                        "SAUDI ARABIA",
+                        "ARGENTINA",
+                        "ARMENIA",
+                        "ARUBA",
+                        "AUSTRALIA",
+                        "AUSTRIA",
+                        "AZERBAIJAN",
+                        "BAHAMAS",
+                        "BAHRAIN",
+                        "BANGLADESH",
+                        "BARBADOS",
+                        "BELGIUM",
+                        "BELIZE",
+                        "BENIN",
+                        "BERMUDA",
+                        "BHUTAN",
+                        "BELARUS",
+                        "BOLIVIA",
+                        "BOSNIA & HERZEGOVINA",
+                        "BOTSWANA",
+                        "BRAZIL",
+                        "BRUNEI",
+                        "BULGARIA",
+                        "BURKINA FASO",
+                        "BURUNDI",
+                        "CAMBODIA",
+                        "CAMEROON",
+                        "CANADA",
+                        "CAPE VERDE",
+                        "CARIBBEAN NETHERLANDS",
+                        "CZECHIA",
+                        "CEUTA & MELILLA",
+                        "CHAD",
+                        "CHILE",
+                        "CHINA",
+                        "CYPRUS",
+                        "VATICAN CITY",
+                        "COLOMBIA",
+                        "COMOROS",
+                        "CONGO - KINSHASA",
+                        "CONGO - BRAZZAVILLE",
+                        "NORTH KOREA",
+                        "SOUTH KOREA",
+                        "CÔTE D’IVOIRE",
+                        "COSTA RICA",
+                        "CROATIA",
+                        "CUBA",
+                        "CURAÇAO",
+                        "DENMARK",
+                        "DIEGO GARCIA",
+                        "DOMINICA",
+                        "ECUADOR",
+                        "EGYPT",
+                        "EL SALVADOR",
+                        "UNITED ARAB EMIRATES",
+                        "ERITREA",
+                        "ESTONIA",
+                        "ETHIOPIA",
+                        "EUROPE",
+                        "FIJI",
+                        "PHILIPPINES",
+                        "FINLAND",
+                        "FRANCE",
+                        "GABON",
+                        "GAMBIA",
+                        "GEORGIA",
+                        "GERMANY",
+                        "GHANA",
+                        "JAMAICA",
+                        "JAPAN",
+                        "GIBRALTAR",
+                        "DJIBOUTI",
+                        "JORDAN",
+                        "GREECE",
+                        "GRENADA",
+                        "GREENLAND",
+                        "GUADELOUPE",
+                        "GUAM",
+                        "GUATEMALA",
+                        "GUERNSEY",
+                        "GUINEA",
+                        "EQUATORIAL GUINEA",
+                        "GUINEA-BISSAU",
+                        "GUYANA",
+                        "FRENCH GUIANA",
+                        "HAITI",
+                        "HONDURAS",
+                        "INDIA",
+                        "INDONESIA",
+                        "IRAN",
+                        "IRAQ",
+                        "IRELAND",
+                        "ICELAND",
+                        "CHRISTMAS ISLAND",
+                        "ISLE OF MAN",
+                        "NORFOLK ISLAND",
+                        "ÅLAND ISLANDS",
+                        "CANARY ISLANDS",
+                        "CAYMAN ISLANDS",
+                        "COCOS (KEELING) ISLANDS",
+                        "COOK ISLANDS",
+                        "FAROE ISLANDS",
+                        "FALKLAND ISLANDS",
+                        "NORTHERN MARIANA ISLANDS",
+                        "MARSHALL ISLANDS",
+                        "PITCAIRN ISLANDS",
+                        "SOLOMON ISLANDS",
+                        "TURKS & CAICOS ISLANDS",
+                        "U_S_ VIRGIN ISLANDS",
+                        "BRITISH VIRGIN ISLANDS",
+                        "ISRAEL",
+                        "ITALY",
+                        "JERSEY",
+                        "KAZAKHSTAN",
+                        "KENYA",
+                        "KYRGYZSTAN",
+                        "KIRIBATI",
+                        "KOSOVO",
+                        "KUWAIT",
+                        "LAOS",
+                        "LESOTHO",
+                        "LATVIA",
+                        "LEBANON",
+                        "LIBERIA",
+                        "LIBYA",
+                        "LIECHTENSTEIN",
+                        "LITHUANIA",
+                        "LUXEMBOURG",
+                        "NORTH MACEDONIA",
+                        "MADAGASCAR",
+                        "MALAWI",
+                        "MALAYSIA",
+                        "MALI",
+                        "MALTA",
+                        "MOROCCO",
+                        "MARTINIQUE",
+                        "MAURITANIA",
+                        "MAURITIUS",
+                        "MAYOTTE",
+                        "MEXICO",
+                        "MICRONESIA",
+                        "MOLDOVA",
+                        "MONACO",
+                        "WORLD",
+                        "MONGOLIA",
+                        "MONTENEGRO",
+                        "MONTSERRAT",
+                        "MOZAMBIQUE",
+                        "MYANMAR (BURMA)",
+                        "NAMIBIA",
+                        "NAURU",
+                        "NEPAL",
+                        "NICARAGUA",
+                        "NIGER",
+                        "NIGERIA",
+                        "NIUE",
+                        "NORWAY",
+                        "NEW CALEDONIA",
+                        "NEW ZEALAND",
+                        "OMAN",
+                        "NETHERLANDS",
+                        "PAKISTAN",
+                        "PALAU",
+                        "PANAMA",
+                        "PAPUA NEW GUINEA",
+                        "PARAGUAY",
+                        "PERU",
+                        "FRENCH POLYNESIA",
+                        "POLAND",
+                        "PORTUGAL",
+                        "PUERTO RICO",
+                        "QATAR",
+                        "HONG KONG SAR CHINA",
+                        "MACAO SAR CHINA",
+                        "UNITED KINGDOM",
+                        "CENTRAL AFRICAN REPUBLIC",
+                        "DOMINICAN REPUBLIC",
+                        "RÉUNION",
+                        "ROMANIA",
+                        "RWANDA",
+                        "RUSSIA",
+                        "WESTERN SAHARA",
+                        "ST_ KITTS & NEVIS",
+                        "ST_ LUCIA",
+                        "ST_ MARTIN",
+                        "ST_ VINCENT & GRENADINES",
+                        "ST_ BARTHÉLEMY",
+                        "ST_ PIERRE & MIQUELON",
+                        "SAMOA",
+                        "AMERICAN SAMOA",
+                        "SAN MARINO",
+                        "ST_ HELENA",
+                        "SÃO TOMÉ & PRÍNCIPE",
+                        "SENEGAL",
+                        "SERBIA",
+                        "SEYCHELLES",
+                        "SIERRA LEONE",
+                        "SINGAPORE",
+                        "SINT MAARTEN",
+                        "SYRIA",
+                        "SLOVAKIA",
+                        "SLOVENIA",
+                        "SOMALIA",
+                        "SPAIN",
+                        "SRI LANKA",
+                        "UNITED STATES",
+                        "SOUTH SUDAN",
+                        "SOUTH AFRICA",
+                        "SUDAN",
+                        "SURINAME",
+                        "SVALBARD & JAN MAYEN",
+                        "SWEDEN",
+                        "SWITZERLAND",
+                        "ESWATINI",
+                        "TAJIKISTAN",
+                        "TAIWAN",
+                        "TANZANIA",
+                        "PALESTINIAN TERRITORIES",
+                        "BRITISH INDIAN OCEAN TERRITORY",
+                        "THAILAND",
+                        "TIMOR-LESTE",
+                        "TOGO",
+                        "TOKELAU",
+                        "TONGA",
+                        "TRINIDAD & TOBAGO",
+                        "TUNISIA",
+                        "TURKEY",
+                        "TURKMENISTAN",
+                        "TUVALU",
+                        "UKRAINE",
+                        "UGANDA",
+                        "HUNGARY",
+                        "URUGUAY",
+                        "UZBEKISTAN",
+                        "VANUATU",
+                        "VENEZUELA",
+                        "VIETNAM",
+                        "WALLIS & FUTUNA",
+                        "YEMEN",
+                        "ZAMBIA",
+                        "ZIMBABWE"
+                    ]
                 },
                 "WiderRegion": {
                     "$ref": "#/definitions/WiderRegion"

From 59f6d765e653d04f64786e41ad3438845df44731 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 15 May 2022 10:52:48 +0200
Subject: [PATCH 100/152] simplify saturday memorial calculation

---
 includes/LitCalAPI.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 90daf1ef..591b7d17 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1582,7 +1582,8 @@ private function calculateSaturdayMemorialBVM() : void {
         $lastSatDT = new DateTime( "last Saturday December {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
         $SatMemBVM_cnt = 0;
         while( $currentSaturday <= $lastSatDT ){
-            $currentSaturday = DateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
+            //$currentSaturday = DateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
+            $currentSaturday->modify( 'next Saturday' );
             if( $this->Cal->notInSolemnitiesFeastsOrMemorials( $currentSaturday ) ) {
                 $memID = "SatMemBVM" . ++$SatMemBVM_cnt;
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? "Memoria Sanctæ Mariæ in Sabbato" : _( "Saturday Memorial of the Blessed Virgin Mary" );

From 90ef4a39aeeac57ed3246a70217001427f38aa2f Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 15 May 2022 08:53:21 +0000
Subject: [PATCH 101/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 4abdfa75..b0566587 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -378,16 +378,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -413,20 +413,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 9f18610a14ffba99ee8c088da3fb0e1bd0d83fdf Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 15 May 2022 10:53:25 +0200
Subject: [PATCH 102/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/es/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/fr/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/it/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/la/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/pt/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 6 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 7c1d16dd..9a8e9753 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index ccc0c77f..36a8c0b1 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -383,16 +383,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -418,20 +418,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 840dbe97..d70a4df6 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 7b1bb3fe..f10de81a 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -428,18 +428,18 @@ msgstr "della %s Settimana di Pasqua"
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 "Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
 "dal file %s."
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -468,7 +468,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -477,13 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index a60493b0..75bcfef2 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -425,16 +425,16 @@ msgstr "Hebdomadæ %s Temporis Paschali"
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -462,7 +462,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -471,13 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index abac7383..c20fda4e 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-10 05:47+0000\n"
+"POT-Creation-Date: 2022-05-15 08:53+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1589
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1722
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1782
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1938
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1952
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2046
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2064
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 4d1eca213b11a8231cfa4938908cbcca617b88df Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 18 May 2022 08:17:55 +0200
Subject: [PATCH 103/152] color and common always arrays

---
 includes/Festivity.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/includes/Festivity.php b/includes/Festivity.php
index f9450286..29c9db25 100644
--- a/includes/Festivity.php
+++ b/includes/Festivity.php
@@ -2,6 +2,7 @@
 ini_set('date.timezone', 'Europe/Vatican');
 
 include_once( 'enums/LitColor.php' );
+include_once( 'enums/LitCommon.php' );
 include_once( 'enums/LitFeastType.php' );
 include_once( 'enums/LitGrade.php' );
 
@@ -12,11 +13,11 @@ class Festivity implements JsonSerializable
     public int      $idx;
     public string   $name;
     public DateTime $date;
-    public string   $color;
+    public array $color;
     public string   $type;
     public int      $grade;
     public string   $displayGrade;
-    public string   $common;  //"Proper" or specified common(s) of saints...
+    public array   $common;  //"Proper" or specified common(s) of saints...
 
     /** The following properties are not used in construction, they are only set externally */
     public ?string  $liturgicalYear = null;
@@ -26,19 +27,24 @@ class Festivity implements JsonSerializable
     public ?bool    $hasVesperII    = null;
     public ?int     $psalterWeek    = null;
 
-    function __construct(string $name, DateTime $date, string $color = '???', string $type = '???', int $grade = LitGrade::WEEKDAY, string $common = '', string $displayGrade='')
+    function __construct(string $name, DateTime $date, array $color = [ '???' ], string $type = '???', int $grade = LitGrade::WEEKDAY, array $common = [], string $displayGrade='')
     {
         $this->idx          = self::$eventIdx++;
         $this->name         = $name;
         $this->date         = $date; //DateTime object
-        $_color             = strtolower( $color );
-        //the color string can contain multiple colors separated by a pipe character, which correspond with the multiple commons to choose from for that festivity
-        $this->color        = strpos( $_color, "," ) && LitColor::areValid( explode(",", $_color) ) ? $_color : ( LitColor::isValid( $_color ) ? $_color : '???' );
+        if( is_array( $color ) && LitColor::areValid( $color ) ) {
+            $this->color = $color;
+        }
         $_type              = strtolower( $type );
         $this->type         = LitFeastType::isValid( $_type ) ? $_type : '???';
         $this->grade        = $grade >= LitGrade::WEEKDAY && $grade <= LitGrade::HIGHER_SOLEMNITY ? $grade : -1;
         $this->displayGrade = $displayGrade;
-        $this->common       = $common;
+        if( is_array( $common ) && LitCommon::areValid( $common ) ) {
+            $this->common = $common;
+        }
+        else {
+            $this->common = [];
+        }
     }
 
     /* * * * * * * * * * * * * * * * * * * * * * * * *

From bd2468839684fd6fb76cd974037d2393159ed654 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 18 May 2022 08:18:53 +0200
Subject: [PATCH 104/152] revert saturday memorial calculation

---
 includes/LitCalAPI.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 591b7d17..90daf1ef 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1582,8 +1582,7 @@ private function calculateSaturdayMemorialBVM() : void {
         $lastSatDT = new DateTime( "last Saturday December {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
         $SatMemBVM_cnt = 0;
         while( $currentSaturday <= $lastSatDT ){
-            //$currentSaturday = DateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
-            $currentSaturday->modify( 'next Saturday' );
+            $currentSaturday = DateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
             if( $this->Cal->notInSolemnitiesFeastsOrMemorials( $currentSaturday ) ) {
                 $memID = "SatMemBVM" . ++$SatMemBVM_cnt;
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? "Memoria Sanctæ Mariæ in Sabbato" : _( "Saturday Memorial of the Blessed Virgin Mary" );

From fdc81889dbe1a369786244907508611c300d4b02 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 May 2022 06:19:28 +0000
Subject: [PATCH 105/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index b0566587..8158c55e 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -378,16 +378,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -413,20 +413,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 918908416b2737757e0d41e7527876ff5a17f759 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 18 May 2022 08:19:32 +0200
Subject: [PATCH 106/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/es/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/fr/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/it/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/la/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 i18n/pt/LC_MESSAGES/litcal.po | 26 +++++++++++++-------------
 6 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 9a8e9753..c2e1b79d 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 36a8c0b1..b17ee65d 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -383,16 +383,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -418,20 +418,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index d70a4df6..408f404f 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index f10de81a..addcef39 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -428,18 +428,18 @@ msgstr "della %s Settimana di Pasqua"
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 "Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
 "dal file %s."
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -468,7 +468,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -477,13 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 75bcfef2..be8f1bb4 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -425,16 +425,16 @@ msgstr "Hebdomadæ %s Temporis Paschali"
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -462,7 +462,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -471,13 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index c20fda4e..bb21069f 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-15 08:53+0000\n"
+"POT-Creation-Date: 2022-05-18 06:19+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -380,16 +380,16 @@ msgstr ""
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1589
+#: includes/LitCalAPI.php:1588
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1614 includes/LitCalAPI.php:1617
+#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1657 includes/LitCalAPI.php:2004
+#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1722
+#: includes/LitCalAPI.php:1721
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1782
+#: includes/LitCalAPI.php:1781
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1901
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1938
+#: includes/LitCalAPI.php:1937
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1952
+#: includes/LitCalAPI.php:1951
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2046
+#: includes/LitCalAPI.php:2045
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2064
+#: includes/LitCalAPI.php:2063
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From e86ccdace21b6545a2f5c6ea6328ddafe849ba39 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Wed, 18 May 2022 08:21:32 +0200
Subject: [PATCH 107/152] more tolerance in constructing festivity object:
 allow color to be string

---
 includes/Festivity.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/includes/Festivity.php b/includes/Festivity.php
index 29c9db25..2c890d83 100644
--- a/includes/Festivity.php
+++ b/includes/Festivity.php
@@ -13,11 +13,11 @@ class Festivity implements JsonSerializable
     public int      $idx;
     public string   $name;
     public DateTime $date;
-    public array $color;
+    public string|array $color;
     public string   $type;
     public int      $grade;
     public string   $displayGrade;
-    public array   $common;  //"Proper" or specified common(s) of saints...
+    public string|array   $common;  //"Proper" or specified common(s) of saints...
 
     /** The following properties are not used in construction, they are only set externally */
     public ?string  $liturgicalYear = null;
@@ -27,19 +27,26 @@ class Festivity implements JsonSerializable
     public ?bool    $hasVesperII    = null;
     public ?int     $psalterWeek    = null;
 
-    function __construct(string $name, DateTime $date, array $color = [ '???' ], string $type = '???', int $grade = LitGrade::WEEKDAY, array $common = [], string $displayGrade='')
+    function __construct(string $name, DateTime $date, string|array $color = '???', string $type = '???', int $grade = LitGrade::WEEKDAY, string|array $common = [], string $displayGrade='')
     {
         $this->idx          = self::$eventIdx++;
         $this->name         = $name;
         $this->date         = $date; //DateTime object
         if( is_array( $color ) && LitColor::areValid( $color ) ) {
             $this->color = $color;
+        } else {
+            $_color             = strtolower( $color );
+            //the color string can contain multiple colors separated by a comma, when there are multiple commons to choose from for that festivity
+            $this->color        = strpos( $_color, "," ) && LitColor::areValid( explode(",", $_color) ) ? explode(",", $_color) : ( LitColor::isValid( $_color ) ? [ $_color ] : [ '???' ] );
         }
         $_type              = strtolower( $type );
         $this->type         = LitFeastType::isValid( $_type ) ? $_type : '???';
         $this->grade        = $grade >= LitGrade::WEEKDAY && $grade <= LitGrade::HIGHER_SOLEMNITY ? $grade : -1;
         $this->displayGrade = $displayGrade;
-        if( is_array( $common ) && LitCommon::areValid( $common ) ) {
+        if( is_string( $common ) ) {
+            $this->common       = strpos( $common, "," ) && LitCommon::areValid( explode(",", $common) ) ? explode(",", $common) : ( LitCommon::isValid( $common ) ? [ $common ] : [ '???' ] );
+        }
+        else if( is_array( $common ) && LitCommon::areValid( $common ) ) {
             $this->common = $common;
         }
         else {

From 54500104b1276c826796542919c53b86fb32c4e6 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Thu, 19 May 2022 07:46:02 +0200
Subject: [PATCH 108/152] comment out unused AB method

make sure all LitCommon methods allow for arrays
---
 includes/Festivity.php       |  2 +-
 includes/enums/LitCommon.php | 28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/includes/Festivity.php b/includes/Festivity.php
index 2c890d83..7409305e 100644
--- a/includes/Festivity.php
+++ b/includes/Festivity.php
@@ -44,7 +44,7 @@ function __construct(string $name, DateTime $date, string|array $color = '???',
         $this->grade        = $grade >= LitGrade::WEEKDAY && $grade <= LitGrade::HIGHER_SOLEMNITY ? $grade : -1;
         $this->displayGrade = $displayGrade;
         if( is_string( $common ) ) {
-            $this->common       = strpos( $common, "," ) && LitCommon::areValid( explode(",", $common) ) ? explode(",", $common) : ( LitCommon::isValid( $common ) ? [ $common ] : [ '???' ] );
+            $this->common       = LitCommon::areValid( explode(",", $common) ) ? explode(",", $common) : [ '???' ];
         }
         else if( is_array( $common ) && LitCommon::areValid( $common ) ) {
             $this->common = $common;
diff --git a/includes/enums/LitCommon.php b/includes/enums/LitCommon.php
index 676daa58..83d47fda 100644
--- a/includes/enums/LitCommon.php
+++ b/includes/enums/LitCommon.php
@@ -272,6 +272,7 @@ public static function areValid( array $values ) {
         return empty( array_diff( $values, self::$values ) );
     }
 
+    /*
     public static function AB( string|array $value ) : string {
         if( is_array( $value ) ) {
             $mapped = array_map('self::AB', $value);
@@ -291,9 +292,13 @@ public static function AB( string|array $value ) : string {
             }
         }
     }
+    */
 
-    public function i18n( string $value ) : string {
-        if( self::isValid( $value ) ) {
+    public function i18n( string|array $value ) : string|array {
+        if( is_array( $value ) && self::areValid( $value ) ) {
+            return array_map( [$this, 'i18n'], $value );
+        }
+        else if( self::isValid( $value ) ) {
             if( $this->locale === LitLocale::LATIN ) {
                 return self::LATIN[ $value ];
             } else{
@@ -303,7 +308,10 @@ public function i18n( string $value ) : string {
         return $value;
     }
 
-    public function getPossessive( string $value ) : string {
+    public function getPossessive( string|array $value ) : string|array {
+        if( is_array( $value ) ) {
+            return array_map( [$this, 'getPossessive'], $value );
+        }
         return $this->locale === LitLocale::LATIN ? "" : self::POSSESSIVE( $value );
     }
 
@@ -311,12 +319,16 @@ public function getPossessive( string $value ) : string {
      * Function C
      * Returns a translated human readable string of the Common or the Proper
      */
-    public function C( string $common="" ) : string {
-        if ($common !== "") {
-            if( $common === LitCommon::PROPRIO ) {
+    public function C( string|array $common="" ) : string|array {
+        if ( ( is_string( $common ) && $common !== "" ) || is_array( $common ) ) {
+            if( (is_string( $common ) && $common === LitCommon::PROPRIO) || ( is_array( $common ) && in_array( LitCommon::PROPRIO, $common ) ) ) {
                 $common = $this->i18n( $common );
-            } else{
-                $commons = explode(",", $common);
+            } else {
+                if( is_string( $common ) ) {
+                    $commons = explode(",", $common);
+                } else {
+                    $commons = $common;
+                }
                 $commons = array_map(function ($txt) {
                     if( strpos($txt, ":") !== false ){
                         [$commonGeneral, $commonSpecific] = explode(":", $txt);

From 31d7cfea1c692fed6b199d840327aad7b33f1edd Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 05:46:29 +0000
Subject: [PATCH 109/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 8158c55e..41c90d9c 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -469,7 +469,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr ""
 

From ce9029aea431e43aadb3537ba54f27f5c8607908 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 19 May 2022 07:46:34 +0200
Subject: [PATCH 110/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 6 +++---
 i18n/es/LC_MESSAGES/litcal.po | 6 +++---
 i18n/fr/LC_MESSAGES/litcal.po | 6 +++---
 i18n/it/LC_MESSAGES/litcal.po | 6 +++---
 i18n/la/LC_MESSAGES/litcal.po | 6 +++---
 i18n/pt/LC_MESSAGES/litcal.po | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index c2e1b79d..59ecef2d 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index b17ee65d..696f7202 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -474,7 +474,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 408f404f..ba09af3d 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index addcef39..11cd3a2a 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -540,7 +540,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr "oppure"
 
@@ -817,7 +817,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr "del"
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr "Dal Comune"
 
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index be8f1bb4..dc252ac3 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -533,7 +533,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr "vel"
 
@@ -802,7 +802,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr "De Commune"
 
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index bb21069f..cc8f34b3 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 06:19+0000\n"
+"POT-Creation-Date: 2022-05-19 05:46+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:331
+#: includes/enums/LitCommon.php:343
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:327
+#: includes/enums/LitCommon.php:339
 msgid "From the Common"
 msgstr ""
 

From e2c1f6c71b5fbda4757ecd8cef82dda5c570d8f7 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 01:31:32 +0200
Subject: [PATCH 111/152] fix areValid method for LitCommon take into account
 that commons will often contain a colon!

---
 includes/Festivity.php       | 36 ++++++++++++++++++++++++------------
 includes/LitCalAPI.php       |  9 ++++++++-
 includes/enums/LitCommon.php |  9 ++++++---
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/includes/Festivity.php b/includes/Festivity.php
index 7409305e..b495afbe 100644
--- a/includes/Festivity.php
+++ b/includes/Festivity.php
@@ -13,11 +13,11 @@ class Festivity implements JsonSerializable
     public int      $idx;
     public string   $name;
     public DateTime $date;
-    public string|array $color;
+    public array    $color;
     public string   $type;
     public int      $grade;
     public string   $displayGrade;
-    public string|array   $common;  //"Proper" or specified common(s) of saints...
+    public array    $common;  //"Proper" or specified common(s) of saints...
 
     /** The following properties are not used in construction, they are only set externally */
     public ?string  $liturgicalYear = null;
@@ -27,14 +27,17 @@ class Festivity implements JsonSerializable
     public ?bool    $hasVesperII    = null;
     public ?int     $psalterWeek    = null;
 
-    function __construct(string $name, DateTime $date, string|array $color = '???', string $type = '???', int $grade = LitGrade::WEEKDAY, string|array $common = [], string $displayGrade='')
+    function __construct(string $name, DateTime $date, string|array $color = [ '???' ], string $type = '???', int $grade = LitGrade::WEEKDAY, string|array $common = [ '???' ], string $displayGrade='')
     {
         $this->idx          = self::$eventIdx++;
         $this->name         = $name;
         $this->date         = $date; //DateTime object
-        if( is_array( $color ) && LitColor::areValid( $color ) ) {
-            $this->color = $color;
-        } else {
+        if( is_array( $color ) ) {
+            if( LitColor::areValid( $color ) ) {
+                $this->color = $color;
+            }
+        }
+        else if ( is_string( $color ) ) {
             $_color             = strtolower( $color );
             //the color string can contain multiple colors separated by a comma, when there are multiple commons to choose from for that festivity
             $this->color        = strpos( $_color, "," ) && LitColor::areValid( explode(",", $_color) ) ? explode(",", $_color) : ( LitColor::isValid( $_color ) ? [ $_color ] : [ '???' ] );
@@ -43,17 +46,26 @@ function __construct(string $name, DateTime $date, string|array $color = '???',
         $this->type         = LitFeastType::isValid( $_type ) ? $_type : '???';
         $this->grade        = $grade >= LitGrade::WEEKDAY && $grade <= LitGrade::HIGHER_SOLEMNITY ? $grade : -1;
         $this->displayGrade = $displayGrade;
+        //Festivity::debugWrite( "*** Festivity.php *** common vartype = " . gettype( $common ) );
         if( is_string( $common ) ) {
-            $this->common       = LitCommon::areValid( explode(",", $common) ) ? explode(",", $common) : [ '???' ];
-        }
-        else if( is_array( $common ) && LitCommon::areValid( $common ) ) {
-            $this->common = $common;
+            //Festivity::debugWrite( "*** Festivity.php *** common vartype is string, value = $common" );
+            $this->common       = LitCommon::areValid( explode(",", $common) ) ? explode(",", $common) : [];
         }
-        else {
-            $this->common = [];
+        else if( is_array( $common ) ) {
+            //Festivity::debugWrite( "*** Festivity.php *** common vartype is array, value = " . implode( ', ', $common ) );
+            if( LitCommon::areValid( $common ) ) {
+                $this->common = $common;
+            } else {
+                //Festivity::debugWrite( "*** Festivity.php *** common values have not passed the validity test!" );
+                $this->common = [];
+            }
         }
     }
 
+    private static function debugWrite( string $string ) {
+        file_put_contents( "debug.log", $string . PHP_EOL, FILE_APPEND );
+    }
+
     /* * * * * * * * * * * * * * * * * * * * * * * * *
      * Funzione statica di comparazione
      * in vista dell'ordinamento di un array di oggetti Festivity
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 90daf1ef..8fbd5654 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -52,6 +52,10 @@ public function __construct(){
         $this->CacheDuration                        = "_" . CacheDuration::MONTH . date( "m" );
     }
 
+    private static function debugWrite( string $string ) {
+        file_put_contents( "debug.log", $string . PHP_EOL, FILE_APPEND );
+    }
+
     private function initParameterData() {
         if ( $this->APICore->getRequestContentType() === RequestContentType::JSON ) {
             $json = file_get_contents( 'php://input' );
@@ -509,7 +513,7 @@ private function calculateFixedSolemnities() : void {
         foreach( $tempCalSolemnities as $row ) {
             $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $tempFestivity = new Festivity( $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
-
+            //LitCalAPI::debugWrite( "adding new fixed solemnity '$row->NAME', common vartype = " . gettype( $row->COMMON ) . ", common = " . implode(', ', $row->COMMON) );
             //A Solemnity impeded in any given year is transferred to the nearest day following designated in nn. 1-8 of the Tables given above ( LY 60 )
             //However if a solemnity is impeded by a Sunday of Advent, Lent or Easter Time, the solemnity is transferred to the Monday following,
             //or to the nearest free day, as laid down by the General Norms.
@@ -887,6 +891,9 @@ private function calculateMemorials( int $grade = LitGrade::MEMORIAL, string $mi
             $row->DATE = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             if ( self::DateIsNotSunday( $row->DATE ) && $this->Cal->notInSolemnitiesFeastsOrMemorials( $row->DATE ) ) {
                 $newFestivity = new Festivity( $row->NAME, $row->DATE, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
+                //LitCalAPI::debugWrite( "adding new memorial '$row->NAME', common vartype = " . gettype( $row->COMMON ) . ", common = " . implode(', ', $row->COMMON) );
+                //LitCalAPI::debugWrite( ">>> added new memorial '$newFestivity->name', common vartype = " . gettype( $newFestivity->common ) . ", common = " . implode(', ', $newFestivity->common) );
+
                 $this->Cal->addFestivity( $row->TAG, $newFestivity );
 
                 $this->reduceMemorialsInAdventLentToCommemoration( $row->DATE, $row );
diff --git a/includes/enums/LitCommon.php b/includes/enums/LitCommon.php
index 83d47fda..d8cab7a3 100644
--- a/includes/enums/LitCommon.php
+++ b/includes/enums/LitCommon.php
@@ -162,7 +162,7 @@ public function __construct( string $locale ) {
         self::PRO_SANCTIS_MULIERIBUS                => "Pro sanctis mulieribus"
     ];
 
-    public static function POSSESSIVE( string $value ) : string {
+    private static function POSSESSIVE( string $value ) : string {
         switch( $value ) {
             case "Blessed Virgin Mary":
                 /**translators: (singular feminine) glue between "From the Common" and the actual common. Latin: leave empty! */
@@ -269,6 +269,9 @@ public static function isValid( string $value ) {
     }
 
     public static function areValid( array $values ) {
+        $values = array_reduce($values, function( $carry, $key ){
+            return strpos($key, ':') ? array_merge( explode(':', $key), $carry ) : array_merge( [ $key ], $carry );
+        }, [] );
         return empty( array_diff( $values, self::$values ) );
     }
 
@@ -294,7 +297,7 @@ public static function AB( string|array $value ) : string {
     }
     */
 
-    public function i18n( string|array $value ) : string|array {
+    private function i18n( string|array $value ) : string|array {
         if( is_array( $value ) && self::areValid( $value ) ) {
             return array_map( [$this, 'i18n'], $value );
         }
@@ -308,7 +311,7 @@ public function i18n( string|array $value ) : string|array {
         return $value;
     }
 
-    public function getPossessive( string|array $value ) : string|array {
+    private function getPossessive( string|array $value ) : string|array {
         if( is_array( $value ) ) {
             return array_map( [$this, 'getPossessive'], $value );
         }

From abf6919f9165516314c5fa1332a1d631334c3be0 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 23:32:57 +0000
Subject: [PATCH 112/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 124 ++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 41c90d9c..83b87e4b 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,106 +17,106 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -144,15 +144,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -163,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -178,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -216,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -229,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -263,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -278,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -291,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -329,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -351,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -359,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -368,26 +368,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -413,20 +413,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -469,7 +469,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr ""
 

From 1b71cf847a440371506f9f235e15e09c51b2751c Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 20 May 2022 01:33:02 +0200
Subject: [PATCH 113/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 i18n/es/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 i18n/fr/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 i18n/it/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 i18n/la/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 i18n/pt/LC_MESSAGES/litcal.po | 124 +++++++++++++++++-----------------
 6 files changed, 372 insertions(+), 372 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 59ecef2d..fe9c9da9 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 696f7202..5c24be06 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,28 +27,28 @@ msgid ""
 msgstr ""
 "Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s día antes de la Epifanía"
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s día después de la Epifanía"
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -57,71 +57,71 @@ msgstr ""
 "La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
 "celebración ha sido trasladada a %s (%s) según el %s."
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr "Sábado anterior al Domingo de Ramos"
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -149,15 +149,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -168,7 +168,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -183,12 +183,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -221,7 +221,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -234,14 +234,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -268,7 +268,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -283,7 +283,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -296,14 +296,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -317,7 +317,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -334,21 +334,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -356,7 +356,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -364,7 +364,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -373,26 +373,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -418,20 +418,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -474,7 +474,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index ba09af3d..be8b856b 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr ""
 
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 11cd3a2a..ed6f5822 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -28,28 +28,28 @@ msgstr ""
 "Sono supportati anni dal 1970 in poi soltanto. Tu invece hai provato a "
 "richiedere l'anno %d."
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per il santorale di: %s."
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per la traduzione del santorale di: %s."
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s giorno prima dell'Epifania"
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s giorno dopo l'Epifania"
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -58,30 +58,30 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
 "celebrazione è stata trasferita al %s (%s) in accordo con il %s."
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabato che precede la Domenica delle Palme"
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "lunedì che segue la Seconda Domenica di Pasqua"
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr "lunedì seguente"
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -90,7 +90,7 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -99,7 +99,7 @@ msgstr ""
 "Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
 "nell'anno %d, la prima è stata anticipata di un giorno come da %s."
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -108,27 +108,27 @@ msgstr ""
 "'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
 "viene celebrata il %s anziché la Domenica dopo Natale."
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "della %s Settimana dell'Avvento"
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "%s Giorno dell'Ottava di Natale"
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "della %s Settimana di Quaresima"
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr "dopo il Mercoledì delle Ceneri"
 
@@ -156,8 +156,8 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -166,7 +166,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -179,7 +179,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -197,12 +197,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "La %1$s '%2$s' è soppiantata dalla %3$s '%4$s' nell'anno %5$d."
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr "Costituzione Apostolica Missale Romanum"
 
@@ -217,7 +217,7 @@ msgstr "Costituzione Apostolica Missale Romanum"
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -238,7 +238,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -253,7 +253,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -262,7 +262,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -274,7 +274,7 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -291,7 +291,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -308,7 +308,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -323,7 +323,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -332,7 +332,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -346,7 +346,7 @@ msgstr "e Dottore della Chiesa"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -365,7 +365,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -374,7 +374,7 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -383,7 +383,7 @@ msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -394,7 +394,7 @@ msgstr ""
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -405,7 +405,7 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -418,28 +418,28 @@ msgstr ""
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 "Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
 "dal file %s."
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -468,7 +468,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -477,13 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
@@ -540,7 +540,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr "oppure"
 
@@ -817,7 +817,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr "del"
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr "Dal Comune"
 
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index dc252ac3..9861541e 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,28 +27,28 @@ msgid ""
 msgstr ""
 "Petere potes nisi ab annis MCMLXX et ultra. Tu anno %d conatus est petere."
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "Dies %s ante Epiphaniam"
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "Dies %s post Epiphaniam"
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -57,30 +57,30 @@ msgstr ""
 "Coincidet enim Sollemnitas <i>'%s'</i> cum <b>%s</b> in anno %d, ergo "
 "traslata est celebratio ad %s (%s) secundum %s."
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabbatum ante Dominicam in Palmis"
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "diem Lunæ post Dominicam Secundam Paschæ"
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr "diem Lunæ proximum"
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -89,7 +89,7 @@ msgstr ""
 "Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in anno %d. "
 "Oportet quaerere a Congregatione Cultu Divino quid facere!"
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -98,7 +98,7 @@ msgstr ""
 "Ex causa Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in "
 "anno %d, anticipata est ab uno die secundum %s."
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -107,27 +107,27 @@ msgstr ""
 "'%s' coincidet cum Dominica in anno %d, ergo Festum <i>'%s'</i> celebrentur "
 "die %s quam Dominica post Nativitate."
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "Hebdomadæ %s Adventus"
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "Dies %s Octavæ Nativitatis"
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "Hebdomadæ %s Quadragesimæ"
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr "post Feria IV Cinerum"
 
@@ -155,8 +155,8 @@ msgstr "post Feria IV Cinerum"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -165,7 +165,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -176,7 +176,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -194,12 +194,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "%1$s '%2$s' subplantata est ab %3$s '%4$s' in anno %5$d."
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -234,7 +234,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -249,7 +249,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -258,7 +258,7 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum (%4$s)."
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -270,7 +270,7 @@ msgstr "dies Lunae post Pentecostem"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -287,7 +287,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -304,7 +304,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -319,7 +319,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -328,7 +328,7 @@ msgstr ""
 "'%1$s' declarato/a est Doctor Ecclesiæ ab anno %2$d, ergo applicatur ad anno "
 "%3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -344,7 +344,7 @@ msgstr "Dedicationis ecclesiæ"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -363,7 +363,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -372,7 +372,7 @@ msgstr ""
 "In anno %1$d, %2$s '%3$s' subplantata est ad %4$s '%5$s', aggregata in die "
 "%6$s ab anno %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -381,7 +381,7 @@ msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -392,7 +392,7 @@ msgstr ""
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -403,7 +403,7 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -415,26 +415,26 @@ msgstr ""
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -462,7 +462,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -471,13 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
@@ -533,7 +533,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr "vel"
 
@@ -802,7 +802,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr "De Commune"
 
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index cc8f34b3..8d9123c6 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 05:46+0000\n"
+"POT-Creation-Date: 2022-05-19 23:32+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:224
+#: includes/LitCalAPI.php:228
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:259
+#: includes/LitCalAPI.php:263
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:265
+#: includes/LitCalAPI.php:269
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:341 includes/LitCalAPI.php:380
+#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:355 includes/LitCalAPI.php:393
+#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:545 includes/LitCalAPI.php:561
-#: includes/LitCalAPI.php:587
+#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:591
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:549
+#: includes/LitCalAPI.php:553
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:554 includes/LitCalAPI.php:570
-#: includes/LitCalAPI.php:596 includes/LitCalAPI.php:624
-#: includes/LitCalAPI.php:910 includes/LitCalAPI.php:1029
-#: includes/LitCalAPI.php:1085 includes/LitCalAPI.php:1244
-#: includes/LitCalAPI.php:1289 includes/LitCalAPI.php:1316
-#: includes/LitCalAPI.php:1425 includes/LitCalAPI.php:1437
-#: includes/LitCalAPI.php:1452 includes/LitCalAPI.php:1478
+#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
+#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
+#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
+#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
+#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
+#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
+#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
 #: includes/FestivityCollection.php:357
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:565
+#: includes/LitCalAPI.php:569
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:595
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:602
+#: includes/LitCalAPI.php:606
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:620
+#: includes/LitCalAPI.php:624
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:688
+#: includes/LitCalAPI.php:692
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:722 includes/LitCalAPI.php:746
+#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:799
+#: includes/LitCalAPI.php:803
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:816
+#: includes/LitCalAPI.php:820
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:840
+#: includes/LitCalAPI.php:844
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:849
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:865 includes/LitCalAPI.php:1123
-#: includes/LitCalAPI.php:1300 includes/LitCalAPI.php:1822
+#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:896 includes/LitCalAPI.php:988
+#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:942
+#: includes/LitCalAPI.php:949
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:964
+#: includes/LitCalAPI.php:971
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:984
+#: includes/LitCalAPI.php:991
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1006
+#: includes/LitCalAPI.php:1013
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1042
+#: includes/LitCalAPI.php:1049
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1081
+#: includes/LitCalAPI.php:1088
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1102
+#: includes/LitCalAPI.php:1109
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1158
+#: includes/LitCalAPI.php:1165
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1180
+#: includes/LitCalAPI.php:1187
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1190
+#: includes/LitCalAPI.php:1197
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1224
+#: includes/LitCalAPI.php:1231
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1239
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1337
+#: includes/LitCalAPI.php:1344
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1365
+#: includes/LitCalAPI.php:1372
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1423
+#: includes/LitCalAPI.php:1430
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1435
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1450
+#: includes/LitCalAPI.php:1457
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1476
+#: includes/LitCalAPI.php:1483
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1500
+#: includes/LitCalAPI.php:1507
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1536 includes/LitCalAPI.php:1565
+#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1588
+#: includes/LitCalAPI.php:1595
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1613 includes/LitCalAPI.php:1616
+#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1630
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1656 includes/LitCalAPI.php:2003
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1721
+#: includes/LitCalAPI.php:1728
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1781
+#: includes/LitCalAPI.php:1788
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1901
+#: includes/LitCalAPI.php:1908
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1937
+#: includes/LitCalAPI.php:1944
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1951
+#: includes/LitCalAPI.php:1958
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2045
+#: includes/LitCalAPI.php:2052
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2063
+#: includes/LitCalAPI.php:2070
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -471,7 +471,7 @@ msgstr ""
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153
-#: includes/enums/LitCommon.php:343
+#: includes/enums/LitCommon.php:346
 msgid "or"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgctxt "(SING_MASC)"
 msgid "of"
 msgstr ""
 
-#: includes/enums/LitCommon.php:339
+#: includes/enums/LitCommon.php:342
 msgid "From the Common"
 msgstr ""
 

From fcb11085ca5c7f3bf82b5dc36808e2e57b4cbbdb Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 01:43:37 +0200
Subject: [PATCH 114/152] optimize with spread operator I hope at least! not
 like I did benchmarking

---
 includes/enums/LitCommon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/enums/LitCommon.php b/includes/enums/LitCommon.php
index d8cab7a3..7eb99e3f 100644
--- a/includes/enums/LitCommon.php
+++ b/includes/enums/LitCommon.php
@@ -270,7 +270,7 @@ public static function isValid( string $value ) {
 
     public static function areValid( array $values ) {
         $values = array_reduce($values, function( $carry, $key ){
-            return strpos($key, ':') ? array_merge( explode(':', $key), $carry ) : array_merge( [ $key ], $carry );
+            return strpos($key, ':') ? ( $carry + explode(':', $key) ) : ( [ ...$carry, $key ] );
         }, [] );
         return empty( array_diff( $values, self::$values ) );
     }

From 445d22c865709f5621f1b4a3098d8471109650e0 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 02:12:05 +0200
Subject: [PATCH 115/152] don't convert $color/$common from array to string

---
 includes/LitCalAPI.php | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 8fbd5654..8786262e 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1716,7 +1716,7 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
                     $this->Cal->setProperty( $key, "grade", LitGrade::MEMORIAL_OPT );
                     $coincidingMemorialName = $value->name;
                 }
-                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, implode(',', $row->Festivity->color), LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, implode(',', $row->Festivity->common) );
+                $festivity = new Festivity( $row->Festivity->name, $row->Festivity->DATE, $row->Festivity->color, LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, $row->Festivity->common );
                 $this->Cal->addFestivity( $row->Festivity->tag, $festivity );
                 $this->Messages[] = sprintf(
                     /**translators:
@@ -1788,12 +1788,6 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
             $this->Messages[] = _( 'We should be creating a new festivity, however we do not seem to have the correct date information in order to proceed' ) . ' :: ' . $a;
             return;
         }
-        if( is_array( $row->Festivity->color ) ) {
-            $row->Festivity->color = implode(",", $row->Festivity->color);
-        }
-        if( is_array( $row->Festivity->common ) ) {
-            $row->Festivity->common = implode(",", $row->Festivity->common);
-        }
         if( $this->festivityCanBeCreated( $row ) ) {
             if( $this->festivityDoesNotCoincide( $row ) ) {
                 if( !property_exists( $row->Festivity, 'type' ) || !LitFeastType::isValid( $row->Festivity->type ) ) {
@@ -1910,12 +1904,6 @@ private function applyNationalCalendar() : void {
                             );
                             $this->loadPropriumDeSanctisData( $missal );
                             foreach ( $this->tempCal[ $missal ] as $row ) {
-                                if( is_array( $row->COLOR ) ) {
-                                    $row->COLOR = implode(',', $row->COLOR);
-                                }
-                                if( is_array( $row->COMMON ) ) {
-                                    $row->COMMON = implode(',', $row->COMMON);
-                                }
                                 $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                                 if( !$this->Cal->inSolemnitiesOrFeasts( $currentFeastDate ) ) {
                                     $festivity = new Festivity( "[ {$this->NationalData->Metadata->Region} ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
@@ -1992,9 +1980,6 @@ private function makePatron( string $tag, string $nameSuffix, int $day, int $mon
                     $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
                 } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
                     //we should probably be able to create it anyways in this case?
-                    if( is_array( $color ) ) {
-                        $color = implode(",", $color);
-                    }
                     $this->Cal->addFestivity( $tag, new Festivity( $FestivityName, $currentFeastDate, $color, LitFeastType::FIXED, LitGrade::FEAST, LitCommon::PROPRIO ) );
                     $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
                 }
@@ -2198,12 +2183,6 @@ private function calculateUniversalCalendar() : void {
 
     private function applyDiocesanCalendar() {
         foreach( $this->DiocesanData->LitCal as $key => $obj ) {
-            if( is_array( $obj->color ) ) {
-                $obj->color = implode( ',', $obj->color );
-            }
-            if( is_array( $obj->common ) ) {
-                $obj->common = implode( ',', $obj->common );
-            }
             //if sinceYear is undefined or null or empty, let's go ahead and create the event in any case
             //creation will be restricted only if explicitly defined by the sinceYear property
             if( $this->LitSettings->Year >= $obj->sinceYear || $obj->sinceYear === null || $obj->sinceYear === 0 ) {

From 91720e44da939dcd4416d1bcba6c2a870fa37191 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 00:12:36 +0000
Subject: [PATCH 116/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 83b87e4b..43bb6409 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -426,7 +426,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 3c0a6b477d13fc0130332d995985a1b81cf60026 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 20 May 2022 02:12:40 +0200
Subject: [PATCH 117/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 16 ++++++++--------
 i18n/es/LC_MESSAGES/litcal.po | 16 ++++++++--------
 i18n/fr/LC_MESSAGES/litcal.po | 16 ++++++++--------
 i18n/it/LC_MESSAGES/litcal.po | 16 ++++++++--------
 i18n/la/LC_MESSAGES/litcal.po | 16 ++++++++--------
 i18n/pt/LC_MESSAGES/litcal.po | 16 ++++++++--------
 6 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index fe9c9da9..12459006 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -428,7 +428,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 5c24be06..11b0f020 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -431,7 +431,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index be8b856b..526aff32 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -428,7 +428,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index ed6f5822..da35890d 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -483,7 +483,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 9861541e..0a556073 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -477,7 +477,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 8d9123c6..088a51e6 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-19 23:32+0000\n"
+"POT-Creation-Date: 2022-05-20 00:12+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1829
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:2010
+#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -428,7 +428,7 @@ msgid ""
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1908
+#: includes/LitCalAPI.php:1902
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1944
+#: includes/LitCalAPI.php:1932
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1958
+#: includes/LitCalAPI.php:1946
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2052
+#: includes/LitCalAPI.php:2037
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2070
+#: includes/LitCalAPI.php:2055
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 21f254090b4be79fef871ca02fb9c7fb4b2f5ebb Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 15:39:17 +0200
Subject: [PATCH 118/152] create LitCalHealth check

---
 LitCalHealth.php                              | 152 +++++++++
 LitCalRegionalData.php                        |   2 -
 .../memorialsFromDecrees.json                 |   4 +-
 includes/enums/LitSchema.php                  |   6 +-
 schemas/CommonDef.json                        | 297 ++++++++++++++++++
 schemas/LitCalMetadata.json                   | 135 ++++++++
 schemas/NationalCalendar.json                 | 254 +--------------
 schemas/PropriumDeTempore.json                |  25 ++
 8 files changed, 617 insertions(+), 258 deletions(-)
 create mode 100644 LitCalHealth.php
 create mode 100644 schemas/LitCalMetadata.json
 create mode 100644 schemas/PropriumDeTempore.json

diff --git a/LitCalHealth.php b/LitCalHealth.php
new file mode 100644
index 00000000..86d9714d
--- /dev/null
+++ b/LitCalHealth.php
@@ -0,0 +1,152 @@
+<?php
+error_reporting(E_ALL);
+ini_set("display_errors", 1);
+
+include_once( 'includes/enums/AcceptHeader.php' );
+include_once( 'includes/enums/LitSchema.php' );
+include_once( 'includes/enums/RequestMethod.php' );
+include_once( 'includes/enums/RequestContentType.php' );
+include_once( 'includes/enums/ReturnType.php' );
+include_once( 'includes/APICore.php' );
+include_once( 'vendor/autoload.php' );
+
+use Swaggest\JsonSchema\Schema;
+
+if( file_exists("allowedOrigins.php") ) {
+    include_once( 'allowedOrigins.php' );
+}
+
+$allowedOrigins = [
+    "https://johnromanodorazio.com",
+    "https://www.johnromanodorazio.com",
+    "https://litcal.johnromanodorazio.com",
+    "https://litcal-staging.johnromanodorazio.com"
+];
+
+if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
+    $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
+}
+
+$LitCalHealth = new LitCalHealth();
+
+$LitCalHealth->APICore->setAllowedOrigins( $allowedOrigins );
+$LitCalHealth->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
+
+$LitCalHealth->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
+$LitCalHealth->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
+$LitCalHealth->APICore->setAllowedRequestMethods( [ RequestMethod::GET, RequestMethod::POST, RequestMethod::OPTIONS ] );
+$LitCalHealth->Init();
+
+
+class LitCalHealth {
+
+    const DataSchema = [
+        "data/memorialsFromDecrees/memorialsFromDecrees.json"       => LitSchema::DECREEMEMORIALS,
+        "data/propriumdesanctis_1970/propriumdesanctis_1970.json"   => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_2002/propriumdesanctis_2002.json"   => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_2008/propriumdesanctis_2008.json"   => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json"   => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json"       => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdetempore.json"                                           => LitSchema::PROPRIUMDETEMPORE,
+        "nations/index.json"                                        => LitSchema::INDEX,
+        "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php" => LitSchema::METADATA
+    ];
+
+    public APICore $APICore;
+    //private array $MESSAGES                         = [];
+
+    public function __construct(){
+        $this->APICore                              = new APICore();
+        $this->RESPONSE                             = new stdClass();
+        $this->RESPONSE->requestHeadersReceived     = $this->APICore->getJsonEncodedRequestHeaders();
+    }
+
+    private function executeValidations() {
+        $result = new stdClass();
+        $result->messages = [];
+        foreach( LitCalHealth::DataSchema as $dataPath => $schema ) {
+            $message = new stdClass();
+            $data = file_get_contents( $dataPath );
+            if( $data !== false ) {
+                $message->type = "success";
+                $message->text = "Data file $dataPath exists";
+                $result->messages = $message;
+
+                $jsonData = json_decode( $data );
+                if( json_last_error() === JSON_ERROR_NONE ) {
+                    $message->type = "success";
+                    $message->text = "The Data file $dataPath was successfully decoded as JSON";
+                    $result->messages = $message;
+
+                    if( $this->validateDataAgainstSchema( $jsonData, $schema ) ) {
+                        $message->type = "success";
+                        $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
+                        $result->messages = $message;
+                    }
+                } else {
+                    $message->type = "error";
+                    $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
+                    $result->messages = $message;
+                }
+
+            } else {
+                $message->type = "error";
+                $message->text = "Data file $dataPath does not exist";
+                $result->messages = $message;
+            }
+        }
+        die( json_encode( $result ) );
+    }
+
+    private function validateDataAgainstSchema( object|array $data, string $schemaUrl ) : bool {
+        $result = new stdClass();
+        $schema = Schema::import( $schemaUrl );
+        try {
+            $validation = $schema->in($data);
+            return true;
+        } catch (Exception $e) {
+            $result->error = LitSchema::ERROR_MESSAGES[ $schemaUrl ] . PHP_EOL . $e->getMessage();
+            header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
+            die( json_encode( $result ) );
+        }
+    }
+
+    private function handleRequestedMethod() {
+        switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
+            case RequestMethod::GET:
+                $this->handleGetPostRequests( $_GET );
+                break;
+            case RequestMethod::POST:
+                $this->handleGetPostRequests( $_POST );
+                break;
+            case RequestMethod::OPTIONS:
+                //continue;
+                break;
+            default:
+                header( $_SERVER[ "SERVER_PROTOCOL" ]." 405 Method Not Allowed", true, 405 );
+                $errorMessage = '{"error":"You seem to be forming a strange kind of request? Allowed Request Methods are ';
+                $errorMessage .= implode( ' and ', $this->AllowedRequestMethods );
+                $errorMessage .= ', but your Request Method was ' . strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) . '"}';
+                die( $errorMessage );
+        }
+    }
+
+    private function handleGetPostRequests( array $REQUEST ) {
+
+        $this->APICore->validateAcceptHeader( true );
+        if( $this->APICore->getRequestContentType() === 'application/json' ) {
+            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
+        } else {
+            $this->DATA = (object)$REQUEST;
+        }
+        $this->executeValidations();
+    }
+
+
+    public function Init() {
+        $this->APICore->Init();
+        $this->APICore->setResponseContentTypeHeader();
+        $this->handleRequestedMethod();
+    }
+
+}
\ No newline at end of file
diff --git a/LitCalRegionalData.php b/LitCalRegionalData.php
index bb0289f4..1319217d 100644
--- a/LitCalRegionalData.php
+++ b/LitCalRegionalData.php
@@ -1,6 +1,4 @@
 <?php
-error_reporting( E_ALL );
-ini_set( 'display_errors', 1 );
 
 include_once( 'includes/enums/AcceptHeader.php' );
 include_once( 'includes/enums/LitSchema.php' );
diff --git a/data/memorialsFromDecrees/memorialsFromDecrees.json b/data/memorialsFromDecrees/memorialsFromDecrees.json
index ead73359..2dc98197 100644
--- a/data/memorialsFromDecrees/memorialsFromDecrees.json
+++ b/data/memorialsFromDecrees/memorialsFromDecrees.json
@@ -2,11 +2,11 @@
     {
         "Festivity": {
             "TAG": "StMaryMagdalene",
-            "GRADE": 4,
-            "sinceYear": 2016
+            "GRADE": 4
         },
         "Metadata": {
             "action": "setProperty",
+            "sinceYear": 2016,
             "property": "grade",
             "decreeURL": "http://www.vatican.va/roman_curia/congregations/ccdds/documents/articolo-roche-maddalena_%s.pdf",
             "decreeLangs": {
diff --git a/includes/enums/LitSchema.php b/includes/enums/LitSchema.php
index 99142319..0190d739 100644
--- a/includes/enums/LitSchema.php
+++ b/includes/enums/LitSchema.php
@@ -6,18 +6,22 @@ class LitSchema {
     const DIOCESAN          = "https://litcal.org/api/dev/schemas/DiocesanCalendar.json";
     const NATIONAL          = "https://litcal.org/api/dev/schemas/NationalCalendar.json";
     const PROPRIUMDESANCTIS = "https://litcal.org/api/dev/schemas/PropriumDeSanctis.json";
+    const PROPRIUMDETEMPORE = "https://litcal.org/api/dev/schemas/PropriumDeTempore.json";
     const WIDERREGION       = "https://litcal.org/api/dev/schemas/WiderRegionCalendar.json";
     const DECREEMEMORIALS   = "https://litcal.org/api/dev/schemas/MemorialsFromDecrees.json";
     const I18N              = "https://litcal.org/api/dev/schemas/LitCalTranslation.json";
+    const METADATA          = "https://litcal.org/api/dev/schemas/LitCalMetadata.json";
 
     const ERROR_MESSAGES = [
         LitSchema::INDEX             => "Schema validation error: Index not updated",
         LitSchema::DIOCESAN          => "Schema validation error: Diocesan Calendar not created / updated",
         LitSchema::NATIONAL          => "Schema validation error: National Calendar not created / updated",
         LitSchema::PROPRIUMDESANCTIS => "Schema validation error: Proprium de Sanctis data not created / updated",
+        LitSchema::PROPRIUMDETEMPORE => "Schema validation error: Proprium de Tempore data not created / updated",
         LitSchema::WIDERREGION       => "Schema validation error: Wider Region data not created / updated",
         LitSchema::DECREEMEMORIALS   => "Schema validation error: Memorials from Decrees data not created / updated",
-        LitSchema::I18N              => "Schema validation error: Translation data not created / updated"
+        LitSchema::I18N              => "Schema validation error: Translation data not created / updated",
+        LitSchema::METADATA          => "Schema validation error: LitCalMetadata not valid"
     ];
 
 }
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index cef7477b..40f2d4c5 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -267,14 +267,311 @@
                 "$ref": "#/definitions/Missal"
             }
         },
+        "MissalDef": {
+            "type": "string",
+            "enum": [
+                "EDITIO_TYPICA_1970",
+                "REIMPRESSIO_EMENDATA_1971",
+                "EDITIO_TYPICA_SECUNDA_1975",
+                "EDITIO_TYPICA_TERTIA_2002",
+                "EDITIO_TYPICA_TERTIA_EMENDATA_2008",
+                "USA_EDITION_2011",
+                "ITALY_EDITION_1983",
+                "ITALY_EDITION_2020"
+            ]
+        },
         "Missal": {
             "type": "string",
             "enum": [
+                "VATICAN_1970",
+                "VATICAN_1971",
+                "VATICAN_1975",
+                "VATICAN_2002",
+                "VATICAN_2008",
                 "USA_2011",
                 "ITALY_1983",
                 "ITALY_2020"
             ]
         },
+        "MissalName": {
+            "type": "string",
+            "enum": [
+                "Editio Typica 1970",
+                "Reimpressio Emendata 1971",
+                "Editio Typica Secunda 1975",
+                "Editio Typica Tertia 2002",
+                "Editio Typica Tertia Emendata 2008",
+                "2011 Roman Missal issued by the USCCB",
+                "Messale Romano ed. 1983 pubblicata dalla CEI",
+                "Messale Romano ed. 2020 pubblicata dalla CEI"
+            ]
+        },
+        "MissalFileName": {
+            "type": [ "string", "boolean" ],
+            "enum": [
+                "data/propriumdesanctis_1970/propriumdesanctis_1970.json",
+                "data/propriumdesanctis_2002/propriumdesanctis_2002.json",
+                "data/propriumdesanctis_2008/propriumdesanctis_2008.json",
+                "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json",
+                "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json",
+                false
+            ]
+        },
+        "Region": {
+            "type": "string",
+            "enum": [
+                "AFGHANISTAN",
+                "ALBANIA",
+                "ALGERIA",
+                "U_S_ OUTLYING ISLANDS",
+                "LATIN AMERICA",
+                "ANDORRA",
+                "ANGOLA",
+                "ANGUILLA",
+                "ANTIGUA & BARBUDA",
+                "SAUDI ARABIA",
+                "ARGENTINA",
+                "ARMENIA",
+                "ARUBA",
+                "AUSTRALIA",
+                "AUSTRIA",
+                "AZERBAIJAN",
+                "BAHAMAS",
+                "BAHRAIN",
+                "BANGLADESH",
+                "BARBADOS",
+                "BELGIUM",
+                "BELIZE",
+                "BENIN",
+                "BERMUDA",
+                "BHUTAN",
+                "BELARUS",
+                "BOLIVIA",
+                "BOSNIA & HERZEGOVINA",
+                "BOTSWANA",
+                "BRAZIL",
+                "BRUNEI",
+                "BULGARIA",
+                "BURKINA FASO",
+                "BURUNDI",
+                "CAMBODIA",
+                "CAMEROON",
+                "CANADA",
+                "CAPE VERDE",
+                "CARIBBEAN NETHERLANDS",
+                "CZECHIA",
+                "CEUTA & MELILLA",
+                "CHAD",
+                "CHILE",
+                "CHINA",
+                "CYPRUS",
+                "VATICAN CITY",
+                "COLOMBIA",
+                "COMOROS",
+                "CONGO - KINSHASA",
+                "CONGO - BRAZZAVILLE",
+                "NORTH KOREA",
+                "SOUTH KOREA",
+                "CÔTE D’IVOIRE",
+                "COSTA RICA",
+                "CROATIA",
+                "CUBA",
+                "CURAÇAO",
+                "DENMARK",
+                "DIEGO GARCIA",
+                "DOMINICA",
+                "ECUADOR",
+                "EGYPT",
+                "EL SALVADOR",
+                "UNITED ARAB EMIRATES",
+                "ERITREA",
+                "ESTONIA",
+                "ETHIOPIA",
+                "EUROPE",
+                "FIJI",
+                "PHILIPPINES",
+                "FINLAND",
+                "FRANCE",
+                "GABON",
+                "GAMBIA",
+                "GEORGIA",
+                "GERMANY",
+                "GHANA",
+                "JAMAICA",
+                "JAPAN",
+                "GIBRALTAR",
+                "DJIBOUTI",
+                "JORDAN",
+                "GREECE",
+                "GRENADA",
+                "GREENLAND",
+                "GUADELOUPE",
+                "GUAM",
+                "GUATEMALA",
+                "GUERNSEY",
+                "GUINEA",
+                "EQUATORIAL GUINEA",
+                "GUINEA-BISSAU",
+                "GUYANA",
+                "FRENCH GUIANA",
+                "HAITI",
+                "HONDURAS",
+                "INDIA",
+                "INDONESIA",
+                "IRAN",
+                "IRAQ",
+                "IRELAND",
+                "ICELAND",
+                "CHRISTMAS ISLAND",
+                "ISLE OF MAN",
+                "NORFOLK ISLAND",
+                "ÅLAND ISLANDS",
+                "CANARY ISLANDS",
+                "CAYMAN ISLANDS",
+                "COCOS (KEELING) ISLANDS",
+                "COOK ISLANDS",
+                "FAROE ISLANDS",
+                "FALKLAND ISLANDS",
+                "NORTHERN MARIANA ISLANDS",
+                "MARSHALL ISLANDS",
+                "PITCAIRN ISLANDS",
+                "SOLOMON ISLANDS",
+                "TURKS & CAICOS ISLANDS",
+                "U_S_ VIRGIN ISLANDS",
+                "BRITISH VIRGIN ISLANDS",
+                "ISRAEL",
+                "ITALY",
+                "JERSEY",
+                "KAZAKHSTAN",
+                "KENYA",
+                "KYRGYZSTAN",
+                "KIRIBATI",
+                "KOSOVO",
+                "KUWAIT",
+                "LAOS",
+                "LESOTHO",
+                "LATVIA",
+                "LEBANON",
+                "LIBERIA",
+                "LIBYA",
+                "LIECHTENSTEIN",
+                "LITHUANIA",
+                "LUXEMBOURG",
+                "NORTH MACEDONIA",
+                "MADAGASCAR",
+                "MALAWI",
+                "MALAYSIA",
+                "MALI",
+                "MALTA",
+                "MOROCCO",
+                "MARTINIQUE",
+                "MAURITANIA",
+                "MAURITIUS",
+                "MAYOTTE",
+                "MEXICO",
+                "MICRONESIA",
+                "MOLDOVA",
+                "MONACO",
+                "WORLD",
+                "MONGOLIA",
+                "MONTENEGRO",
+                "MONTSERRAT",
+                "MOZAMBIQUE",
+                "MYANMAR (BURMA)",
+                "NAMIBIA",
+                "NAURU",
+                "NEPAL",
+                "NICARAGUA",
+                "NIGER",
+                "NIGERIA",
+                "NIUE",
+                "NORWAY",
+                "NEW CALEDONIA",
+                "NEW ZEALAND",
+                "OMAN",
+                "NETHERLANDS",
+                "PAKISTAN",
+                "PALAU",
+                "PANAMA",
+                "PAPUA NEW GUINEA",
+                "PARAGUAY",
+                "PERU",
+                "FRENCH POLYNESIA",
+                "POLAND",
+                "PORTUGAL",
+                "PUERTO RICO",
+                "QATAR",
+                "HONG KONG SAR CHINA",
+                "MACAO SAR CHINA",
+                "UNITED KINGDOM",
+                "CENTRAL AFRICAN REPUBLIC",
+                "DOMINICAN REPUBLIC",
+                "RÉUNION",
+                "ROMANIA",
+                "RWANDA",
+                "RUSSIA",
+                "WESTERN SAHARA",
+                "ST_ KITTS & NEVIS",
+                "ST_ LUCIA",
+                "ST_ MARTIN",
+                "ST_ VINCENT & GRENADINES",
+                "ST_ BARTHÉLEMY",
+                "ST_ PIERRE & MIQUELON",
+                "SAMOA",
+                "AMERICAN SAMOA",
+                "SAN MARINO",
+                "ST_ HELENA",
+                "SÃO TOMÉ & PRÍNCIPE",
+                "SENEGAL",
+                "SERBIA",
+                "SEYCHELLES",
+                "SIERRA LEONE",
+                "SINGAPORE",
+                "SINT MAARTEN",
+                "SYRIA",
+                "SLOVAKIA",
+                "SLOVENIA",
+                "SOMALIA",
+                "SPAIN",
+                "SRI LANKA",
+                "UNITED STATES",
+                "SOUTH SUDAN",
+                "SOUTH AFRICA",
+                "SUDAN",
+                "SURINAME",
+                "SVALBARD & JAN MAYEN",
+                "SWEDEN",
+                "SWITZERLAND",
+                "ESWATINI",
+                "TAJIKISTAN",
+                "TAIWAN",
+                "TANZANIA",
+                "PALESTINIAN TERRITORIES",
+                "BRITISH INDIAN OCEAN TERRITORY",
+                "THAILAND",
+                "TIMOR-LESTE",
+                "TOGO",
+                "TOKELAU",
+                "TONGA",
+                "TRINIDAD & TOBAGO",
+                "TUNISIA",
+                "TURKEY",
+                "TURKMENISTAN",
+                "TUVALU",
+                "UKRAINE",
+                "UGANDA",
+                "HUNGARY",
+                "URUGUAY",
+                "UZBEKISTAN",
+                "VANUATU",
+                "VENEZUELA",
+                "VIETNAM",
+                "WALLIS & FUTUNA",
+                "YEMEN",
+                "ZAMBIA",
+                "ZIMBABWE"
+            ]
+        },
         "MemorialFromDecreesAction": {
             "type": "string",
             "enum": [
diff --git a/schemas/LitCalMetadata.json b/schemas/LitCalMetadata.json
new file mode 100644
index 00000000..a4d8bc89
--- /dev/null
+++ b/schemas/LitCalMetadata.json
@@ -0,0 +1,135 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "items": {
+        "$ref": "#/definitions/LitCalMetadata"
+    },
+    "definitions": {
+        "LitCalMetadata": {
+            "type": "object",
+            "properties": {
+                "LitCalMetadata": {
+                    "type": "object",
+                    "properties": {
+                        "NationalCalendars": {
+                            "type": "object",
+                            "propertyNames": {
+                                "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                            },
+                            "patternProperties": {
+                                "": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                              }
+                        },
+                        "DiocesanCalendars": {
+                            "type": "object",
+                            "patternProperties": {
+                                "": {
+                                    "type": "object",
+                                    "properties": {
+                                        "nation": {
+                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                                        },
+                                        "diocese": {
+                                            "type": "string"
+                                        },
+                                        "group": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "nation",
+                                        "diocese"
+                                    ]
+                                }
+                              }
+                        },
+                        "DiocesanGroups": {
+                            "type": "object",
+                            "patternProperties": {
+                                "": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        },
+                        "WiderRegions": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "enum": [
+                                    "Africa",
+                                    "Alsace",
+                                    "Americas",
+                                    "Anatolia",
+                                    "Antarctica",
+                                    "Asia",
+                                    "Australasia",
+                                    "Central Africa",
+                                    "Central America",
+                                    "Europe",
+                                    "Indies",
+                                    "North Africa",
+                                    "Oceania",
+                                    "Scandinavia",
+                                    "South America",
+                                    "West Indies"
+                                ]
+                            }
+                        },
+                        "RomanMissals": {
+                            "type": "object",
+                            "propertyNames": {
+                                "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalDef"
+                            },
+                            "patternProperties": {
+                                "": {
+                                    "type": "object",
+                                    "properties": {
+                                        "value": {
+                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
+                                        },
+                                        "name": {
+                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalName"
+                                        },
+                                        "sanctoraleFileName": {
+                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalFileName"
+                                        },
+                                        "yearLimits": {
+                                            "type": "object",
+                                            "properties": {
+                                                "sinceYear": {
+                                                    "type": "integer"
+                                                },
+                                                "untilYear": {
+                                                    "type": "integer"
+                                                }
+                                            },
+                                            "required": [ "sinceYear" ]
+                                        }
+                                    },
+                                    "required": [
+                                        "value",
+                                        "name",
+                                        "sanctoraleFileName",
+                                        "yearLimits"
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "required": [
+                "LitCalMetadata"
+            ],
+            "title": "LitCalMetadata"
+        }
+    }
+}
diff --git a/schemas/NationalCalendar.json b/schemas/NationalCalendar.json
index bcbe2dde..903da89e 100644
--- a/schemas/NationalCalendar.json
+++ b/schemas/NationalCalendar.json
@@ -142,259 +142,7 @@
             "additionalProperties": false,
             "properties": {
                 "Region": {
-                    "type": "string",
-                    "enum": [
-                        "AFGHANISTAN",
-                        "ALBANIA",
-                        "ALGERIA",
-                        "U_S_ OUTLYING ISLANDS",
-                        "LATIN AMERICA",
-                        "ANDORRA",
-                        "ANGOLA",
-                        "ANGUILLA",
-                        "ANTIGUA & BARBUDA",
-                        "SAUDI ARABIA",
-                        "ARGENTINA",
-                        "ARMENIA",
-                        "ARUBA",
-                        "AUSTRALIA",
-                        "AUSTRIA",
-                        "AZERBAIJAN",
-                        "BAHAMAS",
-                        "BAHRAIN",
-                        "BANGLADESH",
-                        "BARBADOS",
-                        "BELGIUM",
-                        "BELIZE",
-                        "BENIN",
-                        "BERMUDA",
-                        "BHUTAN",
-                        "BELARUS",
-                        "BOLIVIA",
-                        "BOSNIA & HERZEGOVINA",
-                        "BOTSWANA",
-                        "BRAZIL",
-                        "BRUNEI",
-                        "BULGARIA",
-                        "BURKINA FASO",
-                        "BURUNDI",
-                        "CAMBODIA",
-                        "CAMEROON",
-                        "CANADA",
-                        "CAPE VERDE",
-                        "CARIBBEAN NETHERLANDS",
-                        "CZECHIA",
-                        "CEUTA & MELILLA",
-                        "CHAD",
-                        "CHILE",
-                        "CHINA",
-                        "CYPRUS",
-                        "VATICAN CITY",
-                        "COLOMBIA",
-                        "COMOROS",
-                        "CONGO - KINSHASA",
-                        "CONGO - BRAZZAVILLE",
-                        "NORTH KOREA",
-                        "SOUTH KOREA",
-                        "CÔTE D’IVOIRE",
-                        "COSTA RICA",
-                        "CROATIA",
-                        "CUBA",
-                        "CURAÇAO",
-                        "DENMARK",
-                        "DIEGO GARCIA",
-                        "DOMINICA",
-                        "ECUADOR",
-                        "EGYPT",
-                        "EL SALVADOR",
-                        "UNITED ARAB EMIRATES",
-                        "ERITREA",
-                        "ESTONIA",
-                        "ETHIOPIA",
-                        "EUROPE",
-                        "FIJI",
-                        "PHILIPPINES",
-                        "FINLAND",
-                        "FRANCE",
-                        "GABON",
-                        "GAMBIA",
-                        "GEORGIA",
-                        "GERMANY",
-                        "GHANA",
-                        "JAMAICA",
-                        "JAPAN",
-                        "GIBRALTAR",
-                        "DJIBOUTI",
-                        "JORDAN",
-                        "GREECE",
-                        "GRENADA",
-                        "GREENLAND",
-                        "GUADELOUPE",
-                        "GUAM",
-                        "GUATEMALA",
-                        "GUERNSEY",
-                        "GUINEA",
-                        "EQUATORIAL GUINEA",
-                        "GUINEA-BISSAU",
-                        "GUYANA",
-                        "FRENCH GUIANA",
-                        "HAITI",
-                        "HONDURAS",
-                        "INDIA",
-                        "INDONESIA",
-                        "IRAN",
-                        "IRAQ",
-                        "IRELAND",
-                        "ICELAND",
-                        "CHRISTMAS ISLAND",
-                        "ISLE OF MAN",
-                        "NORFOLK ISLAND",
-                        "ÅLAND ISLANDS",
-                        "CANARY ISLANDS",
-                        "CAYMAN ISLANDS",
-                        "COCOS (KEELING) ISLANDS",
-                        "COOK ISLANDS",
-                        "FAROE ISLANDS",
-                        "FALKLAND ISLANDS",
-                        "NORTHERN MARIANA ISLANDS",
-                        "MARSHALL ISLANDS",
-                        "PITCAIRN ISLANDS",
-                        "SOLOMON ISLANDS",
-                        "TURKS & CAICOS ISLANDS",
-                        "U_S_ VIRGIN ISLANDS",
-                        "BRITISH VIRGIN ISLANDS",
-                        "ISRAEL",
-                        "ITALY",
-                        "JERSEY",
-                        "KAZAKHSTAN",
-                        "KENYA",
-                        "KYRGYZSTAN",
-                        "KIRIBATI",
-                        "KOSOVO",
-                        "KUWAIT",
-                        "LAOS",
-                        "LESOTHO",
-                        "LATVIA",
-                        "LEBANON",
-                        "LIBERIA",
-                        "LIBYA",
-                        "LIECHTENSTEIN",
-                        "LITHUANIA",
-                        "LUXEMBOURG",
-                        "NORTH MACEDONIA",
-                        "MADAGASCAR",
-                        "MALAWI",
-                        "MALAYSIA",
-                        "MALI",
-                        "MALTA",
-                        "MOROCCO",
-                        "MARTINIQUE",
-                        "MAURITANIA",
-                        "MAURITIUS",
-                        "MAYOTTE",
-                        "MEXICO",
-                        "MICRONESIA",
-                        "MOLDOVA",
-                        "MONACO",
-                        "WORLD",
-                        "MONGOLIA",
-                        "MONTENEGRO",
-                        "MONTSERRAT",
-                        "MOZAMBIQUE",
-                        "MYANMAR (BURMA)",
-                        "NAMIBIA",
-                        "NAURU",
-                        "NEPAL",
-                        "NICARAGUA",
-                        "NIGER",
-                        "NIGERIA",
-                        "NIUE",
-                        "NORWAY",
-                        "NEW CALEDONIA",
-                        "NEW ZEALAND",
-                        "OMAN",
-                        "NETHERLANDS",
-                        "PAKISTAN",
-                        "PALAU",
-                        "PANAMA",
-                        "PAPUA NEW GUINEA",
-                        "PARAGUAY",
-                        "PERU",
-                        "FRENCH POLYNESIA",
-                        "POLAND",
-                        "PORTUGAL",
-                        "PUERTO RICO",
-                        "QATAR",
-                        "HONG KONG SAR CHINA",
-                        "MACAO SAR CHINA",
-                        "UNITED KINGDOM",
-                        "CENTRAL AFRICAN REPUBLIC",
-                        "DOMINICAN REPUBLIC",
-                        "RÉUNION",
-                        "ROMANIA",
-                        "RWANDA",
-                        "RUSSIA",
-                        "WESTERN SAHARA",
-                        "ST_ KITTS & NEVIS",
-                        "ST_ LUCIA",
-                        "ST_ MARTIN",
-                        "ST_ VINCENT & GRENADINES",
-                        "ST_ BARTHÉLEMY",
-                        "ST_ PIERRE & MIQUELON",
-                        "SAMOA",
-                        "AMERICAN SAMOA",
-                        "SAN MARINO",
-                        "ST_ HELENA",
-                        "SÃO TOMÉ & PRÍNCIPE",
-                        "SENEGAL",
-                        "SERBIA",
-                        "SEYCHELLES",
-                        "SIERRA LEONE",
-                        "SINGAPORE",
-                        "SINT MAARTEN",
-                        "SYRIA",
-                        "SLOVAKIA",
-                        "SLOVENIA",
-                        "SOMALIA",
-                        "SPAIN",
-                        "SRI LANKA",
-                        "UNITED STATES",
-                        "SOUTH SUDAN",
-                        "SOUTH AFRICA",
-                        "SUDAN",
-                        "SURINAME",
-                        "SVALBARD & JAN MAYEN",
-                        "SWEDEN",
-                        "SWITZERLAND",
-                        "ESWATINI",
-                        "TAJIKISTAN",
-                        "TAIWAN",
-                        "TANZANIA",
-                        "PALESTINIAN TERRITORIES",
-                        "BRITISH INDIAN OCEAN TERRITORY",
-                        "THAILAND",
-                        "TIMOR-LESTE",
-                        "TOGO",
-                        "TOKELAU",
-                        "TONGA",
-                        "TRINIDAD & TOBAGO",
-                        "TUNISIA",
-                        "TURKEY",
-                        "TURKMENISTAN",
-                        "TUVALU",
-                        "UKRAINE",
-                        "UGANDA",
-                        "HUNGARY",
-                        "URUGUAY",
-                        "UZBEKISTAN",
-                        "VANUATU",
-                        "VENEZUELA",
-                        "VIETNAM",
-                        "WALLIS & FUTUNA",
-                        "YEMEN",
-                        "ZAMBIA",
-                        "ZIMBABWE"
-                    ]
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
                 },
                 "WiderRegion": {
                     "$ref": "#/definitions/WiderRegion"
diff --git a/schemas/PropriumDeTempore.json b/schemas/PropriumDeTempore.json
new file mode 100644
index 00000000..50013dbe
--- /dev/null
+++ b/schemas/PropriumDeTempore.json
@@ -0,0 +1,25 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "items": {
+        "$ref": "#/definitions/PropriumDeTempore"
+    },
+    "definitions": {
+        "PropriumDeTempore": {
+            "type": "object",
+            "additionalProperties": true,
+            "required": [
+                "READINGS"
+            ],
+            "title": "PropriumDeTempore"
+        },
+        "LitEvent": {
+            "type": "object",
+            "properties": {
+                "READINGS": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
+                }
+            }
+        }
+    }
+}

From f6823001940c4fb2b7bc8ad84c26073cc031c1ae Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 15:48:57 +0200
Subject: [PATCH 119/152] propriumdetempore schema obj not array

---
 schemas/PropriumDeTempore.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/schemas/PropriumDeTempore.json b/schemas/PropriumDeTempore.json
index 50013dbe..daa9f8ff 100644
--- a/schemas/PropriumDeTempore.json
+++ b/schemas/PropriumDeTempore.json
@@ -1,9 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "type": "array",
-    "items": {
-        "$ref": "#/definitions/PropriumDeTempore"
-    },
+    "type": "object",
+    "$ref": "#/definitions/PropriumDeTempore",
     "definitions": {
         "PropriumDeTempore": {
             "type": "object",

From b48bb7274b3dd436ad22fb2187724cec3e665319 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 16:12:16 +0200
Subject: [PATCH 120/152] fix propriumdetempore schema required READINGS in
 wrong place

---
 schemas/PropriumDeTempore.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/schemas/PropriumDeTempore.json b/schemas/PropriumDeTempore.json
index daa9f8ff..05fb1bf1 100644
--- a/schemas/PropriumDeTempore.json
+++ b/schemas/PropriumDeTempore.json
@@ -5,10 +5,9 @@
     "definitions": {
         "PropriumDeTempore": {
             "type": "object",
-            "additionalProperties": true,
-            "required": [
-                "READINGS"
-            ],
+            "additionalProperties": {
+                "$ref": "#/definitions/LitEvent"
+            },
             "title": "PropriumDeTempore"
         },
         "LitEvent": {
@@ -17,7 +16,10 @@
                 "READINGS": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
                 }
-            }
+            },
+            "required": [
+                "READINGS"
+            ]
         }
     }
 }

From 289f4c2caf21de6b646b699d6a2e7ae5af054fe1 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 20:04:28 +0200
Subject: [PATCH 121/152] fix LitCalMetadata schema: obj not array

---
 schemas/LitCalMetadata.json | 215 ++++++++++++++++++------------------
 1 file changed, 106 insertions(+), 109 deletions(-)

diff --git a/schemas/LitCalMetadata.json b/schemas/LitCalMetadata.json
index a4d8bc89..c085099c 100644
--- a/schemas/LitCalMetadata.json
+++ b/schemas/LitCalMetadata.json
@@ -1,135 +1,132 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "type": "array",
-    "items": {
-        "$ref": "#/definitions/LitCalMetadata"
+    "type": "object",
+    "properties": {
+        "LitCalMetadata": {
+            "$ref": "#/definitions/LitCalMetadata"
+        }
     },
+    "required": [
+        "LitCalMetadata"
+    ],
+    "title": "LitCalMetadata",
     "definitions": {
         "LitCalMetadata": {
             "type": "object",
             "properties": {
-                "LitCalMetadata": {
+                "NationalCalendars": {
                     "type": "object",
-                    "properties": {
-                        "NationalCalendars": {
-                            "type": "object",
-                            "propertyNames": {
-                                "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
-                            },
-                            "patternProperties": {
-                                "": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                }
-                              }
-                        },
-                        "DiocesanCalendars": {
-                            "type": "object",
-                            "patternProperties": {
-                                "": {
-                                    "type": "object",
-                                    "properties": {
-                                        "nation": {
-                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
-                                        },
-                                        "diocese": {
-                                            "type": "string"
-                                        },
-                                        "group": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "required": [
-                                        "nation",
-                                        "diocese"
-                                    ]
-                                }
-                              }
-                        },
-                        "DiocesanGroups": {
+                    "propertyNames": {
+                        "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                    },
+                    "patternProperties": {
+                        "": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                        }
+                },
+                "DiocesanCalendars": {
+                    "type": "object",
+                    "patternProperties": {
+                        "": {
                             "type": "object",
-                            "patternProperties": {
-                                "": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
-                                    }
+                            "properties": {
+                                "nation": {
+                                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                                },
+                                "diocese": {
+                                    "type": "string"
+                                },
+                                "group": {
+                                    "type": "string"
                                 }
-                            }
-                        },
-                        "WiderRegions": {
+                            },
+                            "required": [
+                                "nation",
+                                "diocese"
+                            ]
+                        }
+                        }
+                },
+                "DiocesanGroups": {
+                    "type": "object",
+                    "patternProperties": {
+                        "": {
                             "type": "array",
                             "items": {
-                                "type": "string",
-                                "enum": [
-                                    "Africa",
-                                    "Alsace",
-                                    "Americas",
-                                    "Anatolia",
-                                    "Antarctica",
-                                    "Asia",
-                                    "Australasia",
-                                    "Central Africa",
-                                    "Central America",
-                                    "Europe",
-                                    "Indies",
-                                    "North Africa",
-                                    "Oceania",
-                                    "Scandinavia",
-                                    "South America",
-                                    "West Indies"
-                                ]
+                                "type": "string"
                             }
-                        },
-                        "RomanMissals": {
+                        }
+                    }
+                },
+                "WiderRegions": {
+                    "type": "array",
+                    "items": {
+                        "type": "string",
+                        "enum": [
+                            "Africa",
+                            "Alsace",
+                            "Americas",
+                            "Anatolia",
+                            "Antarctica",
+                            "Asia",
+                            "Australasia",
+                            "Central Africa",
+                            "Central America",
+                            "Europe",
+                            "Indies",
+                            "North Africa",
+                            "Oceania",
+                            "Scandinavia",
+                            "South America",
+                            "West Indies"
+                        ]
+                    }
+                },
+                "RomanMissals": {
+                    "type": "object",
+                    "propertyNames": {
+                        "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalDef"
+                    },
+                    "patternProperties": {
+                        "": {
                             "type": "object",
-                            "propertyNames": {
-                                "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalDef"
-                            },
-                            "patternProperties": {
-                                "": {
+                            "properties": {
+                                "value": {
+                                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
+                                },
+                                "name": {
+                                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalName"
+                                },
+                                "sanctoraleFileName": {
+                                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalFileName"
+                                },
+                                "yearLimits": {
                                     "type": "object",
                                     "properties": {
-                                        "value": {
-                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
+                                        "sinceYear": {
+                                            "type": "integer"
                                         },
-                                        "name": {
-                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalName"
-                                        },
-                                        "sanctoraleFileName": {
-                                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/MissalFileName"
-                                        },
-                                        "yearLimits": {
-                                            "type": "object",
-                                            "properties": {
-                                                "sinceYear": {
-                                                    "type": "integer"
-                                                },
-                                                "untilYear": {
-                                                    "type": "integer"
-                                                }
-                                            },
-                                            "required": [ "sinceYear" ]
+                                        "untilYear": {
+                                            "type": "integer"
                                         }
                                     },
-                                    "required": [
-                                        "value",
-                                        "name",
-                                        "sanctoraleFileName",
-                                        "yearLimits"
-                                    ]
+                                    "required": [ "sinceYear" ]
                                 }
-                            }
+                            },
+                            "required": [
+                                "value",
+                                "name",
+                                "sanctoraleFileName",
+                                "yearLimits"
+                            ]
                         }
                     }
                 }
-            },
-            "required": [
-                "LitCalMetadata"
-            ],
-            "title": "LitCalMetadata"
+            }
         }
     }
 }

From 1245cfcaf9b2014a3cdc63c9d021bd09a2525e31 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 20:30:56 +0200
Subject: [PATCH 122/152] order nation names

---
 schemas/CommonDef.json | 110 +++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 54 deletions(-)

diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 40f2d4c5..5138306f 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -321,15 +321,14 @@
             "type": "string",
             "enum": [
                 "AFGHANISTAN",
+                "ÅLAND ISLANDS",
                 "ALBANIA",
                 "ALGERIA",
-                "U_S_ OUTLYING ISLANDS",
-                "LATIN AMERICA",
+                "AMERICAN SAMOA",
                 "ANDORRA",
                 "ANGOLA",
                 "ANGUILLA",
                 "ANTIGUA & BARBUDA",
-                "SAUDI ARABIA",
                 "ARGENTINA",
                 "ARMENIA",
                 "ARUBA",
@@ -350,6 +349,8 @@
                 "BOSNIA & HERZEGOVINA",
                 "BOTSWANA",
                 "BRAZIL",
+                "BRITISH INDIAN OCEAN TERRITORY",
+                "BRITISH VIRGIN ISLANDS",
                 "BRUNEI",
                 "BULGARIA",
                 "BURKINA FASO",
@@ -357,51 +358,56 @@
                 "CAMBODIA",
                 "CAMEROON",
                 "CANADA",
+                "CANARY ISLANDS",
+                "CAYMAN ISLANDS",
                 "CAPE VERDE",
                 "CARIBBEAN NETHERLANDS",
-                "CZECHIA",
+                "CENTRAL AFRICAN REPUBLIC",
                 "CEUTA & MELILLA",
                 "CHAD",
                 "CHILE",
                 "CHINA",
-                "CYPRUS",
-                "VATICAN CITY",
+                "CHRISTMAS ISLAND",
+                "COCOS (KEELING) ISLANDS",
                 "COLOMBIA",
                 "COMOROS",
-                "CONGO - KINSHASA",
                 "CONGO - BRAZZAVILLE",
-                "NORTH KOREA",
-                "SOUTH KOREA",
-                "CÔTE D’IVOIRE",
+                "CONGO - KINSHASA",
+                "COOK ISLANDS",
+                "CYPRUS",
+                "CZECHIA",
                 "COSTA RICA",
+                "CÔTE D’IVOIRE",
                 "CROATIA",
                 "CUBA",
                 "CURAÇAO",
                 "DENMARK",
                 "DIEGO GARCIA",
+                "DJIBOUTI",
                 "DOMINICA",
+                "DOMINICAN REPUBLIC",
                 "ECUADOR",
                 "EGYPT",
                 "EL SALVADOR",
-                "UNITED ARAB EMIRATES",
+                "EQUATORIAL GUINEA",
+                "ESWATINI",
                 "ERITREA",
                 "ESTONIA",
                 "ETHIOPIA",
                 "EUROPE",
+                "FAROE ISLANDS",
+                "FALKLAND ISLANDS",
                 "FIJI",
-                "PHILIPPINES",
                 "FINLAND",
+                "FRENCH POLYNESIA",
                 "FRANCE",
+                "FRENCH GUIANA",
                 "GABON",
                 "GAMBIA",
                 "GEORGIA",
                 "GERMANY",
                 "GHANA",
-                "JAMAICA",
-                "JAPAN",
                 "GIBRALTAR",
-                "DJIBOUTI",
-                "JORDAN",
                 "GREECE",
                 "GRENADA",
                 "GREENLAND",
@@ -410,44 +416,32 @@
                 "GUATEMALA",
                 "GUERNSEY",
                 "GUINEA",
-                "EQUATORIAL GUINEA",
                 "GUINEA-BISSAU",
                 "GUYANA",
-                "FRENCH GUIANA",
                 "HAITI",
                 "HONDURAS",
+                "HONG KONG SAR CHINA",
+                "HUNGARY",
                 "INDIA",
                 "INDONESIA",
+                "ICELAND",
                 "IRAN",
                 "IRAQ",
                 "IRELAND",
-                "ICELAND",
-                "CHRISTMAS ISLAND",
                 "ISLE OF MAN",
-                "NORFOLK ISLAND",
-                "ÅLAND ISLANDS",
-                "CANARY ISLANDS",
-                "CAYMAN ISLANDS",
-                "COCOS (KEELING) ISLANDS",
-                "COOK ISLANDS",
-                "FAROE ISLANDS",
-                "FALKLAND ISLANDS",
-                "NORTHERN MARIANA ISLANDS",
-                "MARSHALL ISLANDS",
-                "PITCAIRN ISLANDS",
-                "SOLOMON ISLANDS",
-                "TURKS & CAICOS ISLANDS",
-                "U_S_ VIRGIN ISLANDS",
-                "BRITISH VIRGIN ISLANDS",
                 "ISRAEL",
                 "ITALY",
                 "JERSEY",
+                "JAMAICA",
+                "JAPAN",
+                "JORDAN",
                 "KAZAKHSTAN",
                 "KENYA",
                 "KYRGYZSTAN",
                 "KIRIBATI",
                 "KOSOVO",
                 "KUWAIT",
+                "LATIN AMERICA",
                 "LAOS",
                 "LESOTHO",
                 "LATVIA",
@@ -457,7 +451,7 @@
                 "LIECHTENSTEIN",
                 "LITHUANIA",
                 "LUXEMBOURG",
-                "NORTH MACEDONIA",
+                "MACAO SAR CHINA",
                 "MADAGASCAR",
                 "MALAWI",
                 "MALAYSIA",
@@ -472,45 +466,47 @@
                 "MICRONESIA",
                 "MOLDOVA",
                 "MONACO",
-                "WORLD",
                 "MONGOLIA",
                 "MONTENEGRO",
                 "MONTSERRAT",
                 "MOZAMBIQUE",
                 "MYANMAR (BURMA)",
+                "MARSHALL ISLANDS",
+                "NORTHERN MARIANA ISLANDS",
                 "NAMIBIA",
                 "NAURU",
                 "NEPAL",
+                "NETHERLANDS",
+                "NEW CALEDONIA",
+                "NEW ZEALAND",
                 "NICARAGUA",
                 "NIGER",
                 "NIGERIA",
                 "NIUE",
+                "NORFOLK ISLAND",
+                "NORTH KOREA",
+                "NORTH MACEDONIA",
                 "NORWAY",
-                "NEW CALEDONIA",
-                "NEW ZEALAND",
                 "OMAN",
-                "NETHERLANDS",
                 "PAKISTAN",
                 "PALAU",
+                "PALESTINIAN TERRITORIES",
                 "PANAMA",
                 "PAPUA NEW GUINEA",
                 "PARAGUAY",
                 "PERU",
-                "FRENCH POLYNESIA",
+                "PHILIPPINES",
                 "POLAND",
                 "PORTUGAL",
                 "PUERTO RICO",
+                "PITCAIRN ISLANDS",
                 "QATAR",
-                "HONG KONG SAR CHINA",
-                "MACAO SAR CHINA",
-                "UNITED KINGDOM",
-                "CENTRAL AFRICAN REPUBLIC",
-                "DOMINICAN REPUBLIC",
                 "RÉUNION",
                 "ROMANIA",
                 "RWANDA",
                 "RUSSIA",
-                "WESTERN SAHARA",
+                "SOLOMON ISLANDS",
+                "SOUTH KOREA",
                 "ST_ KITTS & NEVIS",
                 "ST_ LUCIA",
                 "ST_ MARTIN",
@@ -518,10 +514,10 @@
                 "ST_ BARTHÉLEMY",
                 "ST_ PIERRE & MIQUELON",
                 "SAMOA",
-                "AMERICAN SAMOA",
                 "SAN MARINO",
                 "ST_ HELENA",
                 "SÃO TOMÉ & PRÍNCIPE",
+                "SAUDI ARABIA",
                 "SENEGAL",
                 "SERBIA",
                 "SEYCHELLES",
@@ -534,7 +530,6 @@
                 "SOMALIA",
                 "SPAIN",
                 "SRI LANKA",
-                "UNITED STATES",
                 "SOUTH SUDAN",
                 "SOUTH AFRICA",
                 "SUDAN",
@@ -542,12 +537,9 @@
                 "SVALBARD & JAN MAYEN",
                 "SWEDEN",
                 "SWITZERLAND",
-                "ESWATINI",
                 "TAJIKISTAN",
                 "TAIWAN",
                 "TANZANIA",
-                "PALESTINIAN TERRITORIES",
-                "BRITISH INDIAN OCEAN TERRITORY",
                 "THAILAND",
                 "TIMOR-LESTE",
                 "TOGO",
@@ -558,15 +550,25 @@
                 "TURKEY",
                 "TURKMENISTAN",
                 "TUVALU",
-                "UKRAINE",
+                "TURKS & CAICOS ISLANDS",
+                "U_S_ VIRGIN ISLANDS",
+                "UNITED KINGDOM",
                 "UGANDA",
-                "HUNGARY",
+                "UKRAINE",
+                "UNITED ARAB EMIRATES",
+                "UNITED STATES",
+                "USA",
                 "URUGUAY",
+                "U_S_ OUTLYING ISLANDS",
                 "UZBEKISTAN",
                 "VANUATU",
+                "VATICAN CITY",
+                "VATICAN",
                 "VENEZUELA",
                 "VIETNAM",
                 "WALLIS & FUTUNA",
+                "WESTERN SAHARA",
+                "WORLD",
                 "YEMEN",
                 "ZAMBIA",
                 "ZIMBABWE"

From c94960b22c215e7b29365f8d8da1484b1425f6d4 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Fri, 20 May 2022 10:02:43 +0000
Subject: [PATCH 123/152] Translated using Weblate (Spanish)

Currently translated at 10.0% (11 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/es/
---
 i18n/es/LC_MESSAGES/litcal.mo | Bin 1426 -> 1541 bytes
 i18n/es/LC_MESSAGES/litcal.po |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/es/LC_MESSAGES/litcal.mo b/i18n/es/LC_MESSAGES/litcal.mo
index 314aa4bb3228e7f4446e6bda79345e4f55e8c64f..d46c0791812b38254e818e73e99652035c50cae2 100644
GIT binary patch
delta 385
zcmX}n!AiqG5P;#?xYgG7Qj4Axqj)Wd7Z1LIP3YCzT2umwDJ8a-LP6+JQKJ{Zrzq&z
zo6n$9e1ZB3`cDlGOuo!8$?V=$$F<RP#Xbm8BiG3xStmb94c~~Y;ufyqJ~lDH5)M)4
zFR_gG7~)gWpJ9di2NSG#BHK8?XCotd<i)4awjvwY!(F_=MSMkF@P-Y1$3y%s>H|)(
zOdaAFk8lUSke&03fiNztnjc2%C4I=|-xB?S#sXO-^(Gpn+u5MpI!V%A<l?+z+V!xT
wMd`VV{iNtlCMNLAUhdheMltE9$8mJ#GW{yQw!we@)O9Z6%w<vE<sbIt7sIGIGynhq

delta 287
zcmX}m&k8|76vy#1-0Qyu#R}a-HpolZ-5YrW#a+1@q%34*DP^+s6l5h&B3nE01bjzw
z>epxHG@Uc6)Hb=iWv!i12~r><k|t+j>Pd3sMe-!7L>gE^8(qv`4?8%(I36*;3zo4S
z5;>VS=x~o%B1Ms<)Ht+gv@wD+Gy@mt;s(v<uDHTGRxn^Y^S+;;^)IvBypR4mVT=(o
no82PSi8JWWoxVREjvd`pzTT_u;jO%oYH80}>xbp(j(z$7;Y%PS

diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 11b0f020..14017704 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2021 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Ubuntu <priest@johnromanodorazio.com>, 2021.
-#
+# John R. D'Orazio <priest@johnromanodorazio.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-05-20 00:12+0000\n"
-"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"PO-Revision-Date: 2022-05-21 10:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/es/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.12.1\n"
 
 #: includes/LitCalAPI.php:228
 #, php-format
@@ -755,12 +755,12 @@ msgstr ""
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:100
 msgid "Optional memorial"
-msgstr ""
+msgstr "Memoria facultativa"
 
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:105
 msgid "Memorial"
-msgstr ""
+msgstr "Memoria obligatoria"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110

From a4d8bc42692d5609e0d4b4057d7f4c8c2ca2dbb7 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 21 May 2022 21:16:42 +0200
Subject: [PATCH 124/152] disallow additionalProperties in metadata schema

---
 schemas/LitCalMetadata.json | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/schemas/LitCalMetadata.json b/schemas/LitCalMetadata.json
index c085099c..d55dfb81 100644
--- a/schemas/LitCalMetadata.json
+++ b/schemas/LitCalMetadata.json
@@ -1,5 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "LitCalMetadata",
     "type": "object",
     "properties": {
         "LitCalMetadata": {
@@ -9,7 +10,7 @@
     "required": [
         "LitCalMetadata"
     ],
-    "title": "LitCalMetadata",
+    "additionalProperties": false,
     "definitions": {
         "LitCalMetadata": {
             "type": "object",
@@ -114,7 +115,8 @@
                                             "type": "integer"
                                         }
                                     },
-                                    "required": [ "sinceYear" ]
+                                    "required": [ "sinceYear" ],
+                                    "additionalProperties": false
                                 }
                             },
                             "required": [
@@ -122,11 +124,20 @@
                                 "name",
                                 "sanctoraleFileName",
                                 "yearLimits"
-                            ]
+                            ],
+                            "additionalProperties": false
                         }
                     }
                 }
-            }
+            },
+            "required": [
+                "NationalCalendars",
+                "DiocesanCalendars",
+                "DiocesanGroups",
+                "WiderRegions",
+                "RomanMissals"
+            ],
+            "additionalProperties": false
         }
     }
 }

From 1257b9b839408f9a7abb665828a2d5bae46ec356 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 00:58:16 +0200
Subject: [PATCH 125/152] update schemas

---
 LitCalHealth.php                 | 120 ++++++++++++---
 LitCalMetadata.php               |   2 +-
 includes/Festivity.php           |  11 +-
 includes/FestivityCollection.php |  20 ++-
 includes/LitCalAPI.php           | 115 +++++++-------
 includes/LitDateTime.php         |  14 ++
 includes/LitFunc.php             |  34 +++--
 includes/enums/LitSchema.php     |   4 +-
 schemas/CommonDef.json           |  77 +++++-----
 schemas/Index.json               | 255 +------------------------------
 schemas/LitCal.json              | 193 +++++++++++++++++++++++
 schemas/PropriumDeTempore.json   |   1 +
 schemas/WiderRegionCalendar.json |   1 +
 13 files changed, 452 insertions(+), 395 deletions(-)
 create mode 100644 includes/LitDateTime.php
 create mode 100644 schemas/LitCal.json

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 86d9714d..b93887ce 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -10,6 +10,7 @@
 include_once( 'includes/APICore.php' );
 include_once( 'vendor/autoload.php' );
 
+use Swaggest\JsonSchema\InvalidValue;
 use Swaggest\JsonSchema\Schema;
 
 if( file_exists("allowedOrigins.php") ) {
@@ -48,10 +49,12 @@ class LitCalHealth {
         "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json"   => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json"       => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdetempore.json"                                           => LitSchema::PROPRIUMDETEMPORE,
-        "nations/index.json"                                        => LitSchema::INDEX,
-        "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php" => LitSchema::METADATA
+        "nations/index.json"                                                    => LitSchema::INDEX,
+        "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php"       => LitSchema::METADATA
     ];
 
+    const LitCalBaseUrl = "https://litcal.johnromanodorazio.com/api/dev/LitCalEngine.php";
+
     public APICore $APICore;
     //private array $MESSAGES                         = [];
 
@@ -62,53 +65,128 @@ public function __construct(){
     }
 
     private function executeValidations() {
+        $MetadataIsValid = false;
+        $Metadata = new stdClass();
         $result = new stdClass();
         $result->messages = [];
         foreach( LitCalHealth::DataSchema as $dataPath => $schema ) {
-            $message = new stdClass();
             $data = file_get_contents( $dataPath );
             if( $data !== false ) {
+                $message = new stdClass();
                 $message->type = "success";
-                $message->text = "Data file $dataPath exists";
-                $result->messages = $message;
+                $message->text = "The Data file $dataPath exists";
+                $result->messages[] = $message;
 
                 $jsonData = json_decode( $data );
                 if( json_last_error() === JSON_ERROR_NONE ) {
+                    $message = new stdClass();
                     $message->type = "success";
                     $message->text = "The Data file $dataPath was successfully decoded as JSON";
-                    $result->messages = $message;
-
-                    if( $this->validateDataAgainstSchema( $jsonData, $schema ) ) {
+                    $result->messages[] = $message;
+
+                    $validationResult = $this->validateDataAgainstSchema( $jsonData, $schema );
+                    if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
+                        if( $schema === LitSchema::METADATA ) {
+                            $MetadataIsValid = true;
+                            $Metadata = $jsonData->LitCalMetadata;
+                        }
+                        $message = new stdClass();
                         $message->type = "success";
                         $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
-                        $result->messages = $message;
+                        $result->messages[] = $message;
+                    }
+                    else if( gettype( $validationResult === 'object' ) ) {
+                        $result->messages[] = $validationResult;
                     }
                 } else {
+                    $message = new stdClass();
                     $message->type = "error";
                     $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
-                    $result->messages = $message;
+                    $result->messages[] = $message;
                 }
 
             } else {
+                $message = new stdClass();
                 $message->type = "error";
                 $message->text = "Data file $dataPath does not exist";
-                $result->messages = $message;
+                $result->messages[] = $message;
+            }
+        }
+        if( $MetadataIsValid ) {
+            $NationalCalendars  = [];
+            $DiocesanCalendars  = [];
+            $Years              = [];
+            foreach( $Metadata->NationalCalendars as $key => $value ){
+                array_push( $NationalCalendars, $key );
+                array_push( $DiocesanCalendars, ...$value );
+            }
+            for( $i=10; $i>0; $i-- ) {
+                array_push( $Years, rand(1970,9999) );
             }
         }
+        $result = $this->validateCalendars( $NationalCalendars, $Years, 'nationalcalendar', $result );
+        $result = $this->validateCalendars( $DiocesanCalendars, $Years, 'diocesancalendar', $result );
         die( json_encode( $result ) );
     }
 
-    private function validateDataAgainstSchema( object|array $data, string $schemaUrl ) : bool {
-        $result = new stdClass();
-        $schema = Schema::import( $schemaUrl );
+    private function validateCalendars( array $Calendars, array $Years, string $type, object $result ) : object {
+        foreach( $Calendars as $Calendar ) {
+            foreach( $Years as $Year ) {
+                $req = "?$type=$Calendar&year=$Year";
+                $data = file_get_contents( self::LitCalBaseUrl . $req );
+                if( $data !== false ) {
+                    $message = new stdClass();
+                    $message->type = "success";
+                    $message->text = "The $type of $Calendar exists";
+                    $result->messages[] = $message;
+    
+                    $jsonData = json_decode( $data );
+                    if( json_last_error() === JSON_ERROR_NONE ) {
+                        $message = new stdClass();
+                        $message->type = "success";
+                        $message->text = "The $type of $Calendar was successfully decoded as JSON";
+                        $result->messages[] = $message;
+    
+                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
+                            $message = new stdClass();
+                            $message->type = "success";
+                            $message->text = "The $type of $Calendar was successfully validated against the Schema " . LitSchema::LITCAL;
+                            $result->messages[] = $message;
+                        }
+                        else if( gettype( $validationResult === 'object' ) ) {
+                            $result->messages[] = $validationResult;
+                        }
+                    } else {
+                        $message = new stdClass();
+                        $message->type = "error";
+                        $message->text = "There was an error decoding the $type of $Calendar from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                        $result->messages[] = $message;
+                    }
+                } else {
+                    $message = new stdClass();
+                    $message->type = "error";
+                    $message->text = "The $type of $Calendar does not exist at the URL " . self::LitCalBaseUrl . $req;
+                    $result->messages[] = $message;
+                }
+            }
+        }
+        return $result;
+    }
+
+    private function validateDataAgainstSchema( object|array $data, string $schemaUrl ) : bool|object {
+        $res = false;
         try {
-            $validation = $schema->in($data);
-            return true;
-        } catch (Exception $e) {
-            $result->error = LitSchema::ERROR_MESSAGES[ $schemaUrl ] . PHP_EOL . $e->getMessage();
-            header( $_SERVER[ "SERVER_PROTOCOL" ]." 422 Unprocessable Entity", true, 422 );
-            die( json_encode( $result ) );
+            $schema = Schema::import( $schemaUrl );
+            $schema->in($data);
+            $res = true;
+        } catch (InvalidValue|Exception $e) {
+            $message = new stdClass();
+            $message->type = "error";
+            $message->text = LitSchema::ERROR_MESSAGES[ $schemaUrl ] . PHP_EOL . $e->getMessage();
+            return $message;
         }
+        return $res;
     }
 
     private function handleRequestedMethod() {
@@ -149,4 +227,4 @@ public function Init() {
         $this->handleRequestedMethod();
     }
 
-}
\ No newline at end of file
+}
diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index db66efff..9cbe98c0 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -62,7 +62,7 @@
                 "DiocesanGroups"    => $diocesanGroups,
                 "WiderRegions"      => $widerRegionsNames,
                 "RomanMissals"      => RomanMissal::produceMetadata()
-            ],
+            ]
         ], JSON_PRETTY_PRINT );
         $responseHash = md5( $response );
         header("Etag: \"{$responseHash}\"");
diff --git a/includes/Festivity.php b/includes/Festivity.php
index b495afbe..0bf2a253 100644
--- a/includes/Festivity.php
+++ b/includes/Festivity.php
@@ -5,6 +5,7 @@
 include_once( 'enums/LitCommon.php' );
 include_once( 'enums/LitFeastType.php' );
 include_once( 'enums/LitGrade.php' );
+include_once( 'LitDateTime.php' );
 
 class Festivity implements JsonSerializable
 {
@@ -12,7 +13,7 @@ class Festivity implements JsonSerializable
 
     public int      $idx;
     public string   $name;
-    public DateTime $date;
+    public LitDateTime $date;
     public array    $color;
     public string   $type;
     public int      $grade;
@@ -27,7 +28,7 @@ class Festivity implements JsonSerializable
     public ?bool    $hasVesperII    = null;
     public ?int     $psalterWeek    = null;
 
-    function __construct(string $name, DateTime $date, string|array $color = [ '???' ], string $type = '???', int $grade = LitGrade::WEEKDAY, string|array $common = [ '???' ], string $displayGrade='')
+    function __construct(string $name, LitDateTime $date, string|array $color = [ '???' ], string $type = '???', int $grade = LitGrade::WEEKDAY, string|array $common = [ '???' ], string $displayGrade='')
     {
         $this->idx          = self::$eventIdx++;
         $this->name         = $name;
@@ -61,10 +62,11 @@ function __construct(string $name, DateTime $date, string|array $color = [ '???'
             }
         }
     }
-
+    /*
     private static function debugWrite( string $string ) {
         file_put_contents( "debug.log", $string . PHP_EOL, FILE_APPEND );
     }
+    */
 
     /* * * * * * * * * * * * * * * * * * * * * * * * *
      * Funzione statica di comparazione
@@ -87,7 +89,8 @@ public function jsonSerialize() : mixed {
         $returnArr = [
             'eventIdx'      => $this->idx,
             'name'          => $this->name,
-            'date'          => $this->date->format('U'), //serialize the DateTime object as a PHP timestamp
+            //serialize the DateTime object as a PHP timestamp (seconds since the Unix Epoch)
+            'date'          => (int) $this->date->format('U'),
             'color'         => $this->color,
             'type'          => $this->type,
             'grade'         => $this->grade,
diff --git a/includes/FestivityCollection.php b/includes/FestivityCollection.php
index 6e73acf4..0ea85ae7 100644
--- a/includes/FestivityCollection.php
+++ b/includes/FestivityCollection.php
@@ -4,6 +4,7 @@
 include_once( 'includes/Festivity.php' );
 include_once( 'includes/LitMessages.php' );
 include_once( 'includes/LitSettings.php' );
+include_once( 'includes/LitDateTime.php' );
 
 class FestivityCollection {
 
@@ -12,10 +13,10 @@ class FestivityCollection {
     private array $feasts           = [];
     private array $memorials        = [];
     private array $WeekdayAdventChristmasLent   = [];
-    private array $WeekdaysEpiphany                = [];
-    private array $SolemnitiesLordBVM             = [];
-    private array $SundaysAdventLentEaster       = [];
-    private array $T                                = [];
+    private array $WeekdaysEpiphany             = [];
+    private array $SolemnitiesLordBVM           = [];
+    private array $SundaysAdventLentEaster      = [];
+    private array $T                            = [];
     private IntlDateFormatter $dayOfTheWeek;
     private LitSettings $LitSettings;
     private LitGrade $LitGrade;
@@ -24,7 +25,14 @@ class FestivityCollection {
 
     public function __construct( LitSettings $LitSettings ) {
         $this->LitSettings = $LitSettings;
-        $this->dayOfTheWeek = IntlDateFormatter::create( strtolower( $this->LitSettings->Locale ), IntlDateFormatter::FULL, IntlDateFormatter::NONE, 'UTC', IntlDateFormatter::GREGORIAN, "EEEE" );
+        $this->dayOfTheWeek = IntlDateFormatter::create(
+            strtolower( $this->LitSettings->Locale ),
+            IntlDateFormatter::FULL,
+            IntlDateFormatter::NONE,
+            'UTC',
+            IntlDateFormatter::GREGORIAN,
+            "EEEE"
+        );
         if( $this->LitSettings->Locale === LitLocale::LATIN ) {
             $this->T = [
                 "YEAR"          => "ANNUM",
@@ -241,7 +249,7 @@ private function handleGradeProperty( string $key, int $value, int $oldValue ) :
     }
 
     public function setProperty( string $key, string $property, string|int|bool $value ) : bool {
-        $reflect = new ReflectionClass( new Festivity("test", new DateTime('NOW')) );
+        $reflect = new ReflectionClass( new Festivity("test", new LitDateTime('NOW')) );
         if( array_key_exists( $key, $this->festivities ) ) {
             $oldValue = $this->festivities[ $key ]->{$property};
             if( $reflect->hasProperty( $property ) ) {
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 8786262e..4bd16577 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -17,6 +17,7 @@
 include_once( "includes/LitSettings.php" );
 include_once( "includes/LitFunc.php" );
 include_once( "includes/LitMessages.php" );
+include_once( "includes/LitDateTime.php" );
 include_once( "includes/pgettext.php" );
 
 class LitCalAPI {
@@ -329,13 +330,13 @@ private function calculateEasterTriduum() : void {
     }
 
     private function calculateEpiphanyJan6() : void {
-        $Epiphany = new Festivity( $this->PropriumDeTempore[ "Epiphany" ][ "NAME" ], DateTime::createFromFormat( '!j-n-Y', '6-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),  LitColor::WHITE, LitFeastType::FIXED,  LitGrade::HIGHER_SOLEMNITY );
+        $Epiphany = new Festivity( $this->PropriumDeTempore[ "Epiphany" ][ "NAME" ], LitDateTime::createFromFormat( '!j-n-Y', '6-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),  LitColor::WHITE, LitFeastType::FIXED,  LitGrade::HIGHER_SOLEMNITY );
         $this->Cal->addFestivity( "Epiphany",   $Epiphany );
         //If a Sunday occurs on a day from Jan. 2 through Jan. 5, it is called the "Second Sunday of Christmas"
         //Weekdays from Jan. 2 through Jan. 5 are called "*day before Epiphany"
         $nth = 0;
         for ( $i = 2; $i <= 5; $i++ ) {
-            $dateTime = DateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $dateTime = LitDateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             if ( self::DateIsSunday( $dateTime ) ) {
                 $Christmas2 = new Festivity( $this->PropriumDeTempore[ "Christmas2" ][ "NAME" ], $dateTime, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
                 $this->Cal->addFestivity( "Christmas2", $Christmas2 );
@@ -349,13 +350,13 @@ private function calculateEpiphanyJan6() : void {
         }
 
         //Weekdays from Jan. 7 until the following Sunday are called "*day after Epiphany"
-        $SundayAfterEpiphany = (int)DateTime::createFromFormat( '!j-n-Y', '6-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' )->format( 'j' );
+        $SundayAfterEpiphany = (int)LitDateTime::createFromFormat( '!j-n-Y', '6-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' )->format( 'j' );
         if ( $SundayAfterEpiphany !== 7 ) { //this means January 7th, it does not refer to the day of the week which is obviously Sunday in this case
             $nth = 0;
             for ( $i = 7; $i < $SundayAfterEpiphany; $i++ ) {
                 $nth++;
                 $nthStr = $this->LitSettings->Locale === LitLocale::LATIN ? LitMessages::LATIN_ORDINAL[ $nth ] : $this->formatter->format( $nth );
-                $dateTime = DateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                $dateTime = LitDateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? sprintf( "Dies %s post Epiphaniam", $nthStr ) : sprintf( _( "%s day after Epiphany" ), ucfirst( $nthStr ) );
                 $festivity = new Festivity( $name, $dateTime, LitColor::WHITE, LitFeastType::MOBILE );
                 $this->Cal->addFestivity( "DayAfterEpiphany" . $nth, $festivity );
@@ -365,7 +366,7 @@ private function calculateEpiphanyJan6() : void {
 
     private function calculateEpiphanySunday() : void {
         //If January 2nd is a Sunday, then go with Jan 2nd
-        $dateTime = DateTime::createFromFormat( '!j-n-Y', '2-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $dateTime = LitDateTime::createFromFormat( '!j-n-Y', '2-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         if ( self::DateIsSunday( $dateTime ) ) {
             $Epiphany = new Festivity( $this->PropriumDeTempore[ "Epiphany" ][ "NAME" ], $dateTime, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY );
             $this->Cal->addFestivity( "Epiphany",   $Epiphany );
@@ -382,20 +383,20 @@ private function calculateEpiphanySunday() : void {
                 $nth++;
                 $nthStr = $this->LitSettings->Locale === LitLocale::LATIN ? LitMessages::LATIN_ORDINAL[ $nth ] : $this->formatter->format( $nth );
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? sprintf( "Dies %s ante Epiphaniam", $nthStr ) : sprintf( _( "%s day before Epiphany" ), ucfirst( $nthStr ) );
-                $dateTime = DateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                $dateTime = LitDateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                 $festivity = new Festivity( $name, $dateTime, LitColor::WHITE, LitFeastType::MOBILE );
                 $this->Cal->addFestivity( "DayBeforeEpiphany" . $nth, $festivity );
             }
 
             //If Epiphany occurs on or before Jan. 6, then the days of the week following Epiphany are called "*day after Epiphany" and the Sunday following Epiphany is the Baptism of the Lord.
             if ( $DayOfEpiphany < 7 ) {
-                $SundayAfterEpiphany =  (int)DateTime::createFromFormat( '!j-n-Y', '2-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' )->modify( 'next Sunday' )->format( 'j' );
+                $SundayAfterEpiphany =  (int)LitDateTime::createFromFormat( '!j-n-Y', '2-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' )->modify( 'next Sunday' )->format( 'j' );
                 $nth = 0;
                 for ( $i = $DayOfEpiphany + 1; $i < $SundayAfterEpiphany; $i++ ) {
                     $nth++;
                     $nthStr = $this->LitSettings->Locale === LitLocale::LATIN ? LitMessages::LATIN_ORDINAL[ $nth ] : $this->formatter->format( $nth );
                     $name = $this->LitSettings->Locale === LitLocale::LATIN ? sprintf( "Dies %s post Epiphaniam", $nthStr ) : sprintf( _( "%s day after Epiphany" ), ucfirst( $nthStr ) );
-                    $dateTime = DateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                    $dateTime = LitDateTime::createFromFormat( '!j-n-Y', $i . '-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                     $festivity = new Festivity( $name, $dateTime, LitColor::WHITE, LitFeastType::MOBILE );
                     $this->Cal->addFestivity( "DayAfterEpiphany" . $nth, $festivity );
                 }
@@ -406,7 +407,7 @@ private function calculateEpiphanySunday() : void {
     private function calculateChristmasEpiphany() : void {
         $Christmas = new Festivity( 
             $this->PropriumDeTempore[ "Christmas" ][ "NAME" ],
-            DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),
+            LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),
             LitColor::WHITE,
             LitFeastType::FIXED,
             LitGrade::HIGHER_SOLEMNITY
@@ -437,10 +438,10 @@ private function calculateAscensionPentecost() : void {
     }
 
     private function calculateSundaysMajorSeasons() : void {
-        $this->Cal->addFestivity( "Advent1",    new Festivity( $this->PropriumDeTempore[ "Advent1" ][ "NAME" ],      DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) ), LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
-        $this->Cal->addFestivity( "Advent2",    new Festivity( $this->PropriumDeTempore[ "Advent2" ][ "NAME" ],      DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 2 * 7 ) . 'D' ) ), LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
-        $this->Cal->addFestivity( "Advent3",    new Festivity( $this->PropriumDeTempore[ "Advent3" ][ "NAME" ],      DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P7D' ) ),                 LitColor::PINK,     LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
-        $this->Cal->addFestivity( "Advent4",    new Festivity( $this->PropriumDeTempore[ "Advent4" ][ "NAME" ],      DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' ),                                                   LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
+        $this->Cal->addFestivity( "Advent1",    new Festivity( $this->PropriumDeTempore[ "Advent1" ][ "NAME" ],      LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) ), LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
+        $this->Cal->addFestivity( "Advent2",    new Festivity( $this->PropriumDeTempore[ "Advent2" ][ "NAME" ],      LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 2 * 7 ) . 'D' ) ), LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
+        $this->Cal->addFestivity( "Advent3",    new Festivity( $this->PropriumDeTempore[ "Advent3" ][ "NAME" ],      LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P7D' ) ),                 LitColor::PINK,     LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
+        $this->Cal->addFestivity( "Advent4",    new Festivity( $this->PropriumDeTempore[ "Advent4" ][ "NAME" ],      LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' ),                                                   LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
         $this->Cal->addFestivity( "Lent1",      new Festivity( $this->PropriumDeTempore[ "Lent1" ][ "NAME" ],        LitFunc::calcGregEaster( $this->LitSettings->Year )->sub( new DateInterval( 'P' . ( 6 * 7 ) . 'D' ) ),    LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
         $this->Cal->addFestivity( "Lent2",      new Festivity( $this->PropriumDeTempore[ "Lent2" ][ "NAME" ],        LitFunc::calcGregEaster( $this->LitSettings->Year )->sub( new DateInterval( 'P' . ( 5 * 7 ) . 'D' ) ),    LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
         $this->Cal->addFestivity( "Lent3",      new Festivity( $this->PropriumDeTempore[ "Lent3" ][ "NAME" ],        LitFunc::calcGregEaster( $this->LitSettings->Year )->sub( new DateInterval( 'P' . ( 4 * 7 ) . 'D' ) ),    LitColor::PURPLE,   LitFeastType::MOBILE, LitGrade::HIGHER_SOLEMNITY ) );
@@ -500,18 +501,18 @@ private function calculateMobileSolemnitiesOfTheLord() : void {
         $this->Cal->addFestivity( "SacredHeart", $SacredHeart );
 
         //Christ the King is calculated backwards from the first sunday of advent
-        $ChristKing = new Festivity( $this->PropriumDeTempore[ "ChristKing" ][ "NAME" ],     DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 4 * 7 ) . 'D' ) ),    LitColor::RED,  LitFeastType::MOBILE, LitGrade::SOLEMNITY );
+        $ChristKing = new Festivity( $this->PropriumDeTempore[ "ChristKing" ][ "NAME" ],     LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 4 * 7 ) . 'D' ) ),    LitColor::RED,  LitFeastType::MOBILE, LitGrade::SOLEMNITY );
         $this->Cal->addFestivity( "ChristKing", $ChristKing );
     }
 
     private function calculateFixedSolemnities() : void {
         //even though Mary Mother of God is a fixed date solemnity, however it is found in the Proprium de Tempore and not in the Proprium de Sanctis
-        $MotherGod = new Festivity( $this->PropriumDeTempore[ "MotherGod" ][ "NAME" ], DateTime::createFromFormat( '!j-n-Y', '1-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),      LitColor::WHITE,    LitFeastType::FIXED, LitGrade::SOLEMNITY );
+        $MotherGod = new Festivity( $this->PropriumDeTempore[ "MotherGod" ][ "NAME" ], LitDateTime::createFromFormat( '!j-n-Y', '1-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ),      LitColor::WHITE,    LitFeastType::FIXED, LitGrade::SOLEMNITY );
         $this->Cal->addFestivity( "MotherGod", $MotherGod );
 
         $tempCalSolemnities = array_filter( $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ], function( $el ){ return $el->GRADE === LitGrade::SOLEMNITY; } );
         foreach( $tempCalSolemnities as $row ) {
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $tempFestivity = new Festivity( $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
             //LitCalAPI::debugWrite( "adding new fixed solemnity '$row->NAME', common vartype = " . gettype( $row->COMMON ) . ", common = " . implode(', ', $row->COMMON) );
             //A Solemnity impeded in any given year is transferred to the nearest day following designated in nn. 1-8 of the Tables given above ( LY 60 )
@@ -661,8 +662,8 @@ private function calculateFeastsOfTheLord() : void {
         $this->BaptismLordMod = 'next Sunday';
         //If Epiphany is celebrated on Sunday between Jan. 2 - Jan 8, and Jan. 7 or Jan. 8 is Sunday, then Baptism of the Lord is celebrated on the Monday immediately following that Sunday
         if ( $this->LitSettings->Epiphany === Epiphany::SUNDAY_JAN2_JAN8 ) {
-            $dateJan7 = DateTime::createFromFormat( '!j-n-Y', '7-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-            $dateJan8 = DateTime::createFromFormat( '!j-n-Y', '8-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $dateJan7 = LitDateTime::createFromFormat( '!j-n-Y', '7-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $dateJan8 = LitDateTime::createFromFormat( '!j-n-Y', '8-1-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             if ( self::DateIsSunday( $dateJan7 ) ) {
                 $this->BaptismLordFmt = '7-1-' . $this->LitSettings->Year;
                 $this->BaptismLordMod = 'next Monday';
@@ -671,7 +672,7 @@ private function calculateFeastsOfTheLord() : void {
                 $this->BaptismLordMod = 'next Monday';
             }
         }
-        $BaptismLord      = new Festivity( $this->PropriumDeTempore[ "BaptismLord" ][ "NAME" ], DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod ), LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
+        $BaptismLord      = new Festivity( $this->PropriumDeTempore[ "BaptismLord" ][ "NAME" ], LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod ), LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
         $this->Cal->addFestivity( "BaptismLord", $BaptismLord );
 
         //the other feasts of the Lord ( Presentation, Transfiguration and Triumph of the Holy Cross) are fixed date feasts
@@ -679,14 +680,14 @@ private function calculateFeastsOfTheLord() : void {
         $tempCal = array_filter( $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ], function( $el ){ return $el->GRADE === LitGrade::FEAST_LORD; } );
 
         foreach ( $tempCal as $row ) {
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $festivity = new Festivity( $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
             $this->Cal->addFestivity( $row->TAG, $festivity );
         }
 
         //Holy Family is celebrated the Sunday after Christmas, unless Christmas falls on a Sunday, in which case it is celebrated Dec. 30
         if ( self::DateIsSunday( $this->Cal->getFestivity( "Christmas" )->date ) ) {
-            $holyFamilyDate = DateTime::createFromFormat( '!j-n-Y', '30-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $holyFamilyDate = LitDateTime::createFromFormat( '!j-n-Y', '30-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $HolyFamily = new Festivity( $this->PropriumDeTempore[ "HolyFamily" ][ "NAME" ], $holyFamilyDate, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
             $this->Messages[] = sprintf(
                 _( "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is celebrated on %s rather than on the Sunday after Christmas." ),
@@ -699,7 +700,7 @@ private function calculateFeastsOfTheLord() : void {
                     )
             );
         } else {
-            $holyFamilyDate = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' );
+            $holyFamilyDate = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'next Sunday' );
             $HolyFamily = new Festivity( $this->PropriumDeTempore[ "HolyFamily" ][ "NAME" ], $holyFamilyDate, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
         }
         $this->Cal->addFestivity( "HolyFamily", $HolyFamily );
@@ -711,13 +712,13 @@ private function calculateSundaysChristmasOrdinaryTime() : void {
         //If a fixed date Feast of the Lord occurs on a Sunday in Ordinary Time, the feast is celebrated in place of the Sunday
 
         //Sundays of Ordinary Time in the First part of the year are numbered from after the Baptism of the Lord ( which begins the 1st week of Ordinary Time ) until Ash Wednesday
-        $firstOrdinary = DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod );
+        $firstOrdinary = LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod );
         //Basically we take Ash Wednesday as the limit...
         //Here is ( Ash Wednesday - 7 ) since one more cycle will complete...
         $firstOrdinaryLimit = LitFunc::calcGregEaster( $this->LitSettings->Year )->sub( new DateInterval( 'P53D' ) );
         $ordSun = 1;
         while ( $firstOrdinary >= $this->Cal->getFestivity( "BaptismLord" )->date && $firstOrdinary < $firstOrdinaryLimit ) {
-            $firstOrdinary = DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->modify( 'next Sunday' )->add( new DateInterval( 'P' . ( ( $ordSun - 1 ) * 7 ) . 'D' ) );
+            $firstOrdinary = LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->modify( 'next Sunday' )->add( new DateInterval( 'P' . ( ( $ordSun - 1 ) * 7 ) . 'D' ) );
             $ordSun++;
             if ( !$this->Cal->inSolemnities( $firstOrdinary ) ) {
                 $this->Cal->addFestivity( "OrdSunday" . $ordSun, new Festivity( $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ], $firstOrdinary, LitColor::GREEN, LitFeastType::MOBILE, LitGrade::FEAST_LORD ) );
@@ -733,7 +734,7 @@ private function calculateSundaysChristmasOrdinaryTime() : void {
         }
 
         //Sundays of Ordinary Time in the Latter part of the year are numbered backwards from Christ the King ( 34th ) to Pentecost
-        $lastOrdinary = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 4 * 7 ) . 'D' ) );
+        $lastOrdinary = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 4 * 7 ) . 'D' ) );
         //We take Trinity Sunday as the limit...
         //Here is ( Trinity Sunday + 7 ) since one more cycle will complete...
         $lastOrdinaryLowerLimit = LitFunc::calcGregEaster( $this->LitSettings->Year )->add( new DateInterval( 'P' . ( 7 * 9 ) . 'D' ) );
@@ -741,7 +742,7 @@ private function calculateSundaysChristmasOrdinaryTime() : void {
         $ordSunCycle = 4;
 
         while ( $lastOrdinary <= $this->Cal->getFestivity( "ChristKing" )->date && $lastOrdinary > $lastOrdinaryLowerLimit ) {
-            $lastOrdinary = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( ++$ordSunCycle * 7 ) . 'D' ) );
+            $lastOrdinary = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( ++$ordSunCycle * 7 ) . 'D' ) );
             $ordSun--;
             if ( !$this->Cal->inSolemnities( $lastOrdinary ) ) {
                 $this->Cal->addFestivity( "OrdSunday" . $ordSun, new Festivity( $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ], $lastOrdinary, LitColor::GREEN, LitFeastType::MOBILE, LitGrade::FEAST_LORD ) );
@@ -762,7 +763,7 @@ private function calculateFeastsMarySaints() : void {
         $tempCal = array_filter( $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ], function( $el ){ return $el->GRADE === LitGrade::FEAST; } );
 
         foreach ( $tempCal as $row ) {
-            $row->DATE = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $row->DATE = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             //If a Feast ( not of the Lord ) occurs on a Sunday in Ordinary Time, the Sunday is celebrated.  ( e.g., St. Luke, 1992 )
             //obviously solemnities also have precedence
             if ( self::DateIsNotSunday( $row->DATE ) && !$this->Cal->inSolemnities( $row->DATE ) ) {
@@ -787,10 +788,10 @@ private function calculateWeekdaysAdvent() : void {
 
         $DoMAdvent1     = $this->Cal->getFestivity("Advent1")->date->format( 'j' ); //DoM == Day of Month
         $MonthAdvent1   = $this->Cal->getFestivity("Advent1")->date->format( 'n' );
-        $weekdayAdvent  = DateTime::createFromFormat( '!j-n-Y', $DoMAdvent1 . '-' . $MonthAdvent1 . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $weekdayAdvent  = LitDateTime::createFromFormat( '!j-n-Y', $DoMAdvent1 . '-' . $MonthAdvent1 . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $weekdayAdventCnt = 1;
         while ( $weekdayAdvent >= $this->Cal->getFestivity("Advent1")->date && $weekdayAdvent < $this->Cal->getFestivity("Christmas")->date ) {
-            $weekdayAdvent = DateTime::createFromFormat( '!j-n-Y', $DoMAdvent1 . '-' . $MonthAdvent1 . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayAdventCnt . 'D' ) );
+            $weekdayAdvent = LitDateTime::createFromFormat( '!j-n-Y', $DoMAdvent1 . '-' . $MonthAdvent1 . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayAdventCnt . 'D' ) );
 
             //if we're not dealing with a sunday or a solemnity, then create the weekday
             if ( $this->Cal->notInSolemnitiesFeastsOrMemorials( $weekdayAdvent ) && self::DateIsNotSunday( $weekdayAdvent ) ) {
@@ -811,10 +812,10 @@ private function calculateWeekdaysAdvent() : void {
     }
 
     private function calculateWeekdaysChristmasOctave() : void {
-        $weekdayChristmas = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $weekdayChristmas = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $weekdayChristmasCnt = 1;
-        while ( $weekdayChristmas >= $this->Cal->getFestivity( "Christmas" )->date && $weekdayChristmas < DateTime::createFromFormat( '!j-n-Y', '31-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ) ) {
-            $weekdayChristmas = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayChristmasCnt . 'D' ) );
+        while ( $weekdayChristmas >= $this->Cal->getFestivity( "Christmas" )->date && $weekdayChristmas < LitDateTime::createFromFormat( '!j-n-Y', '31-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) ) ) {
+            $weekdayChristmas = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayChristmasCnt . 'D' ) );
             if ( $this->Cal->notInSolemnitiesFeastsOrMemorials( $weekdayChristmas ) && self::DateIsNotSunday( $weekdayChristmas ) ) {
                 $ordinal = ucfirst( LitMessages::getOrdinal( ( $weekdayChristmasCnt + 1 ), $this->LitSettings->Locale, $this->formatter, LitMessages::LATIN_ORDINAL ) );
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? sprintf( "Dies %s Octavæ Nativitatis", $ordinal ) : sprintf( _( "%s Day of the Octave of Christmas" ), $ordinal );
@@ -830,10 +831,10 @@ private function calculateWeekdaysLent() : void {
         //Day of the Month of Ash Wednesday
         $DoMAshWednesday = $this->Cal->getFestivity( "AshWednesday" )->date->format( 'j' );
         $MonthAshWednesday = $this->Cal->getFestivity( "AshWednesday" )->date->format( 'n' );
-        $weekdayLent = DateTime::createFromFormat( '!j-n-Y', $DoMAshWednesday . '-' . $MonthAshWednesday . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $weekdayLent = LitDateTime::createFromFormat( '!j-n-Y', $DoMAshWednesday . '-' . $MonthAshWednesday . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $weekdayLentCnt = 1;
         while ( $weekdayLent >= $this->Cal->getFestivity( "AshWednesday" )->date && $weekdayLent < $this->Cal->getFestivity( "PalmSun" )->date ) {
-            $weekdayLent = DateTime::createFromFormat( '!j-n-Y', $DoMAshWednesday . '-' . $MonthAshWednesday . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayLentCnt . 'D' ) );
+            $weekdayLent = LitDateTime::createFromFormat( '!j-n-Y', $DoMAshWednesday . '-' . $MonthAshWednesday . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayLentCnt . 'D' ) );
             if ( !$this->Cal->inSolemnities( $weekdayLent ) && self::DateIsNotSunday( $weekdayLent ) ) {
                 if ( $weekdayLent > $this->Cal->getFestivity("Lent1")->date ) {
                     $upper =  (int)$weekdayLent->format( 'z' );
@@ -888,7 +889,7 @@ private function calculateMemorials( int $grade = LitGrade::MEMORIAL, string $mi
         $tempCal = array_filter( $this->tempCal[ $missal ], function( $el ) use ( $grade ){ return $el->GRADE === $grade; } );
         foreach ( $tempCal as $row ) {
             //If it doesn't occur on a Sunday or a Solemnity or a Feast of the Lord or a Feast or an obligatory memorial, then go ahead and create the optional memorial
-            $row->DATE = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $row->DATE = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             if ( self::DateIsNotSunday( $row->DATE ) && $this->Cal->notInSolemnitiesFeastsOrMemorials( $row->DATE ) ) {
                 $newFestivity = new Festivity( $row->NAME, $row->DATE, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
                 //LitCalAPI::debugWrite( "adding new memorial '$row->NAME', common vartype = " . gettype( $row->COMMON ) . ", common = " . implode(', ', $row->COMMON) );
@@ -1112,7 +1113,7 @@ private function createFestivityFromDecree( object $row ) : void {
                 $this->createMobileFestivity( $row );
             }
         } else {
-            $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->DAY}-{$row->Festivity->MONTH}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+            $row->Festivity->DATE = LitDateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->DAY}-{$row->Festivity->MONTH}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
             $decree = $this->elaborateDecreeSource( $row );
             if( $row->Festivity->GRADE === LitGrade::MEMORIAL_OPT ) {
                 if( $this->Cal->notInSolemnitiesFeastsOrMemorials( $row->Festivity->DATE ) ) {
@@ -1419,7 +1420,7 @@ private function createImmaculateHeart() {
      * source: http://www.vatican.va/roman_curia/congregations/ccdds/documents/rc_con_ccdds_doc_20000628_guadalupe_lt.html
      */
     private function handleSaintJaneFrancesDeChantal() {
-        $StJaneFrancesNewDate = DateTime::createFromFormat( '!j-n-Y', '12-8-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $StJaneFrancesNewDate = LitDateTime::createFromFormat( '!j-n-Y', '12-8-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $langs = ["LA" => "lt", "ES" => "es"];
         $lang = in_array( $this->LitSettings->Locale, array_keys($langs) ) ? $langs[$this->LitSettings->Locale] : "lt";
         if ( self::DateIsNotSunday( $StJaneFrancesNewDate ) && $this->Cal->notInSolemnitiesFeastsOrMemorials( $StJaneFrancesNewDate ) ) {
@@ -1475,7 +1476,7 @@ private function applyOptionalMemorialDecree2009() : void {
         $festivity = $this->Cal->getFestivity( "ConversionStPaul" );
         if( $festivity === null ) {
             $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ "ConversionStPaul" ];
-            $festivity = new Festivity( $row->NAME, DateTime::createFromFormat( '!j-n-Y', '25-1-2009', new DateTimeZone( 'UTC' ) ), LitColor::WHITE, LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, LitCommon::PROPRIO );
+            $festivity = new Festivity( $row->NAME, LitDateTime::createFromFormat( '!j-n-Y', '25-1-2009', new DateTimeZone( 'UTC' ) ), LitColor::WHITE, LitFeastType::FIXED, LitGrade::MEMORIAL_OPT, LitCommon::PROPRIO );
             $this->Cal->addFestivity( "ConversionStPaul", $festivity );
             $langs = ["FR" => "fr", "EN" => "en", "IT" => "it", "LA" => "lt", "PT" => "pt", "ES" => "sp", "DE" => "ge"];
             $lang = in_array( $this->LitSettings->Locale, array_keys($langs) ) ? $langs[$this->LitSettings->Locale] : "en";
@@ -1494,10 +1495,10 @@ private function calculateWeekdaysMajorSeasons() : void {
         $DoMEaster = $this->Cal->getFestivity( "Easter" )->date->format( 'j' );      //day of the month of Easter
         $MonthEaster = $this->Cal->getFestivity( "Easter" )->date->format( 'n' );    //month of Easter
         //let's start cycling dates one at a time starting from Easter itself
-        $weekdayEaster = DateTime::createFromFormat( '!j-n-Y', $DoMEaster . '-' . $MonthEaster . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $weekdayEaster = LitDateTime::createFromFormat( '!j-n-Y', $DoMEaster . '-' . $MonthEaster . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         $weekdayEasterCnt = 1;
         while ( $weekdayEaster >= $this->Cal->getFestivity( "Easter" )->date && $weekdayEaster < $this->Cal->getFestivity( "Pentecost" )->date ) {
-            $weekdayEaster = DateTime::createFromFormat( '!j-n-Y', $DoMEaster . '-' . $MonthEaster . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayEasterCnt . 'D' ) );
+            $weekdayEaster = LitDateTime::createFromFormat( '!j-n-Y', $DoMEaster . '-' . $MonthEaster . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->add( new DateInterval( 'P' . $weekdayEasterCnt . 'D' ) );
             if ( $this->Cal->notInSolemnitiesFeastsOrMemorials( $weekdayEaster ) && self::DateIsNotSunday( $weekdayEaster ) ) {
                 $upper =  (int)$weekdayEaster->format( 'z' );
                 $diff = $upper - (int)$this->Cal->getFestivity( "Easter" )->date->format( 'z' ); //day count between current day and Easter Sunday
@@ -1524,12 +1525,12 @@ private function calculateWeekdaysOrdinaryTime() : void {
 
         $ordWeekday = 1;
         $currentOrdWeek = 1;
-        $firstOrdinary = DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod );
-        $firstSunday = DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->modify( 'next Sunday' );
+        $firstOrdinary = LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod );
+        $firstSunday = LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->modify( 'next Sunday' );
         $dayFirstSunday =  (int)$firstSunday->format( 'z' );
 
         while ( $firstOrdinary >= $FirstWeekdaysLowerLimit && $firstOrdinary < $FirstWeekdaysUpperLimit ) {
-            $firstOrdinary = DateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->add( new DateInterval( 'P' . $ordWeekday . 'D' ) );
+            $firstOrdinary = LitDateTime::createFromFormat( '!j-n-Y', $this->BaptismLordFmt, new DateTimeZone( 'UTC' ) )->modify( $this->BaptismLordMod )->add( new DateInterval( 'P' . $ordWeekday . 'D' ) );
             if ( $this->Cal->notInSolemnitiesFeastsOrMemorials( $firstOrdinary ) ) {
                 //The Baptism of the Lord is the First Sunday, so the weekdays following are of the First Week of Ordinary Time
                 //After the Second Sunday, let's calculate which week of Ordinary Time we're in
@@ -1552,12 +1553,12 @@ private function calculateWeekdaysOrdinaryTime() : void {
         //In the second part of the year, weekdays of ordinary time begin the day after Pentecost
         $SecondWeekdaysLowerLimit = $this->Cal->getFestivity( "Pentecost" )->date;
         //and end with the Feast of Christ the King
-        $SecondWeekdaysUpperLimit = DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) );
+        $SecondWeekdaysUpperLimit = LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) );
 
         $ordWeekday = 1;
         //$currentOrdWeek = 1;
         $lastOrdinary = LitFunc::calcGregEaster( $this->LitSettings->Year )->add( new DateInterval( 'P' . ( 7 * 7 ) . 'D' ) );
-        $dayLastSunday =  (int)DateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) )->format( 'z' );
+        $dayLastSunday =  (int)LitDateTime::createFromFormat( '!j-n-Y', '25-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) )->modify( 'last Sunday' )->sub( new DateInterval( 'P' . ( 3 * 7 ) . 'D' ) )->format( 'z' );
 
         while ( $lastOrdinary >= $SecondWeekdaysLowerLimit && $lastOrdinary < $SecondWeekdaysUpperLimit ) {
             $lastOrdinary = LitFunc::calcGregEaster( $this->LitSettings->Year )->add( new DateInterval( 'P' . ( 7 * 7 + $ordWeekday ) . 'D' ) );
@@ -1589,7 +1590,7 @@ private function calculateSaturdayMemorialBVM() : void {
         $lastSatDT = new DateTime( "last Saturday December {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
         $SatMemBVM_cnt = 0;
         while( $currentSaturday <= $lastSatDT ){
-            $currentSaturday = DateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
+            $currentSaturday = LitDateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
             if( $this->Cal->notInSolemnitiesFeastsOrMemorials( $currentSaturday ) ) {
                 $memID = "SatMemBVM" . ++$SatMemBVM_cnt;
                 $name = $this->LitSettings->Locale === LitLocale::LATIN ? "Memoria Sanctæ Mariæ in Sabbato" : _( "Saturday Memorial of the Blessed Virgin Mary" );
@@ -1633,7 +1634,7 @@ private function loadNationalCalendarData() : void {
     }
 
     private function handleMissingFestivity( object $row ) : void {
-        $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+        $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
         //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
         if( $this->Cal->inSolemnitiesFeastsOrMemorials( $currentFeastDate ) || self::DateIsSunday( $currentFeastDate ) ) {
             $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $currentFeastDate, $this->LitSettings );
@@ -1779,7 +1780,7 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
             && $row->Festivity->day >= 1
             && $row->Festivity->day <= cal_days_in_month(CAL_GREGORIAN, $row->Festivity->month, $this->LitSettings->Year)
         ) {
-            $row->Festivity->DATE = DateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+            $row->Festivity->DATE = LitDateTime::createFromFormat( '!j-n-Y', "{$row->Festivity->day}-{$row->Festivity->month}-{$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
         } else {
             ob_start();
             var_dump($row);
@@ -1867,7 +1868,7 @@ private function handleNationalCalendarRows( array $rows ) : void {
                             }
                             break;
                         case "moveFestivity":
-                            $festivityNewDate = DateTime::createFromFormat( '!j-n-Y', $row->Festivity->day.'-'.$row->Festivity->month.'-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                            $festivityNewDate = LitDateTime::createFromFormat( '!j-n-Y', $row->Festivity->day.'-'.$row->Festivity->month.'-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                             $this->moveFestivityDate( $row->Festivity->tag, $festivityNewDate, $row->Metadata->reason, $row->Metadata->missal );
                             break;
                     }
@@ -1904,7 +1905,7 @@ private function applyNationalCalendar() : void {
                             );
                             $this->loadPropriumDeSanctisData( $missal );
                             foreach ( $this->tempCal[ $missal ] as $row ) {
-                                $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                                $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                                 if( !$this->Cal->inSolemnitiesOrFeasts( $currentFeastDate ) ) {
                                     $festivity = new Festivity( "[ {$this->NationalData->Metadata->Region} ] " . $row->NAME, $currentFeastDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON, $row->DISPLAYGRADE );
                                     $this->Cal->addFestivity( $row->TAG, $festivity );
@@ -1965,7 +1966,7 @@ private function makePatron( string $tag, string $nameSuffix, int $day, int $mon
             $this->Cal->setProperty( $tag, "common", LitCommon::PROPRIO );
         } else{
             //check what's going on, for example, if it's a Sunday or Solemnity
-            $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', "{$day}-{$month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+            $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', "{$day}-{$month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $row = $this->tempCal[ $EditionRomanMissal ][ $tag ];
             //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
             $FestivityName = $row->NAME . ", " .  $nameSuffix;
@@ -2026,7 +2027,7 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
                     $row = $this->tempCal[ RomanMissal::EDITIO_TYPICA_1970 ][ $tag ];
                     $festivity = new Festivity( $row->NAME, $newDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
                     $this->Cal->addFestivity( $tag, $festivity );
-                    $oldDate = DateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                    $oldDate = LitDateTime::createFromFormat( '!j-n-Y', $row->DAY . '-' . $row->MONTH . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                     $oldDateStr = $oldDate->format('F jS');
                 }
             }
@@ -2186,7 +2187,7 @@ private function applyDiocesanCalendar() {
             //if sinceYear is undefined or null or empty, let's go ahead and create the event in any case
             //creation will be restricted only if explicitly defined by the sinceYear property
             if( $this->LitSettings->Year >= $obj->sinceYear || $obj->sinceYear === null || $obj->sinceYear === 0 ) {
-                $currentFeastDate = DateTime::createFromFormat( '!j-n-Y', $obj->day . '-' . $obj->month . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+                $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', $obj->day . '-' . $obj->month . '-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
                 if( $obj->grade > LitGrade::FEAST ) {
                     if( $this->Cal->inSolemnities( $currentFeastDate ) && $key != $this->Cal->solemnityKeyFromDate( $currentFeastDate ) ) {
                         //there seems to be a coincidence with a different Solemnity on the same day!
@@ -2339,10 +2340,10 @@ private function generateResponse() {
             $SerializeableLitCal->Settings->DiocesanCalendar = $this->LitSettings->DiocesanCalendar;
         }
 
-        $SerializeableLitCal->Metadata->VERSION           = self::API_VERSION;
-        $SerializeableLitCal->Metadata->RequestHeaders   = $this->APICore->getJsonEncodedRequestHeaders();
-        $SerializeableLitCal->Metadata->Solemnities       = $this->Cal->getSolemnities();
-        $SerializeableLitCal->Metadata->FeastsMemorials  = $this->Cal->getFeastsAndMemorials();
+        $SerializeableLitCal->Metadata->VERSION             = self::API_VERSION;
+        $SerializeableLitCal->Metadata->RequestHeaders      = $this->APICore->getJsonEncodedRequestHeaders();
+        $SerializeableLitCal->Metadata->Solemnities         = $this->Cal->getSolemnities();
+        $SerializeableLitCal->Metadata->FeastsMemorials     = $this->Cal->getFeastsAndMemorials();
 
         //make sure we have an engineCache folder for the current Version
         if( realpath( "engineCache/v" . str_replace( ".", "_", self::API_VERSION ) ) === false ) {
diff --git a/includes/LitDateTime.php b/includes/LitDateTime.php
new file mode 100644
index 00000000..40e58b98
--- /dev/null
+++ b/includes/LitDateTime.php
@@ -0,0 +1,14 @@
+<?php
+
+class LitDateTime extends \DateTime implements \JsonSerializable
+{
+    public function jsonSerialize() : array
+    {
+        $tz = json_decode( json_encode( $this->getTimezone() ), true );
+        $returnArr = [
+            'date' => $this->format('c'), //serialize the DateTime object as a PHP timestamp
+            ...$tz
+        ];
+        return $returnArr;
+    }
+}
diff --git a/includes/LitFunc.php b/includes/LitFunc.php
index aec9d64f..09ee8cc7 100644
--- a/includes/LitFunc.php
+++ b/includes/LitFunc.php
@@ -1,5 +1,7 @@
 <?php
 
+include_once( 'includes/LitDateTime.php' );
+
 /**
  * Useful functions for LitCalEngine.php
  * @Author: John Romano D'Orazio
@@ -61,7 +63,7 @@ public static function calcGregEaster($Y) : DateTime {
     $month = floor(($h + $l - 7 * $m + 114) / 31);
     $day = (($h + $l - 7 * $m + 114) % 31) + 1;
 
-    $dateObj   = DateTime::createFromFormat('!j-n-Y', $day . '-' . $month . '-' . $Y, new DateTimeZone('UTC'));
+    $dateObj   = LitDateTime::createFromFormat('!j-n-Y', $day . '-' . $month . '-' . $Y, new DateTimeZone('UTC'));
 
     return $dateObj;
   }
@@ -80,7 +82,7 @@ public static function calcJulianEaster( int $Y, bool $gregCal=false ) : DateTim
     $month = floor( ($d + $e + 114) / 31 );
     $day = ( ($d + $e + 114) % 31 ) + 1;
 
-    $dateObj   = DateTime::createFromFormat('!j-n-Y', $day.'-'.$month.'-'.$Y, new DateTimeZone( 'UTC' ));
+    $dateObj   = LitDateTime::createFromFormat('!j-n-Y', $day.'-'.$month.'-'.$Y, new DateTimeZone( 'UTC' ));
     if($gregCal){
         //from February 29th 2100 Julian (March 14th 2100 Gregorian), 
         //the difference between the Julian and Gregorian calendars will increase to 14 days
@@ -89,12 +91,12 @@ public static function calcJulianEaster( int $Y, bool $gregCal=false ) : DateTim
         $dateObj->add(new DateInterval($dateDiff));
         */
         $GregDateDiff = array();
-        $GregDateDiff[0] = [DateTime::createFromFormat('!j-n-Y', '4-10-1582'),"P10D"]; //add 10 == GREGORIAN CUTOVER DATE
+        $GregDateDiff[0] = [LitDateTime::createFromFormat('!j-n-Y', '4-10-1582'),"P10D"]; //add 10 == GREGORIAN CUTOVER DATE
         $idx = 0;
         $cc = 10;
         for($cent = 17;$cent <= 99; $cent++){
             if($cent % 4 > 0){
-                $GregDateDiff[++$idx] = [DateTime::createFromFormat('!j-n-Y', '28-2-'.$cent.'00'),"P" . ++$cc . "D"];
+                $GregDateDiff[++$idx] = [LitDateTime::createFromFormat('!j-n-Y', '28-2-'.$cent.'00'),"P" . ++$cc . "D"];
             }
         }
 
@@ -105,18 +107,18 @@ public static function calcJulianEaster( int $Y, bool $gregCal=false ) : DateTim
             }
         }
         /*
-        $GregDateDiff[1] = DateTime::createFromFormat('!j-n-Y', '28-2-1700'); //add 11 (1600 was a leap year)
-        $GregDateDiff[2] = DateTime::createFromFormat('!j-n-Y', '28-2-1800'); //add 12
-        $GregDateDiff[3] = DateTime::createFromFormat('!j-n-Y', '28-2-1900'); //add 13
-        $GregDateDiff[4] = DateTime::createFromFormat('!j-n-Y', '28-2-2100'); //add 14 (2000 was a leap year)
-        $GregDateDiff[5] = DateTime::createFromFormat('!j-n-Y', '28-2-2200'); //add 15
-        $GregDateDiff[6] = DateTime::createFromFormat('!j-n-Y', '28-2-2300'); //add 16
-        $GregDateDiff[7] = DateTime::createFromFormat('!j-n-Y', '28-2-2500'); //add 17 (2400 will be a leap year)
-        $GregDateDiff[8] = DateTime::createFromFormat('!j-n-Y', '28-2-2600'); //add 18 
-        $GregDateDiff[9] = DateTime::createFromFormat('!j-n-Y', '28-2-2700'); //add 19 
-        $GregDateDiff[10] = DateTime::createFromFormat('!j-n-Y', '28-2-2900'); //add 20 (2800 will be a leap year)
-        $GregDateDiff[11] = DateTime::createFromFormat('!j-n-Y', '28-2-3000'); //add 21 
-        $GregDateDiff[12] = DateTime::createFromFormat('!j-n-Y', '28-2-3100'); //add 22 
+        $GregDateDiff[1] = LitDateTime::createFromFormat('!j-n-Y', '28-2-1700'); //add 11 (1600 was a leap year)
+        $GregDateDiff[2] = LitDateTime::createFromFormat('!j-n-Y', '28-2-1800'); //add 12
+        $GregDateDiff[3] = LitDateTime::createFromFormat('!j-n-Y', '28-2-1900'); //add 13
+        $GregDateDiff[4] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2100'); //add 14 (2000 was a leap year)
+        $GregDateDiff[5] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2200'); //add 15
+        $GregDateDiff[6] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2300'); //add 16
+        $GregDateDiff[7] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2500'); //add 17 (2400 will be a leap year)
+        $GregDateDiff[8] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2600'); //add 18 
+        $GregDateDiff[9] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2700'); //add 19 
+        $GregDateDiff[10] = LitDateTime::createFromFormat('!j-n-Y', '28-2-2900'); //add 20 (2800 will be a leap year)
+        $GregDateDiff[11] = LitDateTime::createFromFormat('!j-n-Y', '28-2-3000'); //add 21 
+        $GregDateDiff[12] = LitDateTime::createFromFormat('!j-n-Y', '28-2-3100'); //add 22 
         */
     }
     return $dateObj;
diff --git a/includes/enums/LitSchema.php b/includes/enums/LitSchema.php
index 0190d739..8f05e7a9 100644
--- a/includes/enums/LitSchema.php
+++ b/includes/enums/LitSchema.php
@@ -11,6 +11,7 @@ class LitSchema {
     const DECREEMEMORIALS   = "https://litcal.org/api/dev/schemas/MemorialsFromDecrees.json";
     const I18N              = "https://litcal.org/api/dev/schemas/LitCalTranslation.json";
     const METADATA          = "https://litcal.org/api/dev/schemas/LitCalMetadata.json";
+    const LITCAL            = "https://litcal.org/api/dev/schemas/LitCal.json";
 
     const ERROR_MESSAGES = [
         LitSchema::INDEX             => "Schema validation error: Index not updated",
@@ -21,7 +22,8 @@ class LitSchema {
         LitSchema::WIDERREGION       => "Schema validation error: Wider Region data not created / updated",
         LitSchema::DECREEMEMORIALS   => "Schema validation error: Memorials from Decrees data not created / updated",
         LitSchema::I18N              => "Schema validation error: Translation data not created / updated",
-        LitSchema::METADATA          => "Schema validation error: LitCalMetadata not valid"
+        LitSchema::METADATA          => "Schema validation error: LitCalMetadata not valid",
+        LitSchema::LITCAL            => "Schema validation error: LitCal not valid"
     ];
 
 }
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 5138306f..8cccd01f 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -3,6 +3,7 @@
     "definitions": {
         "LitColor": {
             "type": "array",
+            "uniqueItems": true,
             "items": {
                 "type": "string",
                 "enum": [
@@ -17,6 +18,9 @@
         },
         "LitCommon": {
             "type": "array",
+            "minItems": 0,
+            "maxItems": 3,
+            "uniqueItems": true,
             "items": {
                 "type": "string",
                 "enum": [ 
@@ -183,6 +187,7 @@
         },
         "DecreeLangs": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "DE": {
                     "type": "string",
@@ -262,6 +267,7 @@
         },
         "Missals": {
             "type": "array",
+            "uniqueItems": true,
             "description": "Missals as defined in the PHP RomanMissal enum, from which data for the current calendar is drawn",
             "items": {
                 "$ref": "#/definitions/Missal"
@@ -339,12 +345,12 @@
                 "BAHRAIN",
                 "BANGLADESH",
                 "BARBADOS",
+                "BELARUS",
                 "BELGIUM",
                 "BELIZE",
                 "BENIN",
                 "BERMUDA",
                 "BHUTAN",
-                "BELARUS",
                 "BOLIVIA",
                 "BOSNIA & HERZEGOVINA",
                 "BOTSWANA",
@@ -359,9 +365,9 @@
                 "CAMEROON",
                 "CANADA",
                 "CANARY ISLANDS",
-                "CAYMAN ISLANDS",
                 "CAPE VERDE",
                 "CARIBBEAN NETHERLANDS",
+                "CAYMAN ISLANDS",
                 "CENTRAL AFRICAN REPUBLIC",
                 "CEUTA & MELILLA",
                 "CHAD",
@@ -374,13 +380,13 @@
                 "CONGO - BRAZZAVILLE",
                 "CONGO - KINSHASA",
                 "COOK ISLANDS",
-                "CYPRUS",
-                "CZECHIA",
                 "COSTA RICA",
                 "CÔTE D’IVOIRE",
                 "CROATIA",
                 "CUBA",
                 "CURAÇAO",
+                "CYPRUS",
+                "CZECHIA",
                 "DENMARK",
                 "DIEGO GARCIA",
                 "DJIBOUTI",
@@ -390,18 +396,18 @@
                 "EGYPT",
                 "EL SALVADOR",
                 "EQUATORIAL GUINEA",
-                "ESWATINI",
                 "ERITREA",
                 "ESTONIA",
+                "ESWATINI",
                 "ETHIOPIA",
                 "EUROPE",
-                "FAROE ISLANDS",
                 "FALKLAND ISLANDS",
+                "FAROE ISLANDS",
                 "FIJI",
                 "FINLAND",
-                "FRENCH POLYNESIA",
                 "FRANCE",
                 "FRENCH GUIANA",
+                "FRENCH POLYNESIA",
                 "GABON",
                 "GAMBIA",
                 "GEORGIA",
@@ -409,8 +415,8 @@
                 "GHANA",
                 "GIBRALTAR",
                 "GREECE",
-                "GRENADA",
                 "GREENLAND",
+                "GRENADA",
                 "GUADELOUPE",
                 "GUAM",
                 "GUATEMALA",
@@ -422,30 +428,30 @@
                 "HONDURAS",
                 "HONG KONG SAR CHINA",
                 "HUNGARY",
+                "ICELAND",
                 "INDIA",
                 "INDONESIA",
-                "ICELAND",
                 "IRAN",
                 "IRAQ",
                 "IRELAND",
                 "ISLE OF MAN",
                 "ISRAEL",
                 "ITALY",
-                "JERSEY",
                 "JAMAICA",
                 "JAPAN",
+                "JERSEY",
                 "JORDAN",
                 "KAZAKHSTAN",
                 "KENYA",
-                "KYRGYZSTAN",
                 "KIRIBATI",
                 "KOSOVO",
                 "KUWAIT",
-                "LATIN AMERICA",
+                "KYRGYZSTAN",
                 "LAOS",
-                "LESOTHO",
+                "LATIN AMERICA",
                 "LATVIA",
                 "LEBANON",
+                "LESOTHO",
                 "LIBERIA",
                 "LIBYA",
                 "LIECHTENSTEIN",
@@ -457,7 +463,7 @@
                 "MALAYSIA",
                 "MALI",
                 "MALTA",
-                "MOROCCO",
+                "MARSHALL ISLANDS",
                 "MARTINIQUE",
                 "MAURITANIA",
                 "MAURITIUS",
@@ -469,10 +475,9 @@
                 "MONGOLIA",
                 "MONTENEGRO",
                 "MONTSERRAT",
+                "MOROCCO",
                 "MOZAMBIQUE",
                 "MYANMAR (BURMA)",
-                "MARSHALL ISLANDS",
-                "NORTHERN MARIANA ISLANDS",
                 "NAMIBIA",
                 "NAURU",
                 "NEPAL",
@@ -486,6 +491,7 @@
                 "NORFOLK ISLAND",
                 "NORTH KOREA",
                 "NORTH MACEDONIA",
+                "NORTHERN MARIANA ISLANDS",
                 "NORWAY",
                 "OMAN",
                 "PAKISTAN",
@@ -496,26 +502,17 @@
                 "PARAGUAY",
                 "PERU",
                 "PHILIPPINES",
+                "PITCAIRN ISLANDS",
                 "POLAND",
                 "PORTUGAL",
                 "PUERTO RICO",
-                "PITCAIRN ISLANDS",
                 "QATAR",
                 "RÉUNION",
                 "ROMANIA",
-                "RWANDA",
                 "RUSSIA",
-                "SOLOMON ISLANDS",
-                "SOUTH KOREA",
-                "ST_ KITTS & NEVIS",
-                "ST_ LUCIA",
-                "ST_ MARTIN",
-                "ST_ VINCENT & GRENADINES",
-                "ST_ BARTHÉLEMY",
-                "ST_ PIERRE & MIQUELON",
+                "RWANDA",
                 "SAMOA",
                 "SAN MARINO",
-                "ST_ HELENA",
                 "SÃO TOMÉ & PRÍNCIPE",
                 "SAUDI ARABIA",
                 "SENEGAL",
@@ -524,21 +521,30 @@
                 "SIERRA LEONE",
                 "SINGAPORE",
                 "SINT MAARTEN",
-                "SYRIA",
                 "SLOVAKIA",
                 "SLOVENIA",
+                "SOLOMON ISLANDS",
                 "SOMALIA",
+                "SOUTH AFRICA",
+                "SOUTH KOREA",
+                "SOUTH SUDAN",
                 "SPAIN",
                 "SRI LANKA",
-                "SOUTH SUDAN",
-                "SOUTH AFRICA",
+                "ST_ BARTHÉLEMY",
+                "ST_ HELENA",
+                "ST_ KITTS & NEVIS",
+                "ST_ LUCIA",
+                "ST_ MARTIN",
+                "ST_ PIERRE & MIQUELON",
+                "ST_ VINCENT & GRENADINES",
                 "SUDAN",
                 "SURINAME",
                 "SVALBARD & JAN MAYEN",
                 "SWEDEN",
                 "SWITZERLAND",
-                "TAJIKISTAN",
+                "SYRIA",
                 "TAIWAN",
+                "TAJIKISTAN",
                 "TANZANIA",
                 "THAILAND",
                 "TIMOR-LESTE",
@@ -549,21 +555,20 @@
                 "TUNISIA",
                 "TURKEY",
                 "TURKMENISTAN",
-                "TUVALU",
                 "TURKS & CAICOS ISLANDS",
+                "TUVALU",
+                "U_S_ OUTLYING ISLANDS",
                 "U_S_ VIRGIN ISLANDS",
-                "UNITED KINGDOM",
                 "UGANDA",
                 "UKRAINE",
                 "UNITED ARAB EMIRATES",
-                "UNITED STATES",
+                "UNITED KINGDOM",
                 "USA",
                 "URUGUAY",
-                "U_S_ OUTLYING ISLANDS",
                 "UZBEKISTAN",
                 "VANUATU",
-                "VATICAN CITY",
                 "VATICAN",
+                "VATICAN CITY",
                 "VENEZUELA",
                 "VIETNAM",
                 "WALLIS & FUTUNA",
diff --git a/schemas/Index.json b/schemas/Index.json
index 233c670d..60052765 100644
--- a/schemas/Index.json
+++ b/schemas/Index.json
@@ -7,265 +7,14 @@
             "patternProperties": {
                 "[A-Z]{1,255}": {
                     "type": "object",
+                    "additionalProperties": false,
                     "properties": {
                         "path": {
                             "type": "string",
                             "pattern": "^nations\\\/[A-Z &()\\-]+\\\/[a-zA-Z0-9 ()-]+\\.json$"
                         },
                         "nation": {
-                            "type": "string",
-                            "enum": [
-                                "AFGHANISTAN",
-                                "ÅLAND ISLANDS",
-                                "ALBANIA",
-                                "ALGERIA",
-                                "AMERICAN SAMOA",
-                                "ANDORRA",
-                                "ANGOLA",
-                                "ANGUILLA",
-                                "ANTIGUA & BARBUDA",
-                                "ARGENTINA",
-                                "ARMENIA",
-                                "ARUBA",
-                                "AUSTRALIA",
-                                "AUSTRIA",
-                                "AZERBAIJAN",
-                                "BAHAMAS",
-                                "BAHRAIN",
-                                "BANGLADESH",
-                                "BARBADOS",
-                                "BELARUS",
-                                "BELGIUM",
-                                "BELIZE",
-                                "BENIN",
-                                "BERMUDA",
-                                "BHUTAN",
-                                "BOLIVIA",
-                                "BOSNIA & HERZEGOVINA",
-                                "BOTSWANA",
-                                "BRAZIL",
-                                "BRITISH INDIAN OCEAN TERRITORY",
-                                "BRITISH VIRGIN ISLANDS",
-                                "BRUNEI",
-                                "BULGARIA",
-                                "BURKINA FASO",
-                                "BURUNDI",
-                                "CAMBODIA",
-                                "CAMEROON",
-                                "CANADA",
-                                "CANARY ISLANDS",
-                                "CAPE VERDE",
-                                "CARIBBEAN NETHERLANDS",
-                                "CAYMAN ISLANDS",
-                                "CENTRAL AFRICAN REPUBLIC",
-                                "CEUTA & MELILLA",
-                                "CHAD",
-                                "CHILE",
-                                "CHINA",
-                                "CHRISTMAS ISLAND",
-                                "COCOS (KEELING) ISLANDS",
-                                "COLOMBIA",
-                                "COMOROS",
-                                "CONGO - BRAZZAVILLE",
-                                "CONGO - KINSHASA",
-                                "COOK ISLANDS",
-                                "COSTA RICA",
-                                "CÔTE D’IVOIRE",
-                                "CROATIA",
-                                "CUBA",
-                                "CURAÇAO",
-                                "CYPRUS",
-                                "CZECHIA",
-                                "DENMARK",
-                                "DIEGO GARCIA",
-                                "DJIBOUTI",
-                                "DOMINICA",
-                                "DOMINICAN REPUBLIC",
-                                "ECUADOR",
-                                "EGYPT",
-                                "EL SALVADOR",
-                                "EQUATORIAL GUINEA",
-                                "ERITREA",
-                                "ESTONIA",
-                                "ESWATINI",
-                                "ETHIOPIA",
-                                "EUROPE",
-                                "FALKLAND ISLANDS",
-                                "FAROE ISLANDS",
-                                "FIJI",
-                                "FINLAND",
-                                "FRANCE",
-                                "FRENCH GUIANA",
-                                "FRENCH POLYNESIA",
-                                "GABON",
-                                "GAMBIA",
-                                "GEORGIA",
-                                "GERMANY",
-                                "GHANA",
-                                "GIBRALTAR",
-                                "GREECE",
-                                "GREENLAND",
-                                "GRENADA",
-                                "GUADELOUPE",
-                                "GUAM",
-                                "GUATEMALA",
-                                "GUERNSEY",
-                                "GUINEA",
-                                "GUINEA-BISSAU",
-                                "GUYANA",
-                                "HAITI",
-                                "HONDURAS",
-                                "HONG KONG SAR CHINA",
-                                "HUNGARY",
-                                "ICELAND",
-                                "INDIA",
-                                "INDONESIA",
-                                "IRAN",
-                                "IRAQ",
-                                "IRELAND",
-                                "ISLE OF MAN",
-                                "ISRAEL",
-                                "ITALY",
-                                "JAMAICA",
-                                "JAPAN",
-                                "JERSEY",
-                                "JORDAN",
-                                "KAZAKHSTAN",
-                                "KENYA",
-                                "KIRIBATI",
-                                "KOSOVO",
-                                "KUWAIT",
-                                "KYRGYZSTAN",
-                                "LAOS",
-                                "LATIN AMERICA",
-                                "LATVIA",
-                                "LEBANON",
-                                "LESOTHO",
-                                "LIBERIA",
-                                "LIBYA",
-                                "LIECHTENSTEIN",
-                                "LITHUANIA",
-                                "LUXEMBOURG",
-                                "MACAO SAR CHINA",
-                                "MADAGASCAR",
-                                "MALAWI",
-                                "MALAYSIA",
-                                "MALI",
-                                "MALTA",
-                                "MARSHALL ISLANDS",
-                                "MARTINIQUE",
-                                "MAURITANIA",
-                                "MAURITIUS",
-                                "MAYOTTE",
-                                "MEXICO",
-                                "MICRONESIA",
-                                "MOLDOVA",
-                                "MONACO",
-                                "MONGOLIA",
-                                "MONTENEGRO",
-                                "MONTSERRAT",
-                                "MOROCCO",
-                                "MOZAMBIQUE",
-                                "MYANMAR (BURMA)",
-                                "NAMIBIA",
-                                "NAURU",
-                                "NEPAL",
-                                "NETHERLANDS",
-                                "NEW CALEDONIA",
-                                "NEW ZEALAND",
-                                "NICARAGUA",
-                                "NIGER",
-                                "NIGERIA",
-                                "NIUE",
-                                "NORFOLK ISLAND",
-                                "NORTH KOREA",
-                                "NORTH MACEDONIA",
-                                "NORTHERN MARIANA ISLANDS",
-                                "NORWAY",
-                                "OMAN",
-                                "PAKISTAN",
-                                "PALAU",
-                                "PALESTINIAN TERRITORIES",
-                                "PANAMA",
-                                "PAPUA NEW GUINEA",
-                                "PARAGUAY",
-                                "PERU",
-                                "PHILIPPINES",
-                                "PITCAIRN ISLANDS",
-                                "POLAND",
-                                "PORTUGAL",
-                                "PUERTO RICO",
-                                "QATAR",
-                                "RÉUNION",
-                                "ROMANIA",
-                                "RUSSIA",
-                                "RWANDA",
-                                "SAMOA",
-                                "SAN MARINO",
-                                "SÃO TOMÉ & PRÍNCIPE",
-                                "SAUDI ARABIA",
-                                "SENEGAL",
-                                "SERBIA",
-                                "SEYCHELLES",
-                                "SIERRA LEONE",
-                                "SINGAPORE",
-                                "SINT MAARTEN",
-                                "SLOVAKIA",
-                                "SLOVENIA",
-                                "SOLOMON ISLANDS",
-                                "SOMALIA",
-                                "SOUTH AFRICA",
-                                "SOUTH KOREA",
-                                "SOUTH SUDAN",
-                                "SPAIN",
-                                "SRI LANKA",
-                                "ST. BARTHÉLEMY",
-                                "ST. HELENA",
-                                "ST. KITTS & NEVIS",
-                                "ST. LUCIA",
-                                "ST. MARTIN",
-                                "ST. PIERRE & MIQUELON",
-                                "ST. VINCENT & GRENADINES",
-                                "SUDAN",
-                                "SURINAME",
-                                "SVALBARD & JAN MAYEN",
-                                "SWEDEN",
-                                "SWITZERLAND",
-                                "SYRIA",
-                                "TAIWAN",
-                                "TAJIKISTAN",
-                                "TANZANIA",
-                                "THAILAND",
-                                "TIMOR-LESTE",
-                                "TOGO",
-                                "TOKELAU",
-                                "TONGA",
-                                "TRINIDAD & TOBAGO",
-                                "TUNISIA",
-                                "TURKEY",
-                                "TURKMENISTAN",
-                                "TURKS & CAICOS ISLANDS",
-                                "TUVALU",
-                                "U.S. OUTLYING ISLANDS",
-                                "U.S. VIRGIN ISLANDS",
-                                "UGANDA",
-                                "UKRAINE",
-                                "UNITED ARAB EMIRATES",
-                                "UNITED KINGDOM",
-                                "USA",
-                                "URUGUAY",
-                                "UZBEKISTAN",
-                                "VANUATU",
-                                "VATICAN CITY",
-                                "VENEZUELA",
-                                "VIETNAM",
-                                "WALLIS & FUTUNA",
-                                "WESTERN SAHARA",
-                                "WORLD",
-                                "YEMEN",
-                                "ZAMBIA",
-                                "ZIMBABWE"
-                            ]
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
                         },
                         "diocese": {
                             "type": "string"
diff --git a/schemas/LitCal.json b/schemas/LitCal.json
new file mode 100644
index 00000000..5d0f0fd1
--- /dev/null
+++ b/schemas/LitCal.json
@@ -0,0 +1,193 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/LitCal",
+    "definitions": {
+        "LitCal": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "Settings": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "Year": {
+                            "type": "integer",
+                            "minimum": 1969,
+                            "maximum": 9999
+                        },
+                        "Epiphany": {
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Epiphany"
+                        },
+                        "Ascension": {
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Ascension"
+                        },
+                        "CorpusChristi": {
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/CorpusChristi"
+                        },
+                        "Locale": {
+                            "type": "string",
+                            "enum": [
+                                "DE",
+                                "EN",
+                                "ES",
+                                "FR",
+                                "IT",
+                                "LA",
+                                "PT"
+                            ]
+                        },
+                        "ReturnType": {
+                            "type": "string",
+                            "enum": [
+                                "ICS",
+                                "JSON",
+                                "XML"
+                            ]
+                        },
+                        "NationalCalendar": {
+                            "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                        }
+                    },
+                    "required": [
+                        "Year",
+                        "Epiphany",
+                        "Ascension",
+                        "CorpusChristi",
+                        "Locale",
+                        "ReturnType",
+                        "NationalCalendar"
+                    ]
+                },
+                "Metadata": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "VERSION": {
+                            "type": "string",
+                            "minLength": 3,
+                            "maxLength": 5,
+                            "pattern": "^(?:0|[1-9]\\d*)\\.(?:0|[1-9]\\d*)$"
+                        },
+                        "RequestHeaders": {
+                            "type": "string",
+                            "contentMediaType": "application/json"
+                        },
+                        "Solemnities": {
+                            "$ref": "#/definitions/DateTimeObjectCollection"
+                        },
+                        "FeastsMemorials": {
+                            "$ref": "#/definitions/DateTimeObjectCollection"
+                        }
+                    },
+                    "required": [
+                        "VERSION",
+                        "RequestHeaders",
+                        "Solemnities",
+                        "FeastsMemorials"
+                    ]
+                },
+                "LitCal": {
+                    "type": "object",
+                    "patternProperties": {
+                        "": {
+                            "$ref": "#/definitions/Festivity"
+                        }
+                    }
+                },
+                "Messages": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "Settings",
+                "Metadata",
+                "LitCal",
+                "Messages"
+            ]
+        },
+        "DateTimeObjectCollection": {
+            "type": "object",
+            "patternProperties": {
+                "": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "date": {
+                            "type": "string",
+                            "format": "date-time"
+                        },
+                        "timezone_type": {
+                            "type": "integer",
+                            "const": 3
+                        },
+                        "timezone": {
+                            "type": "string",
+                            "const": "UTC"
+                        }
+                    }
+                }
+            }
+        },
+        "Festivity": {
+            "type": "object",
+            "properties": {
+                "eventIdx": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 999
+                },
+                "name": {
+                    "type": "string"
+                },
+                "date": {
+                    "type": "integer",
+                    "minimum": -86400,
+                    "maximum": 253402214400
+                },
+                "color": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
+                },
+                "type": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitFeastType"
+                },
+                "grade": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitGrade"
+                },
+                "displayGrade": {
+                    "type": "string"
+                },
+                "common": {
+                    "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitCommon"
+                },
+                "liturgicalYear": {
+                    "type": "string"
+                },
+                "isVigilMass": {
+                    "type": "boolean"
+                },
+                "hasVigilMass":  {
+                    "type": "boolean"
+                },
+                "hasVesperI":  {
+                    "type": "boolean"
+                },
+                "hasVesperII":  {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "eventIdx",
+                "name",
+                "date",
+                "color",
+                "type",
+                "grade",
+                "displayGrade",
+                "common"
+            ]
+        }
+    }
+}
diff --git a/schemas/PropriumDeTempore.json b/schemas/PropriumDeTempore.json
index 05fb1bf1..8ca1dd70 100644
--- a/schemas/PropriumDeTempore.json
+++ b/schemas/PropriumDeTempore.json
@@ -12,6 +12,7 @@
         },
         "LitEvent": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "READINGS": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Readings"
diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json
index 554947fd..8d127075 100644
--- a/schemas/WiderRegionCalendar.json
+++ b/schemas/WiderRegionCalendar.json
@@ -375,6 +375,7 @@
         },
         "CalendarMetadata": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "IsMultilingual": {
                     "type": "boolean"

From f777a0bed61c0d245956ca66aa6071d05bfd6138 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 21 May 2022 23:09:11 +0000
Subject: [PATCH 126/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 134 ++++++++++++++++++++++++------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 43bb6409..95bcfe67 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,106 +17,106 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -144,15 +144,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -163,7 +163,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -178,12 +178,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -216,7 +216,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -229,14 +229,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -263,7 +263,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -278,7 +278,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -291,14 +291,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -329,21 +329,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -351,7 +351,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -359,7 +359,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -368,26 +368,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -413,20 +413,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -474,15 +474,15 @@ msgid "or"
 msgstr ""
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr ""
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -490,7 +490,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -499,7 +499,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -508,7 +508,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From e90eaa0a8299952d6ec9c661720a61a80eaea816 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 22 May 2022 01:09:16 +0200
Subject: [PATCH 127/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 134 ++++++++++++++++-----------------
 i18n/es/LC_MESSAGES/litcal.po | 136 +++++++++++++++++-----------------
 i18n/fr/LC_MESSAGES/litcal.po | 134 ++++++++++++++++-----------------
 i18n/it/LC_MESSAGES/litcal.po | 134 ++++++++++++++++-----------------
 i18n/la/LC_MESSAGES/litcal.po | 134 ++++++++++++++++-----------------
 i18n/pt/LC_MESSAGES/litcal.po | 134 ++++++++++++++++-----------------
 6 files changed, 403 insertions(+), 403 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 12459006..6314829e 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -476,15 +476,15 @@ msgid "or"
 msgstr ""
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr ""
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -492,7 +492,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -501,7 +501,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -510,7 +510,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 14017704..86e57f4a 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-05-21 10:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,28 +27,28 @@ msgid ""
 msgstr ""
 "Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s día antes de la Epifanía"
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s día después de la Epifanía"
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -57,71 +57,71 @@ msgstr ""
 "La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
 "celebración ha sido trasladada a %s (%s) según el %s."
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr "Sábado anterior al Domingo de Ramos"
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -149,15 +149,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -168,7 +168,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -183,12 +183,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -221,7 +221,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -234,14 +234,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -268,7 +268,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -283,7 +283,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -296,14 +296,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -317,7 +317,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -334,21 +334,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -356,7 +356,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -364,7 +364,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -373,26 +373,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -418,20 +418,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -479,15 +479,15 @@ msgid "or"
 msgstr ""
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr ""
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -495,7 +495,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -504,7 +504,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -513,7 +513,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index 526aff32..c6d097b7 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -476,15 +476,15 @@ msgid "or"
 msgstr ""
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr ""
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -492,7 +492,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -501,7 +501,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -510,7 +510,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index da35890d..4050f191 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -28,28 +28,28 @@ msgstr ""
 "Sono supportati anni dal 1970 in poi soltanto. Tu invece hai provato a "
 "richiedere l'anno %d."
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per il santorale di: %s."
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per la traduzione del santorale di: %s."
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s giorno prima dell'Epifania"
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s giorno dopo l'Epifania"
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -58,30 +58,30 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
 "celebrazione è stata trasferita al %s (%s) in accordo con il %s."
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabato che precede la Domenica delle Palme"
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "lunedì che segue la Seconda Domenica di Pasqua"
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr "lunedì seguente"
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -90,7 +90,7 @@ msgstr ""
 "La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -99,7 +99,7 @@ msgstr ""
 "Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
 "nell'anno %d, la prima è stata anticipata di un giorno come da %s."
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -108,27 +108,27 @@ msgstr ""
 "'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
 "viene celebrata il %s anziché la Domenica dopo Natale."
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "della %s Settimana dell'Avvento"
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "%s Giorno dell'Ottava di Natale"
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "della %s Settimana di Quaresima"
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr "dopo il Mercoledì delle Ceneri"
 
@@ -156,8 +156,8 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -166,7 +166,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -179,7 +179,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -197,12 +197,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "La %1$s '%2$s' è soppiantata dalla %3$s '%4$s' nell'anno %5$d."
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr "Costituzione Apostolica Missale Romanum"
 
@@ -217,7 +217,7 @@ msgstr "Costituzione Apostolica Missale Romanum"
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -238,7 +238,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -253,7 +253,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -262,7 +262,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -274,7 +274,7 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -291,7 +291,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -308,7 +308,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -323,7 +323,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -332,7 +332,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -346,7 +346,7 @@ msgstr "e Dottore della Chiesa"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -365,7 +365,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -374,7 +374,7 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -383,7 +383,7 @@ msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -394,7 +394,7 @@ msgstr ""
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -405,7 +405,7 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -418,28 +418,28 @@ msgstr ""
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 "Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
 "dal file %s."
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -468,7 +468,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -477,13 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
@@ -545,15 +545,15 @@ msgid "or"
 msgstr "oppure"
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr "ANNO"
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr "Messa della vigilia"
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -564,7 +564,7 @@ msgstr ""
 "Secondo il %s, la prima ha la precedenza, pertanto la Messa nella Vigilia è "
 "confermata come anche i Primi Vespri."
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -577,7 +577,7 @@ msgstr ""
 "Messa di Vigilia, mentre l'ultima Solennità non avrà né i Secondi Vespri né "
 "una Messa serale."
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -590,7 +590,7 @@ msgstr ""
 "e una Messa serale, mentre la prima Solennità non avrà né una Messa di "
 "Vigilia né i Primi Vespri."
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 0a556073..e94712cf 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
@@ -27,28 +27,28 @@ msgid ""
 msgstr ""
 "Petere potes nisi ab annis MCMLXX et ultra. Tu anno %d conatus est petere."
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "Dies %s ante Epiphaniam"
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "Dies %s post Epiphaniam"
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
@@ -57,30 +57,30 @@ msgstr ""
 "Coincidet enim Sollemnitas <i>'%s'</i> cum <b>%s</b> in anno %d, ergo "
 "traslata est celebratio ad %s (%s) secundum %s."
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabbatum ante Dominicam in Palmis"
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "diem Lunæ post Dominicam Secundam Paschæ"
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr "diem Lunæ proximum"
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
@@ -89,7 +89,7 @@ msgstr ""
 "Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in anno %d. "
 "Oportet quaerere a Congregatione Cultu Divino quid facere!"
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
@@ -98,7 +98,7 @@ msgstr ""
 "Ex causa Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in "
 "anno %d, anticipata est ab uno die secundum %s."
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
@@ -107,27 +107,27 @@ msgstr ""
 "'%s' coincidet cum Dominica in anno %d, ergo Festum <i>'%s'</i> celebrentur "
 "die %s quam Dominica post Nativitate."
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "Hebdomadæ %s Adventus"
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "Dies %s Octavæ Nativitatis"
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "Hebdomadæ %s Quadragesimæ"
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr "post Feria IV Cinerum"
 
@@ -155,8 +155,8 @@ msgstr "post Feria IV Cinerum"
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -165,7 +165,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -176,7 +176,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -194,12 +194,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "%1$s '%2$s' subplantata est ab %3$s '%4$s' in anno %5$d."
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -234,7 +234,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -249,7 +249,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -258,7 +258,7 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum (%4$s)."
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -270,7 +270,7 @@ msgstr "dies Lunae post Pentecostem"
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -287,7 +287,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -304,7 +304,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -319,7 +319,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -328,7 +328,7 @@ msgstr ""
 "'%1$s' declarato/a est Doctor Ecclesiæ ab anno %2$d, ergo applicatur ad anno "
 "%3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -344,7 +344,7 @@ msgstr "Dedicationis ecclesiæ"
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -363,7 +363,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -372,7 +372,7 @@ msgstr ""
 "In anno %1$d, %2$s '%3$s' subplantata est ad %4$s '%5$s', aggregata in die "
 "%6$s ab anno %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
@@ -381,7 +381,7 @@ msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -392,7 +392,7 @@ msgstr ""
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -403,7 +403,7 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -415,26 +415,26 @@ msgstr ""
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -462,7 +462,7 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -471,13 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
@@ -538,15 +538,15 @@ msgid "or"
 msgstr "vel"
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr "ANNUM"
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr "Missa in Vigilia"
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -554,7 +554,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -563,7 +563,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -575,7 +575,7 @@ msgstr ""
 "praecedentia habet, ergo servabit Secundis Vesperis atque Missa vesperum, "
 "cum Sollemnitas prima neque Missa in Vigilia neque Primis Vesperis servabit."
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 088a51e6..7dd6412a 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-20 00:12+0000\n"
+"POT-Creation-Date: 2022-05-21 23:09+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -19,106 +19,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: includes/LitCalAPI.php:228
+#: includes/LitCalAPI.php:229
 #, php-format
 msgid ""
 "Only years from 1970 and after are supported. You tried requesting the year "
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:263
+#: includes/LitCalAPI.php:264
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:269
+#: includes/LitCalAPI.php:270
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:345 includes/LitCalAPI.php:384
+#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:359 includes/LitCalAPI.php:397
+#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:549 includes/LitCalAPI.php:565
-#: includes/LitCalAPI.php:591
+#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
+#: includes/LitCalAPI.php:592
 #, php-format
 msgid ""
 "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
 "transferred to %s (%s) as per the %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:553
+#: includes/LitCalAPI.php:554
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:558 includes/LitCalAPI.php:574
-#: includes/LitCalAPI.php:600 includes/LitCalAPI.php:628
-#: includes/LitCalAPI.php:917 includes/LitCalAPI.php:1036
-#: includes/LitCalAPI.php:1092 includes/LitCalAPI.php:1251
-#: includes/LitCalAPI.php:1296 includes/LitCalAPI.php:1323
-#: includes/LitCalAPI.php:1432 includes/LitCalAPI.php:1444
-#: includes/LitCalAPI.php:1459 includes/LitCalAPI.php:1485
-#: includes/FestivityCollection.php:357
+#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
+#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
+#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
+#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
+#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
+#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
+#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:569
+#: includes/LitCalAPI.php:570
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:595
+#: includes/LitCalAPI.php:596
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:606
+#: includes/LitCalAPI.php:607
 #, php-format
 msgid ""
 "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
 "should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:624
+#: includes/LitCalAPI.php:625
 #, php-format
 msgid ""
 "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
 "%d, it has been anticipated by one day as per %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:692
+#: includes/LitCalAPI.php:693
 #, php-format
 msgid ""
 "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
 "celebrated on %s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:726 includes/LitCalAPI.php:750
+#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
 #, php-format
 msgid "'%s' is superseded by the %s '%s' in the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:803
+#: includes/LitCalAPI.php:804
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:820
+#: includes/LitCalAPI.php:821
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:844
+#: includes/LitCalAPI.php:845
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:849
+#: includes/LitCalAPI.php:850
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -146,15 +146,15 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:869 includes/LitCalAPI.php:1130
-#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1823
+#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:903 includes/LitCalAPI.php:995
+#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -165,7 +165,7 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. Current year
 #.
-#: includes/LitCalAPI.php:949
+#: includes/LitCalAPI.php:950
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -180,12 +180,12 @@ msgstr ""
 #.  4. Name of the festivity that is superseding
 #.  5. Current year
 #.
-#: includes/LitCalAPI.php:971
+#: includes/LitCalAPI.php:972
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:991
+#: includes/LitCalAPI.php:992
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 #.  8. Name of the festivity that is superseding
 #.  9. Current year
 #.
-#: includes/LitCalAPI.php:1013
+#: includes/LitCalAPI.php:1014
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -218,7 +218,7 @@ msgstr ""
 #.  7. Name of the superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1049
+#: includes/LitCalAPI.php:1050
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,14 +231,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1088
+#: includes/LitCalAPI.php:1089
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1109
+#: includes/LitCalAPI.php:1110
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1165
+#: includes/LitCalAPI.php:1166
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,7 +265,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1187
+#: includes/LitCalAPI.php:1188
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,7 +280,7 @@ msgstr ""
 #.  5. Current year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1197
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,14 +293,14 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1231
+#: includes/LitCalAPI.php:1232
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1239
+#: includes/LitCalAPI.php:1240
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 #.  7. Name of superseding festivity
 #.  8. Current year
 #.
-#: includes/LitCalAPI.php:1344
+#: includes/LitCalAPI.php:1345
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -331,21 +331,21 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1372
+#: includes/LitCalAPI.php:1373
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1430
+#: includes/LitCalAPI.php:1431
 #, php-format
 msgid ""
 "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1442
+#: includes/LitCalAPI.php:1443
 #, php-format
 msgid ""
 "The optional memorial '%s', which would have been superseded this year by a "
@@ -353,7 +353,7 @@ msgid ""
 "12 since the year 2002 (%s), applicable to the year %d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1458
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,7 +361,7 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1483
+#: includes/LitCalAPI.php:1484
 #, php-format
 msgid ""
 "The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
@@ -370,26 +370,26 @@ msgid ""
 "memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1507
+#: includes/LitCalAPI.php:1508
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1543 includes/LitCalAPI.php:1572
+#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1595
+#: includes/LitCalAPI.php:1596
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1620 includes/LitCalAPI.php:1623
+#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1630
+#: includes/LitCalAPI.php:1631
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1663 includes/LitCalAPI.php:1995
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,20 +415,20 @@ msgstr ""
 #.  3. Current year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1728
+#: includes/LitCalAPI.php:1729
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1788
+#: includes/LitCalAPI.php:1789
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1902
+#: includes/LitCalAPI.php:1903
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1932
+#: includes/LitCalAPI.php:1933
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1946
+#: includes/LitCalAPI.php:1947
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2037
+#: includes/LitCalAPI.php:2038
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2055
+#: includes/LitCalAPI.php:2056
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
@@ -476,15 +476,15 @@ msgid "or"
 msgstr ""
 
 #. translators: in reference to the cycle of liturgical years (A, B, C; I, II)
-#: includes/FestivityCollection.php:36
+#: includes/FestivityCollection.php:44
 msgid "YEAR"
 msgstr ""
 
-#: includes/FestivityCollection.php:37
+#: includes/FestivityCollection.php:45
 msgid "Vigil Mass"
 msgstr ""
 
-#: includes/FestivityCollection.php:351
+#: includes/FestivityCollection.php:359
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. As "
@@ -492,7 +492,7 @@ msgid ""
 "are I Vespers."
 msgstr ""
 
-#: includes/FestivityCollection.php:365
+#: includes/FestivityCollection.php:373
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -501,7 +501,7 @@ msgid ""
 "evening Mass."
 msgstr ""
 
-#: includes/FestivityCollection.php:375
+#: includes/FestivityCollection.php:383
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. "
@@ -510,7 +510,7 @@ msgid ""
 "Vespers I."
 msgstr ""
 
-#: includes/FestivityCollection.php:435
+#: includes/FestivityCollection.php:443
 #, php-format
 msgid ""
 "The Vigil Mass for the %s '%s' coincides with the %s '%s' in the year %d. We "

From ec772a0b228b76d652436ba2c221f4824808b6a6 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 11:40:03 +0200
Subject: [PATCH 128/152] fix datetime and timezone issues

---
 includes/LitCalAPI.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 4bd16577..e7d39f02 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -1586,8 +1586,8 @@ private function calculateWeekdaysOrdinaryTime() : void {
     // so that our cycle using "next Saturday" logic will actually start from the first Saturday of the year ),
     // and then continue for every next Saturday until we reach the last Saturday of the year
     private function calculateSaturdayMemorialBVM() : void {
-        $currentSaturday = new DateTime( "previous Saturday January {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
-        $lastSatDT = new DateTime( "last Saturday December {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        $currentSaturday = new LitDateTime( "previous Saturday January {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
+        $lastSatDT = new LitDateTime( "last Saturday December {$this->LitSettings->Year}", new DateTimeZone( 'UTC' ) );
         $SatMemBVM_cnt = 0;
         while( $currentSaturday <= $lastSatDT ){
             $currentSaturday = LitDateTime::createFromFormat( '!j-n-Y', $currentSaturday->format( 'j-n-Y' ),new DateTimeZone( 'UTC' ) )->modify( 'next Saturday' );
@@ -1770,7 +1770,8 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
             && $row->Festivity->strtotime !== ''
         ) {
             $festivityDateTS = strtotime( $row->Festivity->strtotime . ' ' . $this->LitSettings->Year . ' UTC' );
-            $row->Festivity->DATE = new DateTime( "@$festivityDateTS", new DateTimeZone( 'UTC' ) );
+            $row->Festivity->DATE = new LitDateTime( "@$festivityDateTS" );
+            $row->Festivity->DATE->setTimeZone(new DateTimeZone('UTC'));
         }
         else if(
             property_exists( $row->Festivity, 'month' )

From 3cdcce67eff235181cc32c0fe3cd824e781ecfde Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 22 May 2022 09:41:10 +0000
Subject: [PATCH 129/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 95bcfe67..2ed8b7da 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -400,7 +400,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -420,13 +420,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From abdddbeb0573ff2c9c2fc16cd0916ae923b5d7d5 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 22 May 2022 11:41:15 +0200
Subject: [PATCH 130/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 18 +++++++++---------
 i18n/es/LC_MESSAGES/litcal.po | 18 +++++++++---------
 i18n/fr/LC_MESSAGES/litcal.po | 18 +++++++++---------
 i18n/it/LC_MESSAGES/litcal.po | 18 +++++++++---------
 i18n/la/LC_MESSAGES/litcal.po | 18 +++++++++---------
 i18n/pt/LC_MESSAGES/litcal.po | 18 +++++++++---------
 6 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 6314829e..540cecc5 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,13 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index 86e57f4a..cb4d11a3 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-05-21 10:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -150,7 +150,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -405,7 +405,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -425,13 +425,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -445,26 +445,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index c6d097b7..a9e7a8e3 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,13 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 4050f191..0d3439db 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -157,7 +157,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -453,7 +453,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -477,13 +477,13 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,7 +497,7 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -506,12 +506,12 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -523,7 +523,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index e94712cf..865bca86 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -156,7 +156,7 @@ msgstr "post Feria IV Cinerum"
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -447,7 +447,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -471,13 +471,13 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -491,7 +491,7 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +500,12 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +517,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 7dd6412a..87d8737f 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-21 23:09+0000\n"
+"POT-Creation-Date: 2022-05-22 09:41+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -147,7 +147,7 @@ msgstr ""
 #.  6. Current year
 #.
 #: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1824
+#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -402,7 +402,7 @@ msgstr ""
 #.  5. Name of the superseding festivity
 #.  6. Current year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1996
+#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -422,13 +422,13 @@ msgid ""
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1789
+#: includes/LitCalAPI.php:1790
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1903
+#: includes/LitCalAPI.php:1904
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -442,26 +442,26 @@ msgstr ""
 #.  6. Superseding festivity name
 #.  7. Current year
 #.
-#: includes/LitCalAPI.php:1933
+#: includes/LitCalAPI.php:1934
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1947
+#: includes/LitCalAPI.php:1948
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2038
+#: includes/LitCalAPI.php:2039
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2056
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 765bac9eba97910f200d6cc6f0030f0ada17975f Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 11:42:12 +0200
Subject: [PATCH 131/152] specify year in calendar validation error messages

---
 LitCalHealth.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index b93887ce..c5895999 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -137,21 +137,21 @@ private function validateCalendars( array $Calendars, array $Years, string $type
                 if( $data !== false ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The $type of $Calendar exists";
+                    $message->text = "The $type of $Calendar for the year $Year exists";
                     $result->messages[] = $message;
     
                     $jsonData = json_decode( $data );
                     if( json_last_error() === JSON_ERROR_NONE ) {
                         $message = new stdClass();
                         $message->type = "success";
-                        $message->text = "The $type of $Calendar was successfully decoded as JSON";
+                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
                         $result->messages[] = $message;
     
                         $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
                         if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                             $message = new stdClass();
                             $message->type = "success";
-                            $message->text = "The $type of $Calendar was successfully validated against the Schema " . LitSchema::LITCAL;
+                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
                             $result->messages[] = $message;
                         }
                         else if( gettype( $validationResult === 'object' ) ) {
@@ -160,13 +160,13 @@ private function validateCalendars( array $Calendars, array $Years, string $type
                     } else {
                         $message = new stdClass();
                         $message->type = "error";
-                        $message->text = "There was an error decoding the $type of $Calendar from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
                         $result->messages[] = $message;
                     }
                 } else {
                     $message = new stdClass();
                     $message->type = "error";
-                    $message->text = "The $type of $Calendar does not exist at the URL " . self::LitCalBaseUrl . $req;
+                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
                     $result->messages[] = $message;
                 }
             }

From baef32b45f91bd7abc05845f1fcb0a91ec62ec3c Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 11:43:43 +0200
Subject: [PATCH 132/152] add missing Settings prop to diocesanCalendar schema

---
 schemas/LitCal.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/schemas/LitCal.json b/schemas/LitCal.json
index 5d0f0fd1..162fa5b9 100644
--- a/schemas/LitCal.json
+++ b/schemas/LitCal.json
@@ -46,6 +46,9 @@
                         },
                         "NationalCalendar": {
                             "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                        },
+                        "DiocesanCalendar": {
+                            "type": "string"
                         }
                     },
                     "required": [

From 09edca182dfb11dfd0ab81310a20e3494c931688 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 11:55:04 +0200
Subject: [PATCH 133/152] remove NationalCalendar prop from required

---
 schemas/LitCal.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/schemas/LitCal.json b/schemas/LitCal.json
index 162fa5b9..e8d147dd 100644
--- a/schemas/LitCal.json
+++ b/schemas/LitCal.json
@@ -57,8 +57,7 @@
                         "Ascension",
                         "CorpusChristi",
                         "Locale",
-                        "ReturnType",
-                        "NationalCalendar"
+                        "ReturnType"
                     ]
                 },
                 "Metadata": {

From a0e693f2abdd458c85d0526fbde09e85850be74c Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 11:57:47 +0200
Subject: [PATCH 134/152] fix strtolower on array

---
 includes/LitCalAPI.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index e7d39f02..8ccdffa9 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -2201,9 +2201,9 @@ private function applyDiocesanCalendar() {
                             $this->LitSettings->Year
                         );
                     }
-                    $this->Cal->addFestivity( $this->LitSettings->DiocesanCalendar . "_" . $key, new Festivity( "[ " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " ] " . $obj->name, $currentFeastDate, strtolower( $obj->color ), LitFeastType::FIXED, $obj->grade, $obj->common ) );
+                    $this->Cal->addFestivity( $this->LitSettings->DiocesanCalendar . "_" . $key, new Festivity( "[ " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " ] " . $obj->name, $currentFeastDate, $obj->color, LitFeastType::FIXED, $obj->grade, $obj->common ) );
                 } else if ( $obj->grade <= LitGrade::FEAST && !$this->Cal->inSolemnities( $currentFeastDate ) ) {
-                    $this->Cal->addFestivity( $this->LitSettings->DiocesanCalendar . "_" . $key, new Festivity( "[ " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " ] " . $obj->name, $currentFeastDate, strtolower( $obj->color ), LitFeastType::FIXED, $obj->grade, $obj->common ) );
+                    $this->Cal->addFestivity( $this->LitSettings->DiocesanCalendar . "_" . $key, new Festivity( "[ " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " ] " . $obj->name, $currentFeastDate, $obj->color, LitFeastType::FIXED, $obj->grade, $obj->common ) );
                 } else {
                     $this->Messages[] = sprintf(
                         $this->LitSettings->DiocesanCalendar . ": the %s '%s', proper to the calendar of the " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " and usually celebrated on %s, is suppressed by the Sunday or Solemnity %s in the year %d",

From d804c7e5d686e59d633ee50df76553291df477e9 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 12:04:15 +0200
Subject: [PATCH 135/152] avoid using nationalcalendar param for VATICAN

---
 LitCalHealth.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index c5895999..2b17d8aa 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -132,7 +132,11 @@ private function executeValidations() {
     private function validateCalendars( array $Calendars, array $Years, string $type, object $result ) : object {
         foreach( $Calendars as $Calendar ) {
             foreach( $Years as $Year ) {
-                $req = "?$type=$Calendar&year=$Year";
+                if( $Calendar === 'VATICAN' ) {
+                    $req = "?year=$Year";
+                } else {
+                    $req = "?$type=$Calendar&year=$Year";
+                }
                 $data = file_get_contents( self::LitCalBaseUrl . $req );
                 if( $data !== false ) {
                     $message = new stdClass();

From 10d7619811bef7f55a6498cf3c3351ddfe1f6ae6 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sun, 22 May 2022 16:56:38 +0200
Subject: [PATCH 136/152] create unit tests with phpunit

---
 LitCalHealth.php                     |  153 +-
 composer.json                        |    3 +-
 composer.lock                        | 2142 +++++++++++++++++++++++++-
 tests/NativityJohnBaptistTest.php    |   38 +
 tests/StJaneFrancesDeChantalTest.php |   83 +
 5 files changed, 2394 insertions(+), 25 deletions(-)
 create mode 100644 tests/NativityJohnBaptistTest.php
 create mode 100644 tests/StJaneFrancesDeChantalTest.php

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 2b17d8aa..79b058d8 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -8,6 +8,8 @@
 include_once( 'includes/enums/RequestContentType.php' );
 include_once( 'includes/enums/ReturnType.php' );
 include_once( 'includes/APICore.php' );
+include_once( 'tests/NativityJohnBaptistTest.php' );
+include_once( 'tests/StJaneFrancesDeChantalTest.php' );
 include_once( 'vendor/autoload.php' );
 
 use Swaggest\JsonSchema\InvalidValue;
@@ -56,7 +58,7 @@ class LitCalHealth {
     const LitCalBaseUrl = "https://litcal.johnromanodorazio.com/api/dev/LitCalEngine.php";
 
     public APICore $APICore;
-    //private array $MESSAGES                         = [];
+    private object $CalendarData;
 
     public function __construct(){
         $this->APICore                              = new APICore();
@@ -120,12 +122,32 @@ private function executeValidations() {
                 array_push( $NationalCalendars, $key );
                 array_push( $DiocesanCalendars, ...$value );
             }
+            $twentyYearsFromNow = (int)date("Y") + 20;
             for( $i=10; $i>0; $i-- ) {
-                array_push( $Years, rand(1970,9999) );
+                array_push( $Years, rand(1970,$twentyYearsFromNow) );
             }
         }
         $result = $this->validateCalendars( $NationalCalendars, $Years, 'nationalcalendar', $result );
         $result = $this->validateCalendars( $DiocesanCalendars, $Years, 'diocesancalendar', $result );
+        $result = $this->testJohnBaptist( $NationalCalendars, [2022, 2033, 2044], 'nationalcalendar', $result );
+        $result = $this->testJohnBaptist( $DiocesanCalendars, [2022, 2033, 2044], 'diocesancalendar', $result );
+        $result = $this->testStJaneFrancesDeChantalMoved( $NationalCalendars, [2001, 2002, 2010], 'nationalcalendar', $result, 'movedornot' );
+        $result = $this->testStJaneFrancesDeChantalMoved( $DiocesanCalendars, [2001, 2002, 2010], 'diocesancalendar', $result, 'movedornot' );
+        $yearsOverridden = [
+            1971,
+            1976,
+            1982,
+            1993,
+            1999,
+            2012,
+            2018,
+            2029,
+            2035,
+            2040,
+            2046
+        ];
+        $result = $this->testStJaneFrancesDeChantalMoved( $NationalCalendars, $yearsOverridden, 'nationalcalendar', $result, 'overridden' );
+        $result = $this->testStJaneFrancesDeChantalMoved( $DiocesanCalendars, $yearsOverridden, 'diocesancalendar', $result, 'overridden' );
         die( json_encode( $result ) );
     }
 
@@ -178,6 +200,133 @@ private function validateCalendars( array $Calendars, array $Years, string $type
         return $result;
     }
 
+    private function testJohnBaptist( array $Calendars, array $Years, string $type, object $result ) : object {
+        foreach( $Calendars as $Calendar ) {
+            foreach( $Years as $Year ) {
+                if( $Calendar === 'VATICAN' ) {
+                    $req = "?year=$Year";
+                } else {
+                    $req = "?$type=$Calendar&year=$Year";
+                }
+                $data = file_get_contents( self::LitCalBaseUrl . $req );
+                if( $data !== false ) {
+                    $message = new stdClass();
+                    $message->type = "success";
+                    $message->text = "The $type of $Calendar for the year $Year exists";
+                    $result->messages[] = $message;
+    
+                    $jsonData = json_decode( $data );
+                    if( json_last_error() === JSON_ERROR_NONE ) {
+                        $message = new stdClass();
+                        $message->type = "success";
+                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
+                        $result->messages[] = $message;
+    
+                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
+                            $message = new stdClass();
+                            $message->type = "success";
+                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                            $result->messages[] = $message;
+                            NativityJohnBaptistTest::$testObject = $jsonData;
+                            $NativityJohnBaptistTest = new NativityJohnBaptistTest;
+                            $testResult = $NativityJohnBaptistTest->testJune23();
+                            if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
+                                $message = new stdClass();
+                                $message->type = "success";
+                                $message->text = "Nativity of John the Baptist test passed for the $type of $Calendar for the year $Year";
+                                $result->messages[] = $message;
+                            }
+                            else if( gettype( $testResult ) === 'object' ) {
+                                $result->messages[] = $testResult;
+                            }
+                        }
+                        else if( gettype( $validationResult === 'object' ) ) {
+                            $result->messages[] = $validationResult;
+                        }
+                    } else {
+                        $message = new stdClass();
+                        $message->type = "error";
+                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                        $result->messages[] = $message;
+                    }
+                } else {
+                    $message = new stdClass();
+                    $message->type = "error";
+                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+                    $result->messages[] = $message;
+                }
+            }
+        }
+        return $result;
+    }
+
+    private function testStJaneFrancesDeChantalMoved( array $Calendars, array $Years, string $type, object $result, string $test ) : object {
+        foreach( $Calendars as $Calendar ) {
+            foreach( $Years as $Year ) {
+                if( $Calendar === 'VATICAN' ) {
+                    $req = "?year=$Year";
+                } else {
+                    $req = "?$type=$Calendar&year=$Year";
+                }
+                $data = file_get_contents( self::LitCalBaseUrl . $req );
+                if( $data !== false ) {
+                    $message = new stdClass();
+                    $message->type = "success";
+                    $message->text = "The $type of $Calendar for the year $Year exists";
+                    $result->messages[] = $message;
+    
+                    $jsonData = json_decode( $data );
+                    if( json_last_error() === JSON_ERROR_NONE ) {
+                        $message = new stdClass();
+                        $message->type = "success";
+                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
+                        $result->messages[] = $message;
+    
+                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
+                            $message = new stdClass();
+                            $message->type = "success";
+                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                            $result->messages[] = $message;
+                            StJaneFrancesDeChantalTest::$testObject = $jsonData;
+                            $StJaneFrancesDeChantalTest = new StJaneFrancesDeChantalTest;
+                            if( $test === 'movedornot' ) {
+                                $testResult = $StJaneFrancesDeChantalTest->testMovedOrNot();
+                            }
+                            else if( $test === 'overridden' ) {
+                                $testResult = $StJaneFrancesDeChantalTest->testOverridden();
+                            }
+                            if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
+                                $message = new stdClass();
+                                $message->type = "success";
+                                $message->text = "Saint Jane Frances de Chantal test ($test) passed for the $type of $Calendar for the year $Year";
+                                $result->messages[] = $message;
+                            }
+                            else if( gettype( $testResult ) === 'object' ) {
+                                $result->messages[] = $testResult;
+                            }
+                        }
+                        else if( gettype( $validationResult === 'object' ) ) {
+                            $result->messages[] = $validationResult;
+                        }
+                    } else {
+                        $message = new stdClass();
+                        $message->type = "error";
+                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                        $result->messages[] = $message;
+                    }
+                } else {
+                    $message = new stdClass();
+                    $message->type = "error";
+                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+                    $result->messages[] = $message;
+                }
+            }
+        }
+        return $result;
+    }
+
     private function validateDataAgainstSchema( object|array $data, string $schemaUrl ) : bool|object {
         $res = false;
         try {
diff --git a/composer.json b/composer.json
index 2a0f21ae..d50b2438 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
     "require": {
-        "swaggest/json-schema": "^0.12"
+        "swaggest/json-schema": "^0.12",
+        "phpunit/phpunit": "^9"
     }
 }
diff --git a/composer.lock b/composer.lock
index 4d9bca9e..b2a3a572 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,55 +4,1963 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d04d28f060eb58ca81c9f79e28dfc6af",
+    "content-hash": "ab0f11bdd318adc2a529d7d6ae41c432",
     "packages": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-03T08:28:38+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-03T13:19:32+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.13.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+            },
+            "time": "2021-11-30T19:35:32+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
+            "time": "2021-07-20T11:28:43+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "5.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "shasum": ""
+            },
+            "require": {
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+            },
+            "time": "2021-10-19T17:43:47+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "77a32518733312af16a44300404e945338981de3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
+            },
+            "require-dev": {
+                "ext-tokenizer": "*",
+                "psalm/phar": "^4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
+            },
+            "time": "2022-03-15T21:29:03+00:00"
+        },
         {
             "name": "phplang/scope-exit",
             "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phplang/scope-exit.git",
-                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b"
+                "url": "https://github.com/phplang/scope-exit.git",
+                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phplang/scope-exit/zipball/239b73abe89f9414aa85a7ca075ec9445629192b",
+                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpLang\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Sara Golemon",
+                    "email": "pollita@php.net",
+                    "homepage": "https://twitter.com/SaraMG",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Emulation of SCOPE_EXIT construct from C++",
+            "homepage": "https://github.com/phplang/scope-exit",
+            "keywords": [
+                "cleanup",
+                "exit",
+                "scope"
+            ],
+            "support": {
+                "issues": "https://github.com/phplang/scope-exit/issues",
+                "source": "https://github.com/phplang/scope-exit/tree/master"
+            },
+            "time": "2016-09-17T00:15:18+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.15.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.2",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^6.0 || ^7.0",
+                "phpunit/phpunit": "^8.0 || ^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+            },
+            "time": "2021-12-08T12:19:24+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.13.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-03-07T09:28:20+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-02T12:48:52+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:16:10+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "9.5.20",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.3.1",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.0",
+                "sebastian/version": "^3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-01T12:37:26+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:10:38+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "5.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-03T09:37:03+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-11T14:18:36+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "5.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:17:30+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phplang/scope-exit/zipball/239b73abe89f9414aa85a7ca075ec9445629192b",
-                "reference": "239b73abe89f9414aa85a7ca075ec9445629192b",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=7.3"
+            },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
             "autoload": {
-                "psr-4": {
-                    "PhpLang\\": "src/"
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:45:17+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
                 }
             },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Sara Golemon",
-                    "email": "pollita@php.net",
-                    "homepage": "https://twitter.com/SaraMG",
-                    "role": "Developer"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Emulation of SCOPE_EXIT construct from C++",
-            "homepage": "https://github.com/phplang/scope-exit",
-            "keywords": [
-                "cleanup",
-                "exit",
-                "scope"
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-03-15T09:54:48+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
             ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
-                "issues": "https://github.com/phplang/scope-exit/issues",
-                "source": "https://github.com/phplang/scope-exit/tree/master"
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-09-17T00:15:18+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "swaggest/json-diff",
@@ -148,6 +2056,88 @@
             },
             "time": "2021-10-15T18:12:27+00:00"
         },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-20T20:35:02+00:00"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.25.0",
@@ -230,6 +2220,114 @@
                 }
             ],
             "time": "2021-11-30T18:21:41+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-28T10:34:58+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.13"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/tests/NativityJohnBaptistTest.php b/tests/NativityJohnBaptistTest.php
new file mode 100644
index 00000000..0e3928fe
--- /dev/null
+++ b/tests/NativityJohnBaptistTest.php
@@ -0,0 +1,38 @@
+<?php
+include_once( 'vendor/autoload.php' );
+use PHPUnit\Framework\TestCase;
+
+//In the year 2022, the Solemnity Nativity of John the Baptist coincides with the Solemnity of the Sacred Heart
+//Nativity of John the Baptist anticipated by one day to June 23
+//( except in cases where John the Baptist is patron of a nation, diocese, city or religious community, then the Sacred Heart can be anticipated by one day to June 23 )
+//http://www.cultodivino.va/content/cultodivino/it/documenti/responsa-ad-dubia/2020/de-calendario-liturgico-2022.html
+//This will happen again in 2033 and 2044
+class NativityJohnBaptistTest extends TestCase {
+    public static object $testObject;
+    public static array $expectedValues = [
+        2022 => 1655942400,
+        2033 => 2003097600,
+        2044 => 2350252800
+    ];
+
+    public function testJune23() : bool|object {
+        $res = false;
+        $expectedValue = self::$expectedValues[ self::$testObject->Settings->Year ];
+        try {
+            $this->assertSame( $expectedValue, self::$testObject->LitCal->NativityJohnBaptist->date );
+            $res = true;
+        } catch (Exception $e) {
+            $message = new stdClass();
+            $type = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? 'the national calendar of ' : (
+                property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? 'the diocesan calendar of ' : ''
+            );
+            $Calendar = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? self::$testObject->Settings->NationalCalendar : (
+                property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? self::$testObject->Settings->DiocesanCalendar : 'the Universal Roman Calendar'
+            );
+            $message->type = "error";
+            $message->text = "Nativity of John the Baptist test failed for Year " . self::$testObject->Settings->Year . " in {$type}{$Calendar}. Expected value: {$expectedValue}, actual value: " . self::$testObject->LitCal->NativityJohnBaptist->date . PHP_EOL . $e->getMessage();
+            return $message;
+        }
+        return $res;
+    }
+}
diff --git a/tests/StJaneFrancesDeChantalTest.php b/tests/StJaneFrancesDeChantalTest.php
new file mode 100644
index 00000000..edef07ca
--- /dev/null
+++ b/tests/StJaneFrancesDeChantalTest.php
@@ -0,0 +1,83 @@
+<?php
+include_once( 'vendor/autoload.php' );
+use PHPUnit\Framework\TestCase;
+
+/**
+ * In the Tertia Editio Typica (2002),
+ * Saint Jane Frances de Chantal was moved from December 12 to August 12,
+ * probably to allow local bishop's conferences to insert Our Lady of Guadalupe as an optional memorial on December 12
+ * seeing that with the decree of March 25th 1999 of the Congregation of Divine Worship
+ * Our Lady of Guadalupe was granted as a Feast day for all dioceses and territories of the Americas
+ * source: http://www.vatican.va/roman_curia/congregations/ccdds/documents/rc_con_ccdds_doc_20000628_guadalupe_lt.html
+ */
+class StJaneFrancesDeChantalTest extends TestCase {
+    public static object $testObject;
+    public static array $expectedValues = [
+        2001 => 1008115200,
+        2002 => 1029110400,
+        2010 => 1281571200 //this test is significant since December 12th falls on a Sunday, so the memorial would have been suppressed if it hadn't been moved
+    ];
+
+    //Years from 2002 in which August 12th is a Sunday
+    public static array $overriddenSince2002 = [
+        2012,
+        2018,
+        2029,
+        2035,
+        2040,
+        2046
+    ];
+
+    //Years before 2002 in which December 12th is a Sunday
+    public static array $overriddenBefore2002 = [
+        1971,
+        1976,
+        1982,
+        1993,
+        1999
+    ];
+
+
+    public function testMovedOrNot() : bool|object {
+        $res = false;
+        $expectedValue = self::$expectedValues[ self::$testObject->Settings->Year ];
+        try {
+            $this->assertSame( $expectedValue, self::$testObject->LitCal->StJaneFrancesDeChantal->date );
+            $res = true;
+        } catch (Exception $e) {
+            $message = new stdClass();
+            $type = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? 'the national calendar of ' : (
+                property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? 'the diocesan calendar of ' : ''
+            );
+            $Calendar = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? self::$testObject->Settings->NationalCalendar : (
+                property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? self::$testObject->Settings->DiocesanCalendar : 'the Universal Roman Calendar'
+            );
+            $message->type = "error";
+            $message->text = "Saint Jane Frances de Chantal test (moved or not) failed for Year " . self::$testObject->Settings->Year . " in {$type}{$Calendar}. Expected value: {$expectedValue}, actual value: " . self::$testObject->LitCal->NativityJohnBaptist->date . PHP_EOL . $e->getMessage();
+            return $message;
+        }
+        return $res;
+    }
+
+    public function testOverridden() : bool|object {
+        $res = false;
+        if( in_array( self::$testObject->Settings->Year, self::$overriddenSince2002 ) || in_array( self::$testObject->Settings->Year, self::$overriddenBefore2002 ) ) {
+            try {
+                $this->assertObjectNotHasAttribute( 'StJaneFrancesDeChantal', self::$testObject->LitCal );
+                $res = true;
+            } catch(Exception $e) {
+                $message = new stdClass();
+                $type = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? 'the national calendar of ' : (
+                    property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? 'the diocesan calendar of ' : ''
+                );
+                $Calendar = property_exists( self::$testObject->Settings, 'NationalCalendar' ) ? self::$testObject->Settings->NationalCalendar : (
+                    property_exists( self::$testObject->Settings, 'DiocesanCalendar' ) ? self::$testObject->Settings->DiocesanCalendar : 'the Universal Roman Calendar'
+                );
+                $message->type = "error";
+                $message->text = "Saint Jane Frances de Chantal test (overriden) failed for Year " . self::$testObject->Settings->Year . " in {$type}{$Calendar}. The memorial should have been overridden since it falls on a Sunday!" . PHP_EOL . $e->getMessage();
+                return $message;
+            }
+        }
+        return $res;
+    }
+}

From 4828724ff4ce90ed66e1572ccec5ede20aa21004 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 30 May 2022 19:27:46 +0200
Subject: [PATCH 137/152] implement ratchet websocket server send unit test
 results over the websocket

---
 LitCalHealth.php       |  549 ++++++++---------
 LitCalTestServer.php   |   18 +
 composer.json          |    3 +-
 composer.lock          | 1338 +++++++++++++++++++++++++++++++++++++++-
 includes/LitCalAPI.php |    4 +-
 5 files changed, 1618 insertions(+), 294 deletions(-)
 create mode 100644 LitCalTestServer.php

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 79b058d8..16108ba0 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -2,329 +2,363 @@
 error_reporting(E_ALL);
 ini_set("display_errors", 1);
 
-include_once( 'includes/enums/AcceptHeader.php' );
 include_once( 'includes/enums/LitSchema.php' );
-include_once( 'includes/enums/RequestMethod.php' );
-include_once( 'includes/enums/RequestContentType.php' );
-include_once( 'includes/enums/ReturnType.php' );
-include_once( 'includes/APICore.php' );
 include_once( 'tests/NativityJohnBaptistTest.php' );
 include_once( 'tests/StJaneFrancesDeChantalTest.php' );
 include_once( 'vendor/autoload.php' );
 
 use Swaggest\JsonSchema\InvalidValue;
 use Swaggest\JsonSchema\Schema;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
 
-if( file_exists("allowedOrigins.php") ) {
-    include_once( 'allowedOrigins.php' );
-}
+class LitCalHealth implements MessageComponentInterface {
+    protected $clients;
 
-$allowedOrigins = [
-    "https://johnromanodorazio.com",
-    "https://www.johnromanodorazio.com",
-    "https://litcal.johnromanodorazio.com",
-    "https://litcal-staging.johnromanodorazio.com"
-];
+    public function onOpen(ConnectionInterface $conn) {
+        // Store the new connection to send messages to later
+        $this->clients->attach($conn);
 
-if( defined('ALLOWED_ORIGINS') && is_array( ALLOWED_ORIGINS ) ) {
-    $allowedOrigins = array_merge( $allowedOrigins, ALLOWED_ORIGINS );
-}
+        echo "New connection! ({$conn->resourceId})\n";
+    }
 
-$LitCalHealth = new LitCalHealth();
+    public function onMessage(ConnectionInterface $from, $msg) {
+        echo sprintf('Receiving message "%s" from connection %d', $msg, $from->resourceId);
+        $messageReceived = json_decode( $msg );
+        if( json_last_error() === JSON_ERROR_NONE ) {
+            if( property_exists( $messageReceived, 'action' ) ) {
+                switch( $messageReceived->action ) {
+                    case 'executeValidation':
+                        if( property_exists( $messageReceived, 'validate' ) ) {
+                            $this->executeValidation( $messageReceived->validate, $from );
+                        }
+                        break;
+                    case 'validateCalendar':
+                        if(
+                            property_exists( $messageReceived, 'category' ) &&
+                            property_exists( $messageReceived, 'year' ) &&
+                            property_exists( $messageReceived, 'calendar' )
+                        ) {
+                            $this->validateCalendar( $messageReceived->calendar, $messageReceived->year, $messageReceived->category, $from );
+                        }
+                        break;
+                    case 'executeUnitTest':
+                        if(
+                            property_exists( $messageReceived, 'category' ) &&
+                            property_exists( $messageReceived, 'year' )
+                        ) {
+                            $this->executeUnitTest( $messageReceived->category, $messageReceived->year, $from );
+                        }
+                    default:
+                        $message = new stdClass();
+                        $message->type = "echobot";
+                        $message->text = $msg;
+                        $this->sendMessage( $from, $message );
+                }
+            }
+        }
 
-$LitCalHealth->APICore->setAllowedOrigins( $allowedOrigins );
-$LitCalHealth->APICore->setAllowedReferers( array_map( function($el){ return $el . "/"; }, $allowedOrigins ) );
+    }
 
-$LitCalHealth->APICore->setAllowedAcceptHeaders( [ AcceptHeader::JSON ] );
-$LitCalHealth->APICore->setAllowedRequestContentTypes( [ RequestContentType::JSON, RequestContentType::FORMDATA ] );
-$LitCalHealth->APICore->setAllowedRequestMethods( [ RequestMethod::GET, RequestMethod::POST, RequestMethod::OPTIONS ] );
-$LitCalHealth->Init();
+    public function onClose(ConnectionInterface $conn) {
+        // The connection is closed, remove it, as we can no longer send it messages
+        $this->clients->detach($conn);
 
+        echo "Connection {$conn->resourceId} has disconnected\n";
+    }
 
-class LitCalHealth {
+    public function onError(ConnectionInterface $conn, \Exception $e) {
+        echo "An error has occurred: {$e->getMessage()}\n";
+        $conn->close();
+    }
 
-    const DataSchema = [
-        "data/memorialsFromDecrees/memorialsFromDecrees.json"       => LitSchema::DECREEMEMORIALS,
-        "data/propriumdesanctis_1970/propriumdesanctis_1970.json"   => LitSchema::PROPRIUMDESANCTIS,
-        "data/propriumdesanctis_2002/propriumdesanctis_2002.json"   => LitSchema::PROPRIUMDESANCTIS,
-        "data/propriumdesanctis_2008/propriumdesanctis_2008.json"   => LitSchema::PROPRIUMDESANCTIS,
+    private function sendMessage( ConnectionInterface $from, string|stdClass $msg ) {
+        if( gettype( $msg ) !== 'string' ) {
+            $msg = json_encode( $msg );
+        }
+        foreach ($this->clients as $client) {
+            if ($from === $client) {
+                // The message from sender will be echoed back only to the sender, not to other clients
+                $client->send($msg);
+            }
+        }
+    }
+
+
+    const SchemaValidation = [
+        "LitCalMetadata"                => "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php",
+        "PropriumDeTempore"             => "data/propriumdetempore.json",
+        "PropriumDeSanctis1970"         => "data/propriumdesanctis_1970/propriumdesanctis_1970.json",
+        "PropriumDeSanctis2002"         => "data/propriumdesanctis_2002/propriumdesanctis_2002.json",
+        "PropriumDeSanctis2008"         => "data/propriumdesanctis_2008/propriumdesanctis_2008.json",
+        "PropriumDeSanctisITALY1983"    => "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json",
+        "PropriumDeSanctisUSA2011"      => "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json",
+        "MemorialsFromDecrees"          => "data/memorialsFromDecrees/memorialsFromDecrees.json",
+        "RegionalCalendarsIndex"        => "nations/index.json"
+    ];
+
+    const DataPathToSchema = [
+        "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php"       => LitSchema::METADATA,
+        "data/propriumdetempore.json"                                           => LitSchema::PROPRIUMDETEMPORE,
+        "data/propriumdesanctis_1970/propriumdesanctis_1970.json"               => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_2002/propriumdesanctis_2002.json"               => LitSchema::PROPRIUMDESANCTIS,
+        "data/propriumdesanctis_2008/propriumdesanctis_2008.json"               => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json"   => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json"       => LitSchema::PROPRIUMDESANCTIS,
-        "data/propriumdetempore.json"                                           => LitSchema::PROPRIUMDETEMPORE,
-        "nations/index.json"                                                    => LitSchema::INDEX,
-        "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php"       => LitSchema::METADATA
+        "data/memorialsFromDecrees/memorialsFromDecrees.json"                   => LitSchema::DECREEMEMORIALS,
+        "nations/index.json"                                                    => LitSchema::INDEX
     ];
 
     const LitCalBaseUrl = "https://litcal.johnromanodorazio.com/api/dev/LitCalEngine.php";
 
-    public APICore $APICore;
     private object $CalendarData;
 
-    public function __construct(){
-        $this->APICore                              = new APICore();
-        $this->RESPONSE                             = new stdClass();
-        $this->RESPONSE->requestHeadersReceived     = $this->APICore->getJsonEncodedRequestHeaders();
+    public function __construct() {
+        $this->clients = new \SplObjectStorage;
     }
 
-    private function executeValidations() {
-        $MetadataIsValid = false;
-        $Metadata = new stdClass();
-        $result = new stdClass();
-        $result->messages = [];
-        foreach( LitCalHealth::DataSchema as $dataPath => $schema ) {
+    private function executeValidation( string $validate, ConnectionInterface $to ) {
+        if( array_key_exists( $validate, LitCalHealth::SchemaValidation ) ) {
+            $dataPath = LitCalHealth::SchemaValidation[ $validate ];
+            $schema = LitCalHealth::DataPathToSchema[ $dataPath ];
             $data = file_get_contents( $dataPath );
             if( $data !== false ) {
                 $message = new stdClass();
                 $message->type = "success";
                 $message->text = "The Data file $dataPath exists";
-                $result->messages[] = $message;
+                $message->classes = ".$validate.file-exists";
+                $this->sendMessage( $to, $message );
 
                 $jsonData = json_decode( $data );
                 if( json_last_error() === JSON_ERROR_NONE ) {
                     $message = new stdClass();
                     $message->type = "success";
                     $message->text = "The Data file $dataPath was successfully decoded as JSON";
-                    $result->messages[] = $message;
+                    $message->classes = ".$validate.json-valid";
+                    $this->sendMessage( $to, $message );
 
                     $validationResult = $this->validateDataAgainstSchema( $jsonData, $schema );
                     if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
-                        if( $schema === LitSchema::METADATA ) {
-                            $MetadataIsValid = true;
-                            $Metadata = $jsonData->LitCalMetadata;
-                        }
                         $message = new stdClass();
                         $message->type = "success";
                         $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
-                        $result->messages[] = $message;
+                        $message->classes = ".$validate.schema-valid";
+                        $this->sendMessage( $to, $message );
                     }
                     else if( gettype( $validationResult === 'object' ) ) {
-                        $result->messages[] = $validationResult;
+                        $validationResult->classes = ".$validate.schema-valid";
+                        $this->sendMessage( $to, $validationResult );
                     }
                 } else {
                     $message = new stdClass();
                     $message->type = "error";
                     $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
-                    $result->messages[] = $message;
+                    $message->classes = ".$validate.json-valid";
+                    $this->sendMessage( $to, $message );
                 }
 
             } else {
                 $message = new stdClass();
                 $message->type = "error";
                 $message->text = "Data file $dataPath does not exist";
-                $result->messages[] = $message;
-            }
-        }
-        if( $MetadataIsValid ) {
-            $NationalCalendars  = [];
-            $DiocesanCalendars  = [];
-            $Years              = [];
-            foreach( $Metadata->NationalCalendars as $key => $value ){
-                array_push( $NationalCalendars, $key );
-                array_push( $DiocesanCalendars, ...$value );
-            }
-            $twentyYearsFromNow = (int)date("Y") + 20;
-            for( $i=10; $i>0; $i-- ) {
-                array_push( $Years, rand(1970,$twentyYearsFromNow) );
+                $message->classes = ".$validate.file-exists";
+                $this->sendMessage( $to, $message );
             }
+        } else {
+            $message = new stdClass();
+            $message->type = "error";
+            $message->text = "The validation requested \"{$validate}\" does not seem to be a supported validation";
+            $this->sendMessage( $to, $message );
         }
-        $result = $this->validateCalendars( $NationalCalendars, $Years, 'nationalcalendar', $result );
-        $result = $this->validateCalendars( $DiocesanCalendars, $Years, 'diocesancalendar', $result );
-        $result = $this->testJohnBaptist( $NationalCalendars, [2022, 2033, 2044], 'nationalcalendar', $result );
-        $result = $this->testJohnBaptist( $DiocesanCalendars, [2022, 2033, 2044], 'diocesancalendar', $result );
-        $result = $this->testStJaneFrancesDeChantalMoved( $NationalCalendars, [2001, 2002, 2010], 'nationalcalendar', $result, 'movedornot' );
-        $result = $this->testStJaneFrancesDeChantalMoved( $DiocesanCalendars, [2001, 2002, 2010], 'diocesancalendar', $result, 'movedornot' );
-        $yearsOverridden = [
-            1971,
-            1976,
-            1982,
-            1993,
-            1999,
-            2012,
-            2018,
-            2029,
-            2035,
-            2040,
-            2046
-        ];
-        $result = $this->testStJaneFrancesDeChantalMoved( $NationalCalendars, $yearsOverridden, 'nationalcalendar', $result, 'overridden' );
-        $result = $this->testStJaneFrancesDeChantalMoved( $DiocesanCalendars, $yearsOverridden, 'diocesancalendar', $result, 'overridden' );
-        die( json_encode( $result ) );
     }
 
-    private function validateCalendars( array $Calendars, array $Years, string $type, object $result ) : object {
-        foreach( $Calendars as $Calendar ) {
-            foreach( $Years as $Year ) {
-                if( $Calendar === 'VATICAN' ) {
-                    $req = "?year=$Year";
-                } else {
-                    $req = "?$type=$Calendar&year=$Year";
-                }
-                $data = file_get_contents( self::LitCalBaseUrl . $req );
-                if( $data !== false ) {
+    private function validateCalendar( string $Calendar, int $Year, string $type, ConnectionInterface $to ) : void {
+        if( $Calendar === 'VATICAN' ) {
+            $req = "?year=$Year";
+        } else {
+            $req = "?$type=$Calendar&year=$Year";
+        }
+        $data = file_get_contents( self::LitCalBaseUrl . $req );
+        if( $data !== false ) {
+            $message = new stdClass();
+            $message->type = "success";
+            $message->text = "The $type of $Calendar for the year $Year exists";
+            $message->classes = ".calendar-$Calendar.file-exists.year-$Year";
+            $this->sendMessage( $to, $message );
+
+            $jsonData = json_decode( $data );
+            if( json_last_error() === JSON_ERROR_NONE ) {
+                $message = new stdClass();
+                $message->type = "success";
+                $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
+                $message->classes = ".calendar-$Calendar.json-valid.year-$Year";
+                $this->sendMessage( $to, $message );
+
+                $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The $type of $Calendar for the year $Year exists";
-                    $result->messages[] = $message;
-    
-                    $jsonData = json_decode( $data );
-                    if( json_last_error() === JSON_ERROR_NONE ) {
-                        $message = new stdClass();
-                        $message->type = "success";
-                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
-                        $result->messages[] = $message;
-    
-                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
-                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
-                            $message = new stdClass();
-                            $message->type = "success";
-                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
-                            $result->messages[] = $message;
-                        }
-                        else if( gettype( $validationResult === 'object' ) ) {
-                            $result->messages[] = $validationResult;
-                        }
-                    } else {
-                        $message = new stdClass();
-                        $message->type = "error";
-                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
-                        $result->messages[] = $message;
-                    }
-                } else {
-                    $message = new stdClass();
-                    $message->type = "error";
-                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
-                    $result->messages[] = $message;
+                    $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                    $message->classes = ".calendar-$Calendar.schema-valid.year-$Year";
+                    $this->sendMessage( $to, $message );
+                }
+                else if( gettype( $validationResult === 'object' ) ) {
+                    $validationResult->classes = ".calendar-$Calendar.schema-valid.year-$Year";
+                    $this->sendMessage( $to, $validationResult );
                 }
+            } else {
+                $message = new stdClass();
+                $message->type = "error";
+                $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                $message->classes = ".calendar-$Calendar.json-valid.year-$Year";
+                $this->sendMessage( $to, $message );
             }
+        } else {
+            $message = new stdClass();
+            $message->type = "error";
+            $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+            $message->classes = ".calendar-$Calendar.file-exists.year-$Year";
+            $this->sendMessage( $to, $message );
         }
-        return $result;
     }
 
-    private function testJohnBaptist( array $Calendars, array $Years, string $type, object $result ) : object {
-        foreach( $Calendars as $Calendar ) {
-            foreach( $Years as $Year ) {
-                if( $Calendar === 'VATICAN' ) {
-                    $req = "?year=$Year";
-                } else {
-                    $req = "?$type=$Calendar&year=$Year";
-                }
-                $data = file_get_contents( self::LitCalBaseUrl . $req );
-                if( $data !== false ) {
+    private function executeUnitTest( string $test, int $year, ConnectionInterface $to ) {
+        switch( $test ) {
+            case 'testJohnBaptist':
+                $this->testJohnBaptist( $year, $to );
+                break;
+            case 'testStJaneFrancesDeChantalMoved':
+                $this->testStJaneFrancesDeChantalMoved( $year, $to, 'StJaneFrancesDeChantalMoved' );
+                break;
+            case 'testStJaneFrancesDeChantalOverridden':
+                $this->testStJaneFrancesDeChantalMoved( $year, $to, 'StJaneFrancesDeChantalOverridden' );
+                break;
+        }
+    }
+
+    private function testJohnBaptist( int $Year, ConnectionInterface $to ) : void {
+        $req = "?year=$Year";
+        $data = file_get_contents( self::LitCalBaseUrl . $req );
+        if( $data !== false ) {
+            $message = new stdClass();
+            $message->type = "success";
+            $message->text = "The Universal Calendar for the year $Year exists";
+            $message->classes = ".nativityjohnbaptist.year-{$Year}.file-exists";
+            $this->sendMessage( $to, $message );
+
+            $jsonData = json_decode( $data );
+            if( json_last_error() === JSON_ERROR_NONE ) {
+                $message = new stdClass();
+                $message->type = "success";
+                $message->text = "The Universal Calendar for the year $Year was successfully decoded as JSON";
+                $message->classes = ".nativityjohnbaptist.year-{$Year}.json-valid";
+                $this->sendMessage( $to, $message );
+
+                $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The $type of $Calendar for the year $Year exists";
-                    $result->messages[] = $message;
-    
-                    $jsonData = json_decode( $data );
-                    if( json_last_error() === JSON_ERROR_NONE ) {
+                    $message->text = "The Universal Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                    $message->classes = ".nativityjohnbaptist.year-{$Year}.schema-valid";
+                    $this->sendMessage( $to, $message );
+                    NativityJohnBaptistTest::$testObject = $jsonData;
+                    $NativityJohnBaptistTest = new NativityJohnBaptistTest;
+                    $testResult = $NativityJohnBaptistTest->testJune23();
+                    if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
                         $message = new stdClass();
                         $message->type = "success";
-                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
-                        $result->messages[] = $message;
-    
-                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
-                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
-                            $message = new stdClass();
-                            $message->type = "success";
-                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
-                            $result->messages[] = $message;
-                            NativityJohnBaptistTest::$testObject = $jsonData;
-                            $NativityJohnBaptistTest = new NativityJohnBaptistTest;
-                            $testResult = $NativityJohnBaptistTest->testJune23();
-                            if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
-                                $message = new stdClass();
-                                $message->type = "success";
-                                $message->text = "Nativity of John the Baptist test passed for the $type of $Calendar for the year $Year";
-                                $result->messages[] = $message;
-                            }
-                            else if( gettype( $testResult ) === 'object' ) {
-                                $result->messages[] = $testResult;
-                            }
-                        }
-                        else if( gettype( $validationResult === 'object' ) ) {
-                            $result->messages[] = $validationResult;
-                        }
-                    } else {
-                        $message = new stdClass();
-                        $message->type = "error";
-                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
-                        $result->messages[] = $message;
+                        $message->text = "Nativity of John the Baptist test passed for the Universal Calendar for the year $Year";
+                        $message->classes = ".nativityjohnbaptist.year-{$Year}.test-valid";
+                        $this->sendMessage( $to, $message );
+                    }
+                    else if( gettype( $testResult ) === 'object' ) {
+                        $testResult->classes = ".nativityjohnbaptist.year-{$Year}.test-valid";
+                        $this->sendMessage( $to, $testResult );
                     }
-                } else {
-                    $message = new stdClass();
-                    $message->type = "error";
-                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
-                    $result->messages[] = $message;
                 }
+                else if( gettype( $validationResult === 'object' ) ) {
+                    $validationResult->classes = ".nativityjohnbaptist.year-{$Year}.schema-valid";
+                    $this->sendMessage( $to, $validationResult );
+                }
+            } else {
+                $message = new stdClass();
+                $message->type = "error";
+                $message->text = "There was an error decoding the Universal Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                $message->classes = ".nativityjohnbaptist.year-{$Year}.json-valid";
+                $this->sendMessage( $to, $message );
             }
+        } else {
+            $message = new stdClass();
+            $message->type = "error";
+            $message->text = "The Universal Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+            $message->classes = ".nativityjohnbaptist.year-{$Year}.file-exists";
+            $this->sendMessage( $to, $message );
         }
-        return $result;
     }
 
-    private function testStJaneFrancesDeChantalMoved( array $Calendars, array $Years, string $type, object $result, string $test ) : object {
-        foreach( $Calendars as $Calendar ) {
-            foreach( $Years as $Year ) {
-                if( $Calendar === 'VATICAN' ) {
-                    $req = "?year=$Year";
-                } else {
-                    $req = "?$type=$Calendar&year=$Year";
-                }
-                $data = file_get_contents( self::LitCalBaseUrl . $req );
-                if( $data !== false ) {
+    private function testStJaneFrancesDeChantalMoved( int $Year, ConnectionInterface $to, string $test ) : void {
+        $req = "?year=$Year";
+        $data = file_get_contents( self::LitCalBaseUrl . $req );
+        if( $data !== false ) {
+            $message = new stdClass();
+            $message->type = "success";
+            $message->text = "The Universal Calendar for the year $Year exists";
+            $message->classes = ".{$test}.year-{$Year}.file-exists";
+            $this->sendMessage( $to, $message );
+
+            $jsonData = json_decode( $data );
+            if( json_last_error() === JSON_ERROR_NONE ) {
+                $message = new stdClass();
+                $message->type = "success";
+                $message->text = "The Universal Calendar for the year $Year was successfully decoded as JSON";
+                $message->classes = ".{$test}.year-{$Year}.json-valid";
+                $this->sendMessage( $to, $message );
+
+                $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
+                if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The $type of $Calendar for the year $Year exists";
-                    $result->messages[] = $message;
-    
-                    $jsonData = json_decode( $data );
-                    if( json_last_error() === JSON_ERROR_NONE ) {
+                    $message->text = "The Universal Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                    $message->classes = ".{$test}.year-{$Year}.schema-valid";
+                    $this->sendMessage( $to, $message );
+                    StJaneFrancesDeChantalTest::$testObject = $jsonData;
+                    $StJaneFrancesDeChantalTest = new StJaneFrancesDeChantalTest;
+                    if( $test === 'StJaneFrancesDeChantalMoved' ) {
+                        $testResult = $StJaneFrancesDeChantalTest->testMovedOrNot();
+                    }
+                    else if( $test === 'StJaneFrancesDeChantalOverridden' ) {
+                        $testResult = $StJaneFrancesDeChantalTest->testOverridden();
+                    }
+                    if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
                         $message = new stdClass();
                         $message->type = "success";
-                        $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
-                        $result->messages[] = $message;
-    
-                        $validationResult = $this->validateDataAgainstSchema( $jsonData, LitSchema::LITCAL );
-                        if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
-                            $message = new stdClass();
-                            $message->type = "success";
-                            $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
-                            $result->messages[] = $message;
-                            StJaneFrancesDeChantalTest::$testObject = $jsonData;
-                            $StJaneFrancesDeChantalTest = new StJaneFrancesDeChantalTest;
-                            if( $test === 'movedornot' ) {
-                                $testResult = $StJaneFrancesDeChantalTest->testMovedOrNot();
-                            }
-                            else if( $test === 'overridden' ) {
-                                $testResult = $StJaneFrancesDeChantalTest->testOverridden();
-                            }
-                            if( gettype( $testResult ) === 'boolean' && $testResult === true ) {
-                                $message = new stdClass();
-                                $message->type = "success";
-                                $message->text = "Saint Jane Frances de Chantal test ($test) passed for the $type of $Calendar for the year $Year";
-                                $result->messages[] = $message;
-                            }
-                            else if( gettype( $testResult ) === 'object' ) {
-                                $result->messages[] = $testResult;
-                            }
-                        }
-                        else if( gettype( $validationResult === 'object' ) ) {
-                            $result->messages[] = $validationResult;
-                        }
-                    } else {
-                        $message = new stdClass();
-                        $message->type = "error";
-                        $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
-                        $result->messages[] = $message;
+                        $message->text = "Saint Jane Frances de Chantal test ($test) passed for the Universal Calendar for the year $Year";
+                        $message->classes = ".{$test}.year-{$Year}.test-valid";
+                        $this->sendMessage( $to, $message );
+                    }
+                    else if( gettype( $testResult ) === 'object' ) {
+                        $testResult->classes = ".{$test}.year-{$Year}.test-valid";
+                        $this->sendMessage( $to, $testResult );
                     }
-                } else {
-                    $message = new stdClass();
-                    $message->type = "error";
-                    $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
-                    $result->messages[] = $message;
                 }
+                else if( gettype( $validationResult === 'object' ) ) {
+                    $validationResult->classes = ".{$test}.year-{$Year}.schema-valid";
+                    $this->sendMessage( $to, $validationResult );
+                }
+            } else {
+                $message = new stdClass();
+                $message->type = "error";
+                $message->text = "There was an error decoding the Universal Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                $message->classes = ".{$test}.year-{$Year}.json-valid";
+                $this->sendMessage( $to, $message );
             }
+        } else {
+            $message = new stdClass();
+            $message->type = "error";
+            $message->text = "The Universal Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+            $message->classes = ".{$test}.year-{$Year}.file-exists";
+            $this->sendMessage( $to, $message );
         }
-        return $result;
     }
 
     private function validateDataAgainstSchema( object|array $data, string $schemaUrl ) : bool|object {
@@ -342,42 +376,7 @@ private function validateDataAgainstSchema( object|array $data, string $schemaUr
         return $res;
     }
 
-    private function handleRequestedMethod() {
-        switch( strtoupper( $_SERVER[ "REQUEST_METHOD" ] ) ) {
-            case RequestMethod::GET:
-                $this->handleGetPostRequests( $_GET );
-                break;
-            case RequestMethod::POST:
-                $this->handleGetPostRequests( $_POST );
-                break;
-            case RequestMethod::OPTIONS:
-                //continue;
-                break;
-            default:
-                header( $_SERVER[ "SERVER_PROTOCOL" ]." 405 Method Not Allowed", true, 405 );
-                $errorMessage = '{"error":"You seem to be forming a strange kind of request? Allowed Request Methods are ';
-                $errorMessage .= implode( ' and ', $this->AllowedRequestMethods );
-                $errorMessage .= ', but your Request Method was ' . strtoupper( $_SERVER[ 'REQUEST_METHOD' ] ) . '"}';
-                die( $errorMessage );
-        }
-    }
-
-    private function handleGetPostRequests( array $REQUEST ) {
-
-        $this->APICore->validateAcceptHeader( true );
-        if( $this->APICore->getRequestContentType() === 'application/json' ) {
-            $this->DATA = $this->APICore->retrieveRequestParamsFromJsonBody();
-        } else {
-            $this->DATA = (object)$REQUEST;
-        }
-        $this->executeValidations();
-    }
+}
 
 
-    public function Init() {
-        $this->APICore->Init();
-        $this->APICore->setResponseContentTypeHeader();
-        $this->handleRequestedMethod();
-    }
-
-}
+$LitCalHealth = new LitCalHealth();
diff --git a/LitCalTestServer.php b/LitCalTestServer.php
new file mode 100644
index 00000000..b87d8759
--- /dev/null
+++ b/LitCalTestServer.php
@@ -0,0 +1,18 @@
+<?php
+use Ratchet\Server\IoServer;
+use Ratchet\Http\HttpServer;
+use Ratchet\WebSocket\WsServer;
+
+    include_once('./LitCalHealth.php');
+    include_once( 'vendor/autoload.php' );
+
+    $server = IoServer::factory(
+        new HttpServer(
+            new WsServer(
+                new LitCalHealth()
+            )
+        ),
+        8080
+    );
+
+    $server->run();
diff --git a/composer.json b/composer.json
index d50b2438..c158d45a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
     "require": {
         "swaggest/json-schema": "^0.12",
-        "phpunit/phpunit": "^9"
+        "phpunit/phpunit": "^9",
+        "cboden/ratchet": "^0.4.4"
     }
 }
diff --git a/composer.lock b/composer.lock
index b2a3a572..79d871de 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,71 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ab0f11bdd318adc2a529d7d6ae41c432",
+    "content-hash": "915dec09222581a50d1afa1274b75b0b",
     "packages": [
+        {
+            "name": "cboden/ratchet",
+            "version": "v0.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ratchetphp/Ratchet.git",
+                "reference": "5012dc954541b40c5599d286fd40653f5716a38f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/5012dc954541b40c5599d286fd40653f5716a38f",
+                "reference": "5012dc954541b40c5599d286fd40653f5716a38f",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^1.7|^2.0",
+                "php": ">=5.4.2",
+                "ratchet/rfc6455": "^0.3.1",
+                "react/event-loop": ">=0.4",
+                "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
+                "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0|^6.0",
+                "symfony/routing": "^2.6|^3.0|^4.0|^5.0|^6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ratchet\\": "src/Ratchet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Matt Bonneau",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP WebSocket library",
+            "homepage": "http://socketo.me",
+            "keywords": [
+                "Ratchet",
+                "WebSockets",
+                "server",
+                "sockets",
+                "websocket"
+            ],
+            "support": {
+                "chat": "https://gitter.im/reactphp/reactphp",
+                "issues": "https://github.com/ratchetphp/Ratchet/issues",
+                "source": "https://github.com/ratchetphp/Ratchet/tree/v0.4.4"
+            },
+            "time": "2021-12-14T00:20:41+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.4.1",
@@ -76,6 +139,168 @@
             ],
             "time": "2022-03-03T08:28:38+00:00"
         },
+        {
+            "name": "evenement/evenement",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Evenement": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                }
+            ],
+            "description": "Événement is a very simple event dispatching library for PHP",
+            "keywords": [
+                "event-dispatcher",
+                "event-emitter"
+            ],
+            "support": {
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/master"
+            },
+            "time": "2017-07-23T21:35:13+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
+                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "ralouphie/getallheaders": "^3.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "http-interop/http-factory-tests": "^0.9",
+                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+            },
+            "suggest": {
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/2.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-20T21:55:58+00:00"
+        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.11.0",
@@ -966,37 +1191,805 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-01T12:37:26+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
+            "time": "2019-04-30T12:38:16+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "ratchet/rfc6455",
+            "version": "v0.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ratchetphp/RFC6455.git",
+                "reference": "7c964514e93456a52a99a20fcfa0de242a43ccdb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/7c964514e93456a52a99a20fcfa0de242a43ccdb",
+                "reference": "7c964514e93456a52a99a20fcfa0de242a43ccdb",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^2 || ^1.7",
+                "php": ">=5.4.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7",
+                "react/socket": "^1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ratchet\\RFC6455\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Matt Bonneau",
+                    "role": "Developer"
+                }
+            ],
+            "description": "RFC6455 WebSocket protocol handler",
+            "homepage": "http://socketo.me",
+            "keywords": [
+                "WebSockets",
+                "rfc6455",
+                "websocket"
+            ],
+            "support": {
+                "chat": "https://gitter.im/reactphp/reactphp",
+                "issues": "https://github.com/ratchetphp/RFC6455/issues",
+                "source": "https://github.com/ratchetphp/RFC6455/tree/v0.3.1"
+            },
+            "time": "2021-12-09T23:20:49+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "4bf736a2cccec7298bdf745db77585966fc2ca7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/4bf736a2cccec7298bdf745db77585966fc2ca7e",
+                "reference": "4bf736a2cccec7298bdf745db77585966fc2ca7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-02-02T06:47:52+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "6d38296756fa644e6cb1bfe95eff0f9a4ed6edcb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/6d38296756fa644e6cb1bfe95eff0f9a4ed6edcb",
+                "reference": "6d38296756fa644e6cb1bfe95eff0f9a4ed6edcb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.0 || ^2.7 || ^1.2.1",
+                "react/promise-timer": "^1.8"
+            },
+            "require-dev": {
+                "clue/block-react": "^1.2",
+                "phpunit/phpunit": "^9.3 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async DNS resolver for ReactPHP",
+            "keywords": [
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-20T08:46:54+00:00"
+        },
+        {
+            "name": "react/event-loop",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "187fb56f46d424afb6ec4ad089269c72eec2e137"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/187fb56f46d424afb6ec4ad089269c72eec2e137",
+                "reference": "187fb56f46d424afb6ec4ad089269c72eec2e137",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+            },
+            "suggest": {
+                "ext-event": "~1.0 for ExtEventLoop",
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop",
+                "ext-uv": "* for ExtUvLoop"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\EventLoop\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+            "keywords": [
+                "asynchronous",
+                "event-loop"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-03-17T11:10:22+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v2.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-11T10:27:51+00:00"
+        },
+        {
+            "name": "react/promise-timer",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise-timer.git",
+                "reference": "0bbbcc79589e5bfdddba68a287f1cb805581a479"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise-timer/zipball/0bbbcc79589e5bfdddba68a287f1cb805581a479",
+                "reference": "0bbbcc79589e5bfdddba68a287f1cb805581a479",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.0 || ^2.7.0 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\Timer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "A trivial implementation of timeouts for Promises, built on top of ReactPHP.",
+            "homepage": "https://github.com/reactphp/promise-timer",
+            "keywords": [
+                "async",
+                "event-loop",
+                "promise",
+                "reactphp",
+                "timeout",
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/promise-timer/issues",
+                "source": "https://github.com/reactphp/promise-timer/tree/v1.8.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-06T11:08:48+00:00"
+        },
+        {
+            "name": "react/socket",
+            "version": "v1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "f474156aaab4f09041144fa8b57c7d70aed32a1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/f474156aaab4f09041144fa8b57c7d70aed32a1c",
+                "reference": "f474156aaab4f09041144fa8b57c7d70aed32a1c",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.8",
+                "react/event-loop": "^1.2",
+                "react/promise": "^2.6.0 || ^1.2.1",
+                "react/promise-timer": "^1.8",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "clue/block-react": "^1.5",
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+                "react/promise-stream": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Socket\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+            "keywords": [
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.11.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-01-14T10:14:32+00:00"
+        },
+        {
+            "name": "react/stream",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "7a423506ee1903e89f1e08ec5f0ed430ff784ae9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/7a423506ee1903e89f1e08ec5f0ed430ff784ae9",
+                "reference": "7a423506ee1903e89f1e08ec5f0ed430ff784ae9",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
+            },
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Stream\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
             "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.2.0"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/sponsors.html",
-                    "type": "custom"
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
                 },
                 {
-                    "url": "https://github.com/sebastianbergmann",
+                    "url": "https://github.com/clue",
                     "type": "github"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2021-07-11T12:37:55+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2056,6 +3049,146 @@
             },
             "time": "2021-10-15T18:12:27+00:00"
         },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v5.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522",
+                "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "predis/predis": "~1.0",
+                "symfony/cache": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/mime": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "symfony/mime": "To use the file extension guesser"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Defines an object-oriented layer for the HTTP specification",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.9"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-17T15:07:29+00:00"
+        },
         {
             "name": "symfony/polyfill-ctype",
             "version": "v1.25.0",
@@ -2221,6 +3354,179 @@
             ],
             "time": "2021-11-30T18:21:41+00:00"
         },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-04T08:16:47+00:00"
+        },
+        {
+            "name": "symfony/routing",
+            "version": "v5.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/routing.git",
+                "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7",
+                "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "conflict": {
+                "doctrine/annotations": "<1.12",
+                "symfony/config": "<5.3",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/yaml": "<4.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.12",
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.3|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/yaml": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "symfony/config": "For using the all-in-one router or any loader",
+                "symfony/expression-language": "For using expression matching",
+                "symfony/http-foundation": "For using a Symfony Request object",
+                "symfony/yaml": "For using the YAML loader"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Routing\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Maps an HTTP request to a set of configuration variables",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "router",
+                "routing",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/routing/tree/v5.4.8"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-18T21:45:37+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.1",
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 8ccdffa9..845ed87e 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -777,7 +777,7 @@ private function calculateFeastsMarySaints() : void {
         //With the decree Apostolorum Apostola ( June 3rd 2016 ), the Congregation for Divine Worship
         //with the approval of Pope Francis elevated the memorial of Saint Mary Magdalen to a Feast
         //source: http://www.vatican.va/roman_curia/congregations/ccdds/documents/articolo-roche-maddalena_it.pdf
-        //This is taken care of ahead when the memorials are created, see comment tag MARYMAGDALEN:
+        //This is taken care of ahead when the "memorials from decrees" are applied
 
     }
 
@@ -939,7 +939,7 @@ private function calculateMemorials( int $grade = LitGrade::MEMORIAL, string $mi
 
     private function reduceMemorialsInAdventLentToCommemoration( DateTime $currentFeastDate, stdClass $row ) {
         //If a fixed date optional memorial falls between 17 Dec. to 24 Dec., the Octave of Christmas or weekdays of the Lenten season,
-        //it is reduced in rank to a Commemoration ( only the collect can be used
+        //it is reduced in rank to a Commemoration ( only the collect can be used )
         if ( $this->Cal->inWeekdaysAdventChristmasLent( $currentFeastDate ) ) {
             $this->Cal->setProperty( $row->TAG, "grade", LitGrade::COMMEMORATION );
             /**translators:

From 8c67998ebe796b1108fd3685c49bf8ccfd220b1e Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 1 Jun 2022 19:49:35 +0000
Subject: [PATCH 138/152] Translated using Weblate (German)

Currently translated at 4.5% (5 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/de/
---
 i18n/de/LC_MESSAGES/litcal.mo | Bin 617 -> 737 bytes
 i18n/de/LC_MESSAGES/litcal.po |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.mo b/i18n/de/LC_MESSAGES/litcal.mo
index d9bbf1f2b013ec7043abdf54ad762584e87e7303..295fac53609fb1200e448a2214d383974e498445 100644
GIT binary patch
delta 281
zcmaFK@{qOuo)F7a1|VPqVi_Rz0b*_-t^r~YSOLVWK)e!&1%Y@y5OV<WK`8$ekmdy9
zJ3zdJk%8eEkY)km*-Q)!d_Z~ukOrBz9!N_7>D@q@2S{H5(m>^EKqdq*LusHm*fCHp
z*f7?KxiV6|sk!+@nTa_J{skqO`FV*s3b{~`jUBrgy^Zt?xftABgG0cCf{Sagf`@BR
mkROA4YD#Kec5%t!B_(jJsR~G<C8>E}JwBe!9^S5=Aq)UL8Z^5A

delta 185
zcmaFJ`jVyoo)F7a1|VPoVi_Q|0b*7ljsap2C;(y*zYvH8fw&xqIf1wnh_^5@FiZy0
zAiW+;3=Dig+80Rk0O=SY4U}d8Qeb%?#lQ?A+*}=lLm;GrzZ<7Qh=;3!kAINM#@o9Y
k)eQ6uxqxzD1;HT-F0R1}9<D(_eqb>lPiGHrSI-az0H5O;djJ3c

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 540cecc5..79cad13b 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2021 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Ubuntu <priest@johnromanodorazio.com>, 2021.
-#
+# John R. D'Orazio <priest@johnromanodorazio.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-05-22 09:41+0000\n"
-"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"PO-Revision-Date: 2022-06-02 20:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/de/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.12.1\n"
 
 #: includes/LitCalAPI.php:229
 #, php-format
@@ -752,12 +752,12 @@ msgstr ""
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:100
 msgid "Optional memorial"
-msgstr ""
+msgstr "Optionale Gedenkstätten"
 
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:105
 msgid "Memorial"
-msgstr ""
+msgstr "Gedenkstät"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110

From bd94cb4de55dd3a970f2387b714a0449f4088c0d Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Wed, 1 Jun 2022 19:50:53 +0000
Subject: [PATCH 139/152] Translated using Weblate (Portuguese)

Currently translated at 4.5% (5 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/pt/
---
 i18n/pt/LC_MESSAGES/litcal.mo | Bin 627 -> 737 bytes
 i18n/pt/LC_MESSAGES/litcal.po |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/i18n/pt/LC_MESSAGES/litcal.mo b/i18n/pt/LC_MESSAGES/litcal.mo
index 6b71bb71c5b3a741d5e0fa7202b885f3e0edeb3d..bf0deb4497259957c0b6f4e073c7911aa94d0b04 100644
GIT binary patch
delta 250
zcmey&@{qOuo)F7a1|VPqVi_Rz0b*_-t^r~YSOLVWK)e!&1%Y@y5OV<WK`8$ekmdy9
zJ3zdTk%8eEkOrw=%EZ9H52RNEX^{HeKpLd~2$1Fi($|1AP`MhA2?5Md8Ym8S43x{j
z0%WjG%$1SyP0h_O%1q2*@GmII%+E{AQOJdgZ0tD7$Y?a#k4Z`msOa!!pehC!Lm|H)
T8LXNi*x$$1&(p=x#gzd7@E9wq

delta 164
zcmaFJ`kAHvo)F7a1|VPoVi_Q|0b*7ljsap2C;(y*zYvH8fw&xqIf1wni1#rvFiZy0
zAo(CB1_pj09RZ}dfOH0s21+vkDX`f<ih&tKxVbt8hd@XLe>YBr5D!-cAO9eijkk|7
XG8#-?$Rx!b?C<01=jr0;;>rL3$n6#3

diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 87d8737f..84fe2e05 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2021 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Ubuntu <priest@johnromanodorazio.com>, 2021.
-#
+# John R. D'Orazio <priest@johnromanodorazio.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-05-22 09:41+0000\n"
-"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"PO-Revision-Date: 2022-06-02 20:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/pt/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.12.1\n"
 
 #: includes/LitCalAPI.php:229
 #, php-format
@@ -752,12 +752,12 @@ msgstr ""
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:100
 msgid "Optional memorial"
-msgstr ""
+msgstr "Memória opcional"
 
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:105
 msgid "Memorial"
-msgstr ""
+msgstr "Memória"
 
 #. translators: liturgical rank. Keep UPPERCASE
 #: includes/enums/LitGrade.php:110

From 9cbb8e637b3785ae2839a75c0eb63434b1232bcb Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 4 Jun 2022 15:04:28 +0200
Subject: [PATCH 140/152] execute tests for specific calendar

---
 LitCalHealth.php     | 49 +++++++++++++++++++++++++++-----------------
 LitCalTestServer.php |  2 +-
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 16108ba0..73f3cc6b 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -35,20 +35,23 @@ public function onMessage(ConnectionInterface $from, $msg) {
                         break;
                     case 'validateCalendar':
                         if(
-                            property_exists( $messageReceived, 'category' ) &&
+                            property_exists( $messageReceived, 'calendar' ) &&
                             property_exists( $messageReceived, 'year' ) &&
-                            property_exists( $messageReceived, 'calendar' )
+                            property_exists( $messageReceived, 'category' )
                         ) {
                             $this->validateCalendar( $messageReceived->calendar, $messageReceived->year, $messageReceived->category, $from );
                         }
                         break;
                     case 'executeUnitTest':
                         if(
+                            property_exists( $messageReceived, 'calendar' ) &&
+                            property_exists( $messageReceived, 'year' ) &&
                             property_exists( $messageReceived, 'category' ) &&
-                            property_exists( $messageReceived, 'year' )
+                            property_exists( $messageReceived, 'test' )
                         ) {
-                            $this->executeUnitTest( $messageReceived->category, $messageReceived->year, $from );
+                            $this->executeUnitTest( $messageReceived->calendar, $messageReceived->year, $messageReceived->category, $messageReceived->test, $from );
                         }
+                        break;
                     default:
                         $message = new stdClass();
                         $message->type = "echobot";
@@ -172,17 +175,17 @@ private function executeValidation( string $validate, ConnectionInterface $to )
         }
     }
 
-    private function validateCalendar( string $Calendar, int $Year, string $type, ConnectionInterface $to ) : void {
+    private function validateCalendar( string $Calendar, int $Year, string $category, ConnectionInterface $to ) : void {
         if( $Calendar === 'VATICAN' ) {
             $req = "?year=$Year";
         } else {
-            $req = "?$type=$Calendar&year=$Year";
+            $req = "?$category=$Calendar&year=$Year";
         }
         $data = file_get_contents( self::LitCalBaseUrl . $req );
         if( $data !== false ) {
             $message = new stdClass();
             $message->type = "success";
-            $message->text = "The $type of $Calendar for the year $Year exists";
+            $message->text = "The $category of $Calendar for the year $Year exists";
             $message->classes = ".calendar-$Calendar.file-exists.year-$Year";
             $this->sendMessage( $to, $message );
 
@@ -190,7 +193,7 @@ private function validateCalendar( string $Calendar, int $Year, string $type, Co
             if( json_last_error() === JSON_ERROR_NONE ) {
                 $message = new stdClass();
                 $message->type = "success";
-                $message->text = "The $type of $Calendar for the year $Year was successfully decoded as JSON";
+                $message->text = "The $category of $Calendar for the year $Year was successfully decoded as JSON";
                 $message->classes = ".calendar-$Calendar.json-valid.year-$Year";
                 $this->sendMessage( $to, $message );
 
@@ -198,7 +201,7 @@ private function validateCalendar( string $Calendar, int $Year, string $type, Co
                 if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The $type of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
+                    $message->text = "The $category of $Calendar for the year $Year was successfully validated against the Schema " . LitSchema::LITCAL;
                     $message->classes = ".calendar-$Calendar.schema-valid.year-$Year";
                     $this->sendMessage( $to, $message );
                 }
@@ -209,35 +212,39 @@ private function validateCalendar( string $Calendar, int $Year, string $type, Co
             } else {
                 $message = new stdClass();
                 $message->type = "error";
-                $message->text = "There was an error decoding the $type of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
+                $message->text = "There was an error decoding the $category of $Calendar for the year $Year from the URL " . self::LitCalBaseUrl . $req . " as JSON: " . json_last_error_msg();
                 $message->classes = ".calendar-$Calendar.json-valid.year-$Year";
                 $this->sendMessage( $to, $message );
             }
         } else {
             $message = new stdClass();
             $message->type = "error";
-            $message->text = "The $type of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
+            $message->text = "The $category of $Calendar for the year $Year does not exist at the URL " . self::LitCalBaseUrl . $req;
             $message->classes = ".calendar-$Calendar.file-exists.year-$Year";
             $this->sendMessage( $to, $message );
         }
     }
 
-    private function executeUnitTest( string $test, int $year, ConnectionInterface $to ) {
+    private function executeUnitTest( string $Calendar, int $Year, string $category, string $test, ConnectionInterface $to ) {
         switch( $test ) {
             case 'testJohnBaptist':
-                $this->testJohnBaptist( $year, $to );
+                $this->testJohnBaptist( $Calendar, $Year, $category, $to );
                 break;
             case 'testStJaneFrancesDeChantalMoved':
-                $this->testStJaneFrancesDeChantalMoved( $year, $to, 'StJaneFrancesDeChantalMoved' );
+                $this->testStJaneFrancesDeChantalMoved( $Calendar, $Year, $category, $to, 'StJaneFrancesDeChantalMoved' );
                 break;
             case 'testStJaneFrancesDeChantalOverridden':
-                $this->testStJaneFrancesDeChantalMoved( $year, $to, 'StJaneFrancesDeChantalOverridden' );
+                $this->testStJaneFrancesDeChantalMoved( $Calendar, $Year, $category, $to, 'StJaneFrancesDeChantalOverridden' );
                 break;
         }
     }
 
-    private function testJohnBaptist( int $Year, ConnectionInterface $to ) : void {
-        $req = "?year=$Year";
+    private function testJohnBaptist( string $Calendar, int $Year, string $category, ConnectionInterface $to ) : void {
+        if( $Calendar === 'VATICAN' ) {
+            $req = "?year=$Year";
+        } else {
+            $req = "?$category=$Calendar&year=$Year";
+        }
         $data = file_get_contents( self::LitCalBaseUrl . $req );
         if( $data !== false ) {
             $message = new stdClass();
@@ -296,8 +303,12 @@ private function testJohnBaptist( int $Year, ConnectionInterface $to ) : void {
         }
     }
 
-    private function testStJaneFrancesDeChantalMoved( int $Year, ConnectionInterface $to, string $test ) : void {
-        $req = "?year=$Year";
+    private function testStJaneFrancesDeChantalMoved( string $Calendar, int $Year, string $category, ConnectionInterface $to, string $test ) : void {
+        if( $Calendar === 'VATICAN' ) {
+            $req = "?year=$Year";
+        } else {
+            $req = "?$category=$Calendar&year=$Year";
+        }
         $data = file_get_contents( self::LitCalBaseUrl . $req );
         if( $data !== false ) {
             $message = new stdClass();
diff --git a/LitCalTestServer.php b/LitCalTestServer.php
index b87d8759..33bf9581 100644
--- a/LitCalTestServer.php
+++ b/LitCalTestServer.php
@@ -3,7 +3,7 @@
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 
-    include_once('./LitCalHealth.php');
+    include_once( 'LitCalHealth.php' );
     include_once( 'vendor/autoload.php' );
 
     $server = IoServer::factory(

From 16809cbc78ee9aa2b9155f0347f49af81f7322c3 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 4 Jun 2022 18:09:57 +0200
Subject: [PATCH 141/152] allow for national/diocesan calendar source checks

---
 LitCalHealth.php       | 59 +++++++++++++++++++++---------------------
 schemas/CommonDef.json |  1 +
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 73f3cc6b..41c7bd14 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -29,8 +29,12 @@ public function onMessage(ConnectionInterface $from, $msg) {
             if( property_exists( $messageReceived, 'action' ) ) {
                 switch( $messageReceived->action ) {
                     case 'executeValidation':
-                        if( property_exists( $messageReceived, 'validate' ) ) {
-                            $this->executeValidation( $messageReceived->validate, $from );
+                        if(
+                            property_exists( $messageReceived, 'validate' ) &&
+                            property_exists( $messageReceived, 'sourceFile' ) &&
+                            property_exists( $messageReceived, 'category' )
+                        ) {
+                            $this->executeValidation( $messageReceived, $from );
                         }
                         break;
                     case 'validateCalendar':
@@ -87,49 +91,42 @@ private function sendMessage( ConnectionInterface $from, string|stdClass $msg )
         }
     }
 
-
-    const SchemaValidation = [
-        "LitCalMetadata"                => "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php",
-        "PropriumDeTempore"             => "data/propriumdetempore.json",
-        "PropriumDeSanctis1970"         => "data/propriumdesanctis_1970/propriumdesanctis_1970.json",
-        "PropriumDeSanctis2002"         => "data/propriumdesanctis_2002/propriumdesanctis_2002.json",
-        "PropriumDeSanctis2008"         => "data/propriumdesanctis_2008/propriumdesanctis_2008.json",
-        "PropriumDeSanctisITALY1983"    => "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json",
-        "PropriumDeSanctisUSA2011"      => "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json",
-        "MemorialsFromDecrees"          => "data/memorialsFromDecrees/memorialsFromDecrees.json",
-        "RegionalCalendarsIndex"        => "nations/index.json"
-    ];
-
     const DataPathToSchema = [
         "https://litcal.johnromanodorazio.com/api/dev/LitCalMetadata.php"       => LitSchema::METADATA,
         "data/propriumdetempore.json"                                           => LitSchema::PROPRIUMDETEMPORE,
         "data/propriumdesanctis_1970/propriumdesanctis_1970.json"               => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdesanctis_2002/propriumdesanctis_2002.json"               => LitSchema::PROPRIUMDESANCTIS,
         "data/propriumdesanctis_2008/propriumdesanctis_2008.json"               => LitSchema::PROPRIUMDESANCTIS,
-        "data/propriumdesanctis_ITALY_1983/propriumdesanctis_ITALY_1983.json"   => LitSchema::PROPRIUMDESANCTIS,
-        "data/propriumdesanctis_USA_2011/propriumdesanctis_USA_2011.json"       => LitSchema::PROPRIUMDESANCTIS,
         "data/memorialsFromDecrees/memorialsFromDecrees.json"                   => LitSchema::DECREEMEMORIALS,
         "nations/index.json"                                                    => LitSchema::INDEX
     ];
 
     const LitCalBaseUrl = "https://litcal.johnromanodorazio.com/api/dev/LitCalEngine.php";
 
-    private object $CalendarData;
-
     public function __construct() {
         $this->clients = new \SplObjectStorage;
     }
 
-    private function executeValidation( string $validate, ConnectionInterface $to ) {
-        if( array_key_exists( $validate, LitCalHealth::SchemaValidation ) ) {
-            $dataPath = LitCalHealth::SchemaValidation[ $validate ];
-            $schema = LitCalHealth::DataPathToSchema[ $dataPath ];
+    private function executeValidation( object $validation, ConnectionInterface $to ) {
+        //if( file_exists( $validation->sourceFile ) ) {
+            $dataPath = $validation->sourceFile;
+            switch( $validation->category ) {
+                case 'universalcalendar':
+                    $schema = LitCalHealth::DataPathToSchema[ $dataPath ];
+                    break;
+                case 'nationalcalendar':
+                    $schema = LitSchema::NATIONAL;
+                    break;
+                case 'diocesancalendar':
+                    $schema = LitSchema::DIOCESAN;
+                    break;
+            }
             $data = file_get_contents( $dataPath );
             if( $data !== false ) {
                 $message = new stdClass();
                 $message->type = "success";
                 $message->text = "The Data file $dataPath exists";
-                $message->classes = ".$validate.file-exists";
+                $message->classes = ".$validation->validate.file-exists";
                 $this->sendMessage( $to, $message );
 
                 $jsonData = json_decode( $data );
@@ -137,7 +134,7 @@ private function executeValidation( string $validate, ConnectionInterface $to )
                     $message = new stdClass();
                     $message->type = "success";
                     $message->text = "The Data file $dataPath was successfully decoded as JSON";
-                    $message->classes = ".$validate.json-valid";
+                    $message->classes = ".$validation->validate.json-valid";
                     $this->sendMessage( $to, $message );
 
                     $validationResult = $this->validateDataAgainstSchema( $jsonData, $schema );
@@ -145,18 +142,18 @@ private function executeValidation( string $validate, ConnectionInterface $to )
                         $message = new stdClass();
                         $message->type = "success";
                         $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
-                        $message->classes = ".$validate.schema-valid";
+                        $message->classes = ".$validation->validate.schema-valid";
                         $this->sendMessage( $to, $message );
                     }
                     else if( gettype( $validationResult === 'object' ) ) {
-                        $validationResult->classes = ".$validate.schema-valid";
+                        $validationResult->classes = ".$validation->validate.schema-valid";
                         $this->sendMessage( $to, $validationResult );
                     }
                 } else {
                     $message = new stdClass();
                     $message->type = "error";
                     $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
-                    $message->classes = ".$validate.json-valid";
+                    $message->classes = ".$validation->validate.json-valid";
                     $this->sendMessage( $to, $message );
                 }
 
@@ -164,15 +161,17 @@ private function executeValidation( string $validate, ConnectionInterface $to )
                 $message = new stdClass();
                 $message->type = "error";
                 $message->text = "Data file $dataPath does not exist";
-                $message->classes = ".$validate.file-exists";
+                $message->classes = ".$validation->validate.file-exists";
                 $this->sendMessage( $to, $message );
             }
+        /*
         } else {
             $message = new stdClass();
             $message->type = "error";
-            $message->text = "The validation requested \"{$validate}\" does not seem to be a supported validation";
+            $message->text = "The validation requested \"{$validation->validate}\" does not seem to be a supported validation, or the corresponding file to validate \"{$validation->sourceFile} does not exist\"";
             $this->sendMessage( $to, $message );
         }
+        */
     }
 
     private function validateCalendar( string $Calendar, int $Year, string $category, ConnectionInterface $to ) : void {
diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json
index 8cccd01f..1150f929 100644
--- a/schemas/CommonDef.json
+++ b/schemas/CommonDef.json
@@ -563,6 +563,7 @@
                 "UKRAINE",
                 "UNITED ARAB EMIRATES",
                 "UNITED KINGDOM",
+                "UNITED STATES",
                 "USA",
                 "URUGUAY",
                 "UZBEKISTAN",

From 34ef54f06d5183b463cce0305f649c182edca2b3 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 4 Jun 2022 23:40:20 +0200
Subject: [PATCH 142/152] add more data to the metadata endpoint for nations
 add Missals and WiderRegions for better discovery

---
 LitCalMetadata.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/LitCalMetadata.php b/LitCalMetadata.php
index 9cbe98c0..1885d229 100644
--- a/LitCalMetadata.php
+++ b/LitCalMetadata.php
@@ -27,6 +27,7 @@
         $diocesanCalendars  = json_decode( $index, true );
         $nationalCalendars  = [];
         $diocesanGroups     = [];
+        $nationalCalendarsMetadata = [];
         foreach( $diocesanCalendars as $key => $value ) {
             unset( $diocesanCalendars[$key]["path"] );
             if( array_key_exists( "group", $value ) && $value !== "" ) {
@@ -37,14 +38,25 @@
             }
             if( !array_key_exists($diocesanCalendars[$key]["nation"], $nationalCalendars) ) {
                 $nationalCalendars[$diocesanCalendars[$key]["nation"]] = [];
+                $nationalCalendarsMetadata[$diocesanCalendars[$key]["nation"]] = [
+                    "missals" => [],
+                    "widerRegions" => [],
+                    "dioceses" => []
+                ];
             }
             $nationalCalendars[$diocesanCalendars[$key]["nation"]][] = $key;
+            $nationalCalendarsMetadata[$diocesanCalendars[$key]["nation"]]["dioceses"][] = $key;
         }
 
         foreach( $baseNationalCalendars as $nation ) {
             if( !array_key_exists( $nation, $nationalCalendars ) ) {
                 $nationalCalendars[$nation] = [];
             }
+            if( file_exists( "nations/$nation/$nation.json" ) ) {
+                $nationData = json_decode( file_get_contents( "nations/$nation/$nation.json" ) );
+                $nationalCalendarsMetadata[$nation]["missals"] = $nationData->Metadata->Missals;
+                $nationalCalendarsMetadata[$nation]["widerRegions"][] = $nationData->Metadata->WiderRegion->name;
+            }
         }
         $filterDirResults = ['..', '.', 'index.json'];
         $dirResults = array_diff( scandir('nations'), $filterDirResults );
@@ -58,6 +70,7 @@
         $response = json_encode( [
             "LitCalMetadata" => [
                 "NationalCalendars" => $nationalCalendars,
+                "NationalCalendarsMetadata" => $nationalCalendarsMetadata,
                 "DiocesanCalendars" => $diocesanCalendars,
                 "DiocesanGroups"    => $diocesanGroups,
                 "WiderRegions"      => $widerRegionsNames,

From a1de05c641b6d103b89577ca225da3d95073bb65 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 4 Jun 2022 23:41:19 +0200
Subject: [PATCH 143/152] automate schema check based on test category

---
 LitCalHealth.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index 41c7bd14..a502b251 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -120,6 +120,12 @@ private function executeValidation( object $validation, ConnectionInterface $to
                 case 'diocesancalendar':
                     $schema = LitSchema::DIOCESAN;
                     break;
+                case 'widerregioncalendar':
+                    $schema = LitSchema::WIDERREGION;
+                    break;
+                case 'propriumdesanctis':
+                    $schema = LitSchema::PROPRIUMDESANCTIS;
+                    break;
             }
             $data = file_get_contents( $dataPath );
             if( $data !== false ) {

From 228af9cbc07ec41004046af44b37101fab410f1f Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Sat, 4 Jun 2022 23:56:33 +0200
Subject: [PATCH 144/152] add NationalCalendarsMetadata to schema

---
 schemas/LitCalMetadata.json | 76 +++++++++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/schemas/LitCalMetadata.json b/schemas/LitCalMetadata.json
index d55dfb81..f72f48f6 100644
--- a/schemas/LitCalMetadata.json
+++ b/schemas/LitCalMetadata.json
@@ -27,7 +27,39 @@
                                 "type": "string"
                             }
                         }
+                    }
+                },
+                "NationalCalendarsMetadata": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "propertyNames": {
+                        "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Region"
+                    },
+                    "patternProperties": {
+                        "": {
+                            "type": "object",
+                            "properties": {
+                                "missals": {
+                                    "type": "array",
+                                    "items": {
+                                        "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/Missal"
+                                    }
+                                },
+                                "widerRegions": {
+                                    "type": "array",
+                                    "items": {
+                                        "$ref": "#/definitions/WiderRegionDef"
+                                    }
+                                },
+                                "dioceses": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
                         }
+                    }
                 },
                 "DiocesanCalendars": {
                     "type": "object",
@@ -50,7 +82,7 @@
                                 "diocese"
                             ]
                         }
-                        }
+                    }
                 },
                 "DiocesanGroups": {
                     "type": "object",
@@ -66,25 +98,7 @@
                 "WiderRegions": {
                     "type": "array",
                     "items": {
-                        "type": "string",
-                        "enum": [
-                            "Africa",
-                            "Alsace",
-                            "Americas",
-                            "Anatolia",
-                            "Antarctica",
-                            "Asia",
-                            "Australasia",
-                            "Central Africa",
-                            "Central America",
-                            "Europe",
-                            "Indies",
-                            "North Africa",
-                            "Oceania",
-                            "Scandinavia",
-                            "South America",
-                            "West Indies"
-                        ]
+                        "$ref": "#/definitions/WiderRegionDef"
                     }
                 },
                 "RomanMissals": {
@@ -132,12 +146,34 @@
             },
             "required": [
                 "NationalCalendars",
+                "NationalCalendarsMetadata",
                 "DiocesanCalendars",
                 "DiocesanGroups",
                 "WiderRegions",
                 "RomanMissals"
             ],
             "additionalProperties": false
+        },
+        "WiderRegionDef": {
+            "type": "string",
+            "enum": [
+                "Africa",
+                "Alsace",
+                "Americas",
+                "Anatolia",
+                "Antarctica",
+                "Asia",
+                "Australasia",
+                "Central Africa",
+                "Central America",
+                "Europe",
+                "Indies",
+                "North Africa",
+                "Oceania",
+                "Scandinavia",
+                "South America",
+                "West Indies"
+            ]
         }
     }
 }

From d71253d769b437a80538c900c09eaeb4a6ae6816 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Sun, 5 Jun 2022 13:25:26 +0000
Subject: [PATCH 145/152] Translated using Weblate (German)

Currently translated at 4.5% (5 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/de/
---
 i18n/de/LC_MESSAGES/litcal.mo | Bin 737 -> 734 bytes
 i18n/de/LC_MESSAGES/litcal.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.mo b/i18n/de/LC_MESSAGES/litcal.mo
index 295fac53609fb1200e448a2214d383974e498445..d625cf5e05cbb9c3ef6bead171d418f9b6819d7c 100644
GIT binary patch
delta 39
tcmaFJdXIHN4zDN!1H*161_mA=eQ{%DI1?X(n`>~0kEgSTx2tCe0|3VH36cN+

delta 42
wcmcb|`jB-(4zC0Q1H*161_mA=ePv^1IFn#WY951|YjB8<r?ZE*t7ixU0PcPY;s5{u

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 79cad13b..9481ccfb 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-05-22 09:41+0000\n"
-"PO-Revision-Date: 2022-06-02 20:16+0000\n"
+"PO-Revision-Date: 2022-06-06 06:40+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/de/>\n"
@@ -752,7 +752,7 @@ msgstr ""
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:100
 msgid "Optional memorial"
-msgstr "Optionale Gedenkstätten"
+msgstr "Optionale Gedenkstät"
 
 #. translators: liturgical rank. Keep Capitalized
 #: includes/enums/LitGrade.php:105

From a52019ed070436b5d271b05591d5d2e7f5d93477 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 6 Jun 2022 10:19:31 +0200
Subject: [PATCH 146/152] prettify

---
 LitCalHealth.php     | 95 ++++++++++++++++++++------------------------
 LitCalTestServer.php | 22 +++++-----
 2 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/LitCalHealth.php b/LitCalHealth.php
index a502b251..a379ade0 100644
--- a/LitCalHealth.php
+++ b/LitCalHealth.php
@@ -108,76 +108,67 @@ public function __construct() {
     }
 
     private function executeValidation( object $validation, ConnectionInterface $to ) {
-        //if( file_exists( $validation->sourceFile ) ) {
-            $dataPath = $validation->sourceFile;
-            switch( $validation->category ) {
-                case 'universalcalendar':
-                    $schema = LitCalHealth::DataPathToSchema[ $dataPath ];
-                    break;
-                case 'nationalcalendar':
-                    $schema = LitSchema::NATIONAL;
-                    break;
-                case 'diocesancalendar':
-                    $schema = LitSchema::DIOCESAN;
-                    break;
-                case 'widerregioncalendar':
-                    $schema = LitSchema::WIDERREGION;
-                    break;
-                case 'propriumdesanctis':
-                    $schema = LitSchema::PROPRIUMDESANCTIS;
-                    break;
-            }
-            $data = file_get_contents( $dataPath );
-            if( $data !== false ) {
+        $dataPath = $validation->sourceFile;
+        switch( $validation->category ) {
+            case 'universalcalendar':
+                $schema = LitCalHealth::DataPathToSchema[ $dataPath ];
+                break;
+            case 'nationalcalendar':
+                $schema = LitSchema::NATIONAL;
+                break;
+            case 'diocesancalendar':
+                $schema = LitSchema::DIOCESAN;
+                break;
+            case 'widerregioncalendar':
+                $schema = LitSchema::WIDERREGION;
+                break;
+            case 'propriumdesanctis':
+                $schema = LitSchema::PROPRIUMDESANCTIS;
+                break;
+        }
+        $data = file_get_contents( $dataPath );
+        if( $data !== false ) {
+            $message = new stdClass();
+            $message->type = "success";
+            $message->text = "The Data file $dataPath exists";
+            $message->classes = ".$validation->validate.file-exists";
+            $this->sendMessage( $to, $message );
+
+            $jsonData = json_decode( $data );
+            if( json_last_error() === JSON_ERROR_NONE ) {
                 $message = new stdClass();
                 $message->type = "success";
-                $message->text = "The Data file $dataPath exists";
-                $message->classes = ".$validation->validate.file-exists";
+                $message->text = "The Data file $dataPath was successfully decoded as JSON";
+                $message->classes = ".$validation->validate.json-valid";
                 $this->sendMessage( $to, $message );
 
-                $jsonData = json_decode( $data );
-                if( json_last_error() === JSON_ERROR_NONE ) {
+                $validationResult = $this->validateDataAgainstSchema( $jsonData, $schema );
+                if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
                     $message = new stdClass();
                     $message->type = "success";
-                    $message->text = "The Data file $dataPath was successfully decoded as JSON";
-                    $message->classes = ".$validation->validate.json-valid";
-                    $this->sendMessage( $to, $message );
-
-                    $validationResult = $this->validateDataAgainstSchema( $jsonData, $schema );
-                    if( gettype( $validationResult ) === 'boolean' && $validationResult === true ) {
-                        $message = new stdClass();
-                        $message->type = "success";
-                        $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
-                        $message->classes = ".$validation->validate.schema-valid";
-                        $this->sendMessage( $to, $message );
-                    }
-                    else if( gettype( $validationResult === 'object' ) ) {
-                        $validationResult->classes = ".$validation->validate.schema-valid";
-                        $this->sendMessage( $to, $validationResult );
-                    }
-                } else {
-                    $message = new stdClass();
-                    $message->type = "error";
-                    $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
-                    $message->classes = ".$validation->validate.json-valid";
+                    $message->text = "The Data file $dataPath was successfully validated against the Schema $schema";
+                    $message->classes = ".$validation->validate.schema-valid";
                     $this->sendMessage( $to, $message );
                 }
-
+                else if( gettype( $validationResult === 'object' ) ) {
+                    $validationResult->classes = ".$validation->validate.schema-valid";
+                    $this->sendMessage( $to, $validationResult );
+                }
             } else {
                 $message = new stdClass();
                 $message->type = "error";
-                $message->text = "Data file $dataPath does not exist";
-                $message->classes = ".$validation->validate.file-exists";
+                $message->text = "There was an error decoding the Data file $dataPath as JSON: " . json_last_error_msg();
+                $message->classes = ".$validation->validate.json-valid";
                 $this->sendMessage( $to, $message );
             }
-        /*
+
         } else {
             $message = new stdClass();
             $message->type = "error";
-            $message->text = "The validation requested \"{$validation->validate}\" does not seem to be a supported validation, or the corresponding file to validate \"{$validation->sourceFile} does not exist\"";
+            $message->text = "Data file $dataPath does not exist";
+            $message->classes = ".$validation->validate.file-exists";
             $this->sendMessage( $to, $message );
         }
-        */
     }
 
     private function validateCalendar( string $Calendar, int $Year, string $category, ConnectionInterface $to ) : void {
diff --git a/LitCalTestServer.php b/LitCalTestServer.php
index 33bf9581..65eb0739 100644
--- a/LitCalTestServer.php
+++ b/LitCalTestServer.php
@@ -3,16 +3,16 @@
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 
-    include_once( 'LitCalHealth.php' );
-    include_once( 'vendor/autoload.php' );
+include_once( 'LitCalHealth.php' );
+include_once( 'vendor/autoload.php' );
 
-    $server = IoServer::factory(
-        new HttpServer(
-            new WsServer(
-                new LitCalHealth()
-            )
-        ),
-        8080
-    );
+$server = IoServer::factory(
+    new HttpServer(
+        new WsServer(
+            new LitCalHealth()
+        )
+    ),
+    8080
+);
 
-    $server->run();
+$server->run();

From 8eadab79ea5200535b21a6f7a37257a7a13305e7 Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 6 Jun 2022 10:20:46 +0200
Subject: [PATCH 147/152] add translator comments to translation strings

---
 LitCalEngine.php       |   3 +-
 includes/LitCalAPI.php | 193 +++++++++++++++++++++++------------------
 2 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/LitCalEngine.php b/LitCalEngine.php
index 6ea5393a..37902562 100644
--- a/LitCalEngine.php
+++ b/LitCalEngine.php
@@ -5,9 +5,8 @@
  * Author: John Romano D'Orazio
  * Email: priest@johnromanodorazio.com
  * Licensed under the Apache 2.0 License
- * Version 3.0
+ * Version 3.4
  * Date Created: 27 December 2017
- * Note: it is necessary to set up the MySQL liturgy tables prior to using this script
  */
 
 
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
index 845ed87e..d2640d8c 100644
--- a/includes/LitCalAPI.php
+++ b/includes/LitCalAPI.php
@@ -261,12 +261,14 @@ private function loadPropriumDeSanctisData( string $missal ) : void {
                 }
             } else {
                 $this->Messages[] = sprintf(
+                    /**translators: name of the Roman Missal */
                     _( 'Data for the sanctorale from %s could not be found.' ),
                     RomanMissal::getName( $missal )
                 );
             }
         } else {
             $this->Messages[] = sprintf(
+                /**translators: name of the Roman Missal */
                 _( 'Translation data for the sanctorale from %s could not be found.' ),
                 RomanMissal::getName( $missal )
             );
@@ -547,7 +549,8 @@ private function calculateFixedSolemnities() : void {
                     if( $row->TAG === "StJoseph" && $currentFeastDate >= $this->Cal->getFestivity("PalmSun")->date && $currentFeastDate <= $this->Cal->getFestivity("Easter")->date ){
                         $tempFestivity->date = LitFunc::calcGregEaster( $this->LitSettings->Year )->sub( new DateInterval( 'P8D' ) );
                         $this->Messages[] = sprintf(
-                            _( "The Solemnity '%s' falls on %s in the year %d, the celebration has been transferred to %s (%s) as per the %s." ),
+                            /**translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship  */
+                            _( 'The Solemnity \'%1$s\' falls on %2$s in the year %3$d, the celebration has been transferred to %4$s (%5$s) as per the %6$s.' ),
                             $tempFestivity->name,
                             $this->Cal->solemnityFromDate( $currentFeastDate )->name,
                             $this->LitSettings->Year,
@@ -563,7 +566,8 @@ private function calculateFixedSolemnities() : void {
                         //if the Annunciation falls during Holy Week or within the Octave of Easter, it is transferred to the Monday after the Second Sunday of Easter.
                         $tempFestivity->date = LitFunc::calcGregEaster( $this->LitSettings->Year )->add( new DateInterval( 'P8D' ) );
                         $this->Messages[] = sprintf(
-                            _( "The Solemnity '%s' falls on %s in the year %d, the celebration has been transferred to %s (%s) as per the %s." ),
+                            /**translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship */
+                            _( 'The Solemnity \'%1$s\' falls on %2$s in the year %3$d, the celebration has been transferred to %4$s (%5$s) as per the %6$s.' ),
                             $tempFestivity->name,
                             $this->Cal->solemnityFromDate( $currentFeastDate )->name,
                             $this->LitSettings->Year,
@@ -589,7 +593,8 @@ private function calculateFixedSolemnities() : void {
                         $tempFestivity->date = clone( $currentFeastDate );
                         $tempFestivity->date->add( new DateInterval( 'P1D' ) );
                         $this->Messages[] = sprintf(
-                            _( "The Solemnity '%s' falls on %s in the year %d, the celebration has been transferred to %s (%s) as per the %s." ),
+                            /**translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship  */
+                            _( 'The Solemnity \'%1$s\' falls on %2$s in the year %3$d, the celebration has been transferred to %4$s (%5$s) as per the %6$s.' ),
                             $tempFestivity->name,
                             $this->Cal->solemnityFromDate( $currentFeastDate )->name,
                             $this->LitSettings->Year,
@@ -604,7 +609,8 @@ private function calculateFixedSolemnities() : void {
                     else{
                         //In all other cases, let's make a note of what's happening and ask the Congegation for Divine Worship
                         $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                            _( "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We should ask the Congregation for Divine Worship what to do about this!" ),
+                            /**translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year */
+                            _( 'The Solemnity \'%1$s\' coincides with the Solemnity \'%2$s\' in the year %3$d. We should ask the Congregation for Divine Worship what to do about this!' ),
                             $row->NAME,
                             $this->Cal->solemnityFromDate( $currentFeastDate )->name,
                             $this->LitSettings->Year
@@ -622,7 +628,8 @@ private function calculateFixedSolemnities() : void {
                         if( !$this->Cal->inSolemnities( $NativityJohnBaptistNewDate->sub( new DateInterval( 'P1D' ) ) ) ) {
                             $tempFestivity->date->sub( new DateInterval( 'P1D' ) );
                             $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                                _( "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year %d, it has been anticipated by one day as per %s." ),
+                                /**translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship */
+                                _( 'Seeing that the Solemnity \'%1$s\' coincides with the Solemnity \'%2$s\' in the year %3$d, it has been anticipated by one day as per %4$s.' ),
                                 $tempFestivity->name,
                                 $SacredHeart->name,
                                 $this->LitSettings->Year,
@@ -690,7 +697,8 @@ private function calculateFeastsOfTheLord() : void {
             $holyFamilyDate = LitDateTime::createFromFormat( '!j-n-Y', '30-12-' . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
             $HolyFamily = new Festivity( $this->PropriumDeTempore[ "HolyFamily" ][ "NAME" ], $holyFamilyDate, LitColor::WHITE, LitFeastType::MOBILE, LitGrade::FEAST_LORD );
             $this->Messages[] = sprintf(
-                _( "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is celebrated on %s rather than on the Sunday after Christmas." ),
+                /**translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family */
+                _( '\'%1$s\' falls on a Sunday in the year %2$d, therefore the Feast \'%3$s\' is celebrated on %4$s rather than on the Sunday after Christmas.' ),
                 $this->Cal->getFestivity( "Christmas" )->name,
                 $this->LitSettings->Year,
                 $HolyFamily->name,
@@ -724,7 +732,8 @@ private function calculateSundaysChristmasOrdinaryTime() : void {
                 $this->Cal->addFestivity( "OrdSunday" . $ordSun, new Festivity( $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ], $firstOrdinary, LitColor::GREEN, LitFeastType::MOBILE, LitGrade::FEAST_LORD ) );
             } else {
                 $this->Messages[] = sprintf(
-                    _( "'%s' is superseded by the %s '%s' in the year %d." ),
+                    /**translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year */
+                    _( '\'%1$s\' is superseded by the %2$s \'%3$s\' in the year %4$d.' ),
                     $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ],
                     $this->Cal->solemnityFromDate( $firstOrdinary )->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $this->Cal->solemnityFromDate( $firstOrdinary )->grade, false ) . '</i>' : $this->LitGrade->i18n( $this->Cal->solemnityFromDate( $firstOrdinary )->grade, false ),
                     $this->Cal->solemnityFromDate( $firstOrdinary )->name,
@@ -748,7 +757,8 @@ private function calculateSundaysChristmasOrdinaryTime() : void {
                 $this->Cal->addFestivity( "OrdSunday" . $ordSun, new Festivity( $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ], $lastOrdinary, LitColor::GREEN, LitFeastType::MOBILE, LitGrade::FEAST_LORD ) );
             } else {
                 $this->Messages[] = sprintf(
-                    _( "'%s' is superseded by the %s '%s' in the year %d." ),
+                    /**translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year */
+                    _( '\'%1$s\' is superseded by the %2$s \'%3$s\' in the year %4$d.' ),
                     $this->PropriumDeTempore[ "OrdSunday" . $ordSun ][ "NAME" ],
                     $this->Cal->solemnityFromDate( $lastOrdinary )->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $this->Cal->solemnityFromDate( $lastOrdinary )->grade, false ) . '</i>' : $this->LitGrade->i18n( $this->Cal->solemnityFromDate( $lastOrdinary )->grade, false ),
                     $this->Cal->solemnityFromDate( $lastOrdinary )->name,
@@ -865,7 +875,7 @@ private function addMissalMemorialMessage( object $row ) {
          * 3. Day of the festivity
          * 4. Year from which the festivity has been added
          * 5. Source of the information
-         * 6. Current year
+         * 6. Requested calendar year
          */
         $message = _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' );
         $this->Messages[] = sprintf(
@@ -945,7 +955,7 @@ private function reduceMemorialsInAdventLentToCommemoration( DateTime $currentFe
             /**translators:
              * 1. Grade or rank of the festivity
              * 2. Name of the festivity
-             * 3. Current year
+             * 3. Requested calendar year
              */
             $message = _( 'The %1$s \'%2$s\' either falls between 17 Dec. and 24 Dec., or during the Octave of Christmas, or on the weekdays of the Lenten season in the year %3$d, rank reduced to Commemoration.' );
             $this->Messages[] = sprintf(
@@ -967,7 +977,7 @@ private function removeWeekdaysEpiphanyOverridenByMemorials( string $tag ) {
                  * 2. Name of the festivity that has been superseded
                  * 3. Grade or rank of the festivity that is superseding
                  * 4. Name of the festivity that is superseding
-                 * 5. Current year
+                 * 5. Requested calendar year
                  */
                 $message = _( 'The %1$s \'%2$s\' is superseded by the %3$s \'%4$s\' in the year %5$d.' );
                 $this->Messages[] = sprintf(
@@ -1009,7 +1019,7 @@ private function handleCoincidence( stdClass $row, string $missal = RomanMissal:
          * 6. Date in which the superseded festivity is usually celebrated
          * 7. Grade or rank of the festivity that is superseding
          * 8. Name of the festivity that is superseding
-         * 9. Current year
+         * 9. Requested calendar year
          */
         $message = _( 'The %1$s \'%2$s\', added in the %3$s of the Roman Missal since the year %4$d (%5$s) and usually celebrated on %6$s, is suppressed by the %7$s \'%8$s\' in the year %9$d.' );
         $this->Messages[] = sprintf(
@@ -1045,7 +1055,7 @@ private function handleCoincidenceDecree( object $row ) : void {
              * 5. Source of the information
              * 6. Grade or rank of the superseding festivity
              * 7. Name of the superseding festivity
-             * 8. Current year
+             * 8. Requested calendar year
              */
             _( 'The %1$s \'%2$s\', added on %3$s since the year %4$d (%5$s), is however superseded by a %6$s \'%7$s\' in the year %8$d.' ),
             $this->LitGrade->i18n( $row->Festivity->GRADE ),
@@ -1083,7 +1093,7 @@ private function checkImmaculateHeartCoincidence( DateTime $currentFeastDate, st
                         /**translators:
                          * 1. Name of the first coinciding Memorial
                          * 2. Name of the second coinciding Memorial
-                         * 3. Current year
+                         * 3. Requested calendar year
                          * 4. Source of the information
                          */
                         _( 'The Memorial \'%1$s\' coincides with another Memorial \'%2$s\' in the year %3$d. They are both reduced in rank to optional memorials (%4$s).' ),
@@ -1126,7 +1136,7 @@ private function createFestivityFromDecree( object $row ) : void {
                          * 3. Day of the festivity
                          * 4. Year from which the festivity has been added
                          * 5. Source of the information
-                         * 6. Current year
+                         * 6. Requested calendar year
                          */
                         _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' ),
                         $this->LitGrade->i18n( $row->Festivity->GRADE, false ),
@@ -1160,7 +1170,7 @@ private function setPropertyBasedOnDecree( object $row ) : void {
                      * 2. Name of the festivity
                      * 3. New name of the festivity
                      * 4. Year from which the grade has been changed
-                     * 5. Current year
+                     * 5. Requested calendar year
                      * 6. Source of the information
                      */
                     $message = _( 'The name of the %1$s \'%2$s\' has been changed to %3$s since the year %4$d, applicable to the year %5$d (%6$s).' );
@@ -1182,7 +1192,7 @@ private function setPropertyBasedOnDecree( object $row ) : void {
                          * 2. Name of the festivity
                          * 3. New grade of the festivity
                          * 4. Year from which the grade has been changed
-                         * 5. Current year
+                         * 5. Requested calendar year
                          * 6. Source of the information
                          */
                         $message = _( 'The %1$s \'%2$s\' has been raised to the rank of %3$s since the year %4$d, applicable to the year %5$d (%6$s).' );
@@ -1192,7 +1202,7 @@ private function setPropertyBasedOnDecree( object $row ) : void {
                          * 2. Name of the festivity
                          * 3. New grade of the festivity
                          * 4. Year from which the grade has been changed
-                         * 5. Current year
+                         * 5. Requested calendar year
                          * 6. Source of the information
                          */
                         $message = _( 'The %1$s \'%2$s\' has been lowered to the rank of %3$s since the year %4$d, applicable to the year %5$d (%6$s).' );
@@ -1226,7 +1236,7 @@ function( $row ) {
                     /**translators:
                      * 1. Name of the festivity
                      * 2. Year in which was declared Doctor
-                     * 3. Current year
+                     * 3. Requested calendar year
                      * 4. Source of the information
                      */
                     $message = _( '\'%1$s\' has been declared a Doctor of the Church since the year %2$d, applicable to the year %3$d (%4$s).' );
@@ -1303,7 +1313,7 @@ private function createMobileFestivity( object $row ) : void {
              * 3. Indication of the mobile date for the festivity being created
              * 4. Year from which the festivity has been added
              * 5. Source of the information
-             * 6. Current year
+             * 6. Requested calendar year
              */
             _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' ),
             $this->LitGrade->i18n( $row->Festivity->GRADE, false ),
@@ -1340,7 +1350,7 @@ private function checkCoincidencesNewMobileFestivity( object $row ) : bool {
                      * 5. Source of the information
                      * 6. Grade or rank of superseding festivity
                      * 7. Name of superseding festivity
-                     * 8. Current year
+                     * 8. Requested calendar year
                      */
                     _( 'The %1$s \'%2$s\', added on %3$s since the year %4$d (%5$s), is however superseded by the %6$s \'%7$s\' in the year %8$d.' ),
                     $this->LitGrade->i18n( $row->Festivity->GRADE, false ),
@@ -1361,7 +1371,7 @@ private function checkCoincidencesNewMobileFestivity( object $row ) : bool {
                         foreach( $coincidingFestivities as $coincidingFestivityKey => $coincidingFestivity ) {
                             $this->Messages[] = sprintf(
                                 /**translators:
-                                 * 1. Current year
+                                 * 1. Requested calendar year
                                  * 2. Grade or rank of suppressed festivity
                                  * 3. Name of suppressed festivity
                                  * 4. Grade or rank of the festivity being created
@@ -1428,7 +1438,8 @@ private function handleSaintJaneFrancesDeChantal() {
             if( $festivity !== null ) {
                 $this->Cal->moveFestivityDate( "StJaneFrancesDeChantal", $StJaneFrancesNewDate );
                 $this->Messages[] = sprintf(
-                    _( "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 since the year 2002 (%s), applicable to the year %d." ),
+                    /**translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year  */
+                    _( 'The optional memorial \'%1$s\' has been transferred from Dec. 12 to Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d.' ),
                     $festivity->name,
                     "<a href=\"http://www.vatican.va/roman_curia/congregations/ccdds/documents/rc_con_ccdds_doc_20000628_guadalupe_$lang.html\">" . _( 'Decree of the Congregation for Divine Worship' ) . '</a>',
                     $this->LitSettings->Year
@@ -1440,7 +1451,8 @@ private function handleSaintJaneFrancesDeChantal() {
                 $festivity = new Festivity( $row->NAME, $StJaneFrancesNewDate, $row->COLOR, LitFeastType::FIXED, $row->GRADE, $row->COMMON );
                 $this->Cal->addFestivity( "StJaneFrancesDeChantal", $festivity );
                 $this->Messages[] = sprintf(
-                    _( "The optional memorial '%s', which would have been superseded this year by a Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. 12 since the year 2002 (%s), applicable to the year %d." ),
+                    /**translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year  */
+                    _( 'The optional memorial \'%1$s\', which would have been superseded this year by a Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d.' ),
                     $festivity->name,
                     "<a href=\"http://www.vatican.va/roman_curia/congregations/ccdds/documents/rc_con_ccdds_doc_20000628_guadalupe_$lang.html\">" . _( 'Decree of the Congregation for Divine Worship' ) . '</a>',
                     $this->LitSettings->Year
@@ -1481,7 +1493,8 @@ private function applyOptionalMemorialDecree2009() : void {
             $langs = ["FR" => "fr", "EN" => "en", "IT" => "it", "LA" => "lt", "PT" => "pt", "ES" => "sp", "DE" => "ge"];
             $lang = in_array( $this->LitSettings->Locale, array_keys($langs) ) ? $langs[$this->LitSettings->Locale] : "en";
             $this->Messages[] = sprintf(
-                _( 'The Feast \'%s\' would have been suppressed this year ( 2009 ) since it falls on a Sunday, however being the Year of the Apostle Paul, as per the %s it has been reinstated so that local churches can optionally celebrate the memorial.' ),
+                /**translators: 1: Festivity name, 2: Source of the information  */
+                _( 'The Feast \'%1$s\' would have been suppressed this year ( 2009 ) since it falls on a Sunday, however being the Year of the Apostle Paul, as per the %2$s it has been reinstated so that local churches can optionally celebrate the memorial.' ),
                 '<i>' . $row->NAME . '</i>',
                 "<a href=\"http://www.vatican.va/roman_curia/congregations/ccdds/documents/rc_con_ccdds_doc_20080125_san-paolo_$lang.html\">" . _( 'Decree of the Congregation for Divine Worship' ) . '</a>'
             );
@@ -1659,7 +1672,7 @@ private function handleMissingFestivity( object $row ) : void {
                  * 3. Date on which the festivity is usually celebrated
                  * 4. Grade of the superseding festivity
                  * 5. Name of the superseding festivity
-                 * 6. Current year
+                 * 6. Requested calendar year
                  */
                 _( 'The %1$s \'%2$s\', usually celebrated on %3$s, is suppressed by the %4$s \'%5$s\' in the year %6$d.' ),
                 $this->LitGrade->i18n( $row->Festivity->grade, false ),
@@ -1723,7 +1736,7 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
                     /**translators:
                      * 1. Name of the first coinciding Memorial
                      * 2. Name of the second coinciding Memorial
-                     * 3. Current year
+                     * 3. Requested calendar year
                      * 4. Source of the information
                      */
                     _( 'The Memorial \'%1$s\' coincides with another Memorial \'%2$s\' in the year %3$d. They are both reduced in rank to optional memorials.' ),
@@ -1742,8 +1755,9 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
                     //$this->Cal->setProperty( $key, "grade", LitGrade::MEMORIAL_OPT );
                     $coincidingFeastName = $value->name;
                 }
-                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                    $this->LitSettings->NationalCalendar . ": the Feast '%s', usually celebrated on %s, coincides with another Feast '%s' in the year %d! Does something need to be done about this?",
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . $this->LitSettings->NationalCalendar . ": " . sprintf(
+                    /**translators: 1. Festivity name, 2. Festivity date, 3. Coinciding festivity name, 4. Requested calendar year */
+                    'The Feast \'%1$s\', usually celebrated on %2$s, coincides with another Feast \'%3$s\' in the year %4$d! Does something need to be done about this?',
                     '<b>' . $row->Festivity->name . '</b>',
                     '<b>' . $this->dayAndMonth->format(  $row->Festivity->DATE->format( 'U' ) ) . '</b>',
                     '<b>' . $coincidingFeastName . '</b>',
@@ -1753,8 +1767,9 @@ private function handleFestivityCreationWithCoincidence( object $row ) : void {
             case LitGrade::SOLEMNITY:
                 //there seems to be a coincidence with a different Solemnity on the same day!
                 //should we attempt to move to the next open slot?
-                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                    $this->LitSettings->NationalCalendar . ": the Solemnity '%s', usually celebrated on %s, coincides with the Sunday or Solemnity '%s' in the year %d! Does something need to be done about this?",
+                $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . $this->LitSettings->NationalCalendar . ": " . sprintf(
+                    /**translators: 1. Festivity name, 2. Festivity date, 3. Coinciding festivity name, 4. Requested calendar year */
+                    'The Solemnity \'%1$s\', usually celebrated on %2$s, coincides with the Sunday or Solemnity \'%3$s\' in the year %4$d! Does something need to be done about this?',
                     '<i>' . $row->Festivity->name . '</i>',
                     '<b>' . $this->dayAndMonth->format(  $row->Festivity->DATE->format( 'U' ) ) . '</b>',
                     '<i>' . $this->Cal->solemnityFromDate(  $row->Festivity->DATE )->name . '</i>',
@@ -1820,7 +1835,7 @@ private function createNewRegionalOrNationalFestivity( object $row ) : void {
                  * 3. Day of the festivity
                  * 4. Year from which the festivity has been added
                  * 5. Source of the information
-                 * 6. Current year
+                 * 6. Requested calendar year
                  */
                 _( 'The %1$s \'%2$s\' has been added on %3$s since the year %4$d (%5$s), applicable to the year %6$d.' ),
                 $this->LitGrade->i18n( $row->Festivity->grade, false ),
@@ -1901,6 +1916,7 @@ private function applyNationalCalendar() : void {
                     } else {
                         if( RomanMissal::getSanctoraleFileName( $missal ) !== false ) {
                             $this->Messages[] = sprintf(
+                                /**translators: Name of the Roman Missal */
                                 _( 'Found a sanctorale data file for %s' ),
                                 RomanMissal::getName( $missal )
                             );
@@ -1929,7 +1945,7 @@ private function applyNationalCalendar() : void {
                                              * 4. Edition of the Roman Missal
                                              * 5. Superseding festivity grade
                                              * 6. Superseding festivity name
-                                             * 7. Current year
+                                             * 7. Requested calendar year
                                              */
                                             $this->NationalData->Metadata->Region . ": " . _( 'The %1$s \'%2$s\' (%3$s), added to the national calendar in the %4$s, is superseded by the %5$s \'%6$s\' in the year %7$d' ),
                                             $row->DISPLAYGRADE !== "" ? $row->DISPLAYGRADE : $this->LitGrade->i18n( $row->GRADE, false ),
@@ -1945,6 +1961,7 @@ private function applyNationalCalendar() : void {
                             }
                         } else {
                             $this->Messages[] = sprintf(
+                                /**translators: Name of the Roman Missal */
                                 _( 'Could not find a sanctorale data file for %s' ),
                                 RomanMissal::getName( $missal )
                             );
@@ -1957,54 +1974,54 @@ private function applyNationalCalendar() : void {
         }
     }
 
-    private function makePatron( string $tag, string $nameSuffix, int $day, int $month, array|string $color, string $EditionRomanMissal = RomanMissal::EDITIO_TYPICA_1970 ) {
-        $festivity = $this->Cal->getFestivity( $tag );
-        if( $festivity !== null ) {
-            if( $festivity->grade < LitGrade::FEAST ) {
-                $this->Cal->setProperty( $tag, "grade", LitGrade::FEAST );
-            }
-            $this->Cal->setProperty( $tag, "name", $festivity->name . ", " . $nameSuffix );
-            $this->Cal->setProperty( $tag, "common", LitCommon::PROPRIO );
-        } else{
-            //check what's going on, for example, if it's a Sunday or Solemnity
-            $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', "{$day}-{$month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
-            $row = $this->tempCal[ $EditionRomanMissal ][ $tag ];
-            //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
-            $FestivityName = $row->NAME . ", " .  $nameSuffix;
-            if( $this->Cal->inSolemnitiesFeastsOrMemorials( $currentFeastDate ) || self::DateIsSunday( $currentFeastDate ) ) {
-                $coincidingFestivity = new stdClass();
-                $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
-                if ( self::DateIsSunday( $currentFeastDate ) && $coincidingFestivity->event->grade < LitGrade::SOLEMNITY ){
-                    //it's a Sunday
-                    $coincidingFestivity->grade = $this->LitSettings->Locale === LitLocale::LATIN ? 'Die Domini' : ucfirst( $this->dayOfTheWeek->format( $currentFeastDate->format( 'U' ) ) );
-                } else if ( $this->Cal->inSolemnities( $currentFeastDate ) ) {
-                    //it's a Feast of the Lord or a Solemnity
-                    $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
-                } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
-                    //we should probably be able to create it anyways in this case?
-                    $this->Cal->addFestivity( $tag, new Festivity( $FestivityName, $currentFeastDate, $color, LitFeastType::FIXED, LitGrade::FEAST, LitCommon::PROPRIO ) );
-                    $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
-                }
-                $this->Messages[] =  '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                    /**translators:
-                     * 1. Grade of the festivity
-                     * 2. Name of the festivity
-                     * 3. Date on which the festivity is usually celebrated
-                     * 4. Grade of the superseding festivity
-                     * 5. Name of the superseding festivity
-                     * 6. Current year
-                     */
-                    _( 'The %1$s \'%2$s\', usually celebrated on %3$s, is suppressed by the %4$s \'%5$s\' in the year %6$d.' ),
-                    $this->LitGrade->i18n( LitGrade::FEAST, false ),
-                    $FestivityName,
-                    $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
-                    $coincidingFestivity->grade,
-                    $coincidingFestivity->event->name,
-                    $this->LitSettings->Year
-                );
-            }
-        }
-    }
+    // private function makePatron( string $tag, string $nameSuffix, int $day, int $month, array|string $color, string $EditionRomanMissal = RomanMissal::EDITIO_TYPICA_1970 ) {
+    //     $festivity = $this->Cal->getFestivity( $tag );
+    //     if( $festivity !== null ) {
+    //         if( $festivity->grade < LitGrade::FEAST ) {
+    //             $this->Cal->setProperty( $tag, "grade", LitGrade::FEAST );
+    //         }
+    //         $this->Cal->setProperty( $tag, "name", $festivity->name . ", " . $nameSuffix );
+    //         $this->Cal->setProperty( $tag, "common", LitCommon::PROPRIO );
+    //     } else{
+    //         //check what's going on, for example, if it's a Sunday or Solemnity
+    //         $currentFeastDate = LitDateTime::createFromFormat( '!j-n-Y', "{$day}-{$month}-" . $this->LitSettings->Year, new DateTimeZone( 'UTC' ) );
+    //         $row = $this->tempCal[ $EditionRomanMissal ][ $tag ];
+    //         //let's also get the name back from the database, so we can give some feedback and maybe even recreate the festivity
+    //         $FestivityName = $row->NAME . ", " .  $nameSuffix;
+    //         if( $this->Cal->inSolemnitiesFeastsOrMemorials( $currentFeastDate ) || self::DateIsSunday( $currentFeastDate ) ) {
+    //             $coincidingFestivity = new stdClass();
+    //             $coincidingFestivity->event = $this->Cal->solemnityFromDate( $currentFeastDate );
+    //             if ( self::DateIsSunday( $currentFeastDate ) && $coincidingFestivity->event->grade < LitGrade::SOLEMNITY ){
+    //                 //it's a Sunday
+    //                 $coincidingFestivity->grade = $this->LitSettings->Locale === LitLocale::LATIN ? 'Die Domini' : ucfirst( $this->dayOfTheWeek->format( $currentFeastDate->format( 'U' ) ) );
+    //             } else if ( $this->Cal->inSolemnities( $currentFeastDate ) ) {
+    //                 //it's a Feast of the Lord or a Solemnity
+    //                 $coincidingFestivity->grade = ( $coincidingFestivity->event->grade > LitGrade::SOLEMNITY ? '<i>' . $this->LitGrade->i18n( $coincidingFestivity->event->grade, false ) . '</i>' : $this->LitGrade->i18n( $coincidingFestivity->grade, false ) );
+    //             } else if ( $this->Cal->inFeastsOrMemorials( $currentFeastDate ) ) {
+    //                 //we should probably be able to create it anyways in this case?
+    //                 $this->Cal->addFestivity( $tag, new Festivity( $FestivityName, $currentFeastDate, $color, LitFeastType::FIXED, LitGrade::FEAST, LitCommon::PROPRIO ) );
+    //                 $coincidingFestivity->grade = $this->LitGrade->i18n( $coincidingFestivity->event->grade, false );
+    //             }
+    //             $this->Messages[] =  '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
+    //                 /**translators:
+    //                  * 1. Grade of the festivity
+    //                  * 2. Name of the festivity
+    //                  * 3. Date on which the festivity is usually celebrated
+    //                  * 4. Grade of the superseding festivity
+    //                  * 5. Name of the superseding festivity
+    //                  * 6. Requested calendar year
+    //                  */
+    //                 _( 'The %1$s \'%2$s\', usually celebrated on %3$s, is suppressed by the %4$s \'%5$s\' in the year %6$d.' ),
+    //                 $this->LitGrade->i18n( LitGrade::FEAST, false ),
+    //                 $FestivityName,
+    //                 $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ),
+    //                 $coincidingFestivity->grade,
+    //                 $coincidingFestivity->event->name,
+    //                 $this->LitSettings->Year
+    //             );
+    //         }
+    //     }
+    // }
 
     /**
      * So far, the celebrations being transferred are all originally from the 1970 Editio Typica
@@ -2036,6 +2053,7 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
             //If the festivity has been successfully recreated, let's make a note about that
             if( $festivity !== null ) {
                 $this->Messages[] = sprintf(
+                    /**translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date */
                     _( 'The %1$s \'%2$s\' is transferred from %5$s to %6$s as per the %7$s, to make room for \'%3$s\': applicable to the year %4$d.' ),
                     $this->LitGrade->i18n( $festivity->grade ),
                     '<i>' . $festivity->name . '</i>',
@@ -2054,6 +2072,7 @@ private function moveFestivityDate( string $tag, DateTime $newDate, string $inFa
                 $coincidingFestivity = $this->Cal->determineSundaySolemnityOrFeast( $newDate );
                 //If the new date is already covered by a Solemnity, Feast or Memorial, then we can't move the celebration, so we simply suppress it
                 $this->Messages[] = sprintf(
+                    /**translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year */
                     _( 'The %1$s \'%2$s\' would have been transferred from %3$s to %4$s as per the %5$s, to make room for \'%6$s\', however it is suppressed by the %7$s \'%8$s\' in the year %9$d.' ),
                     $this->LitGrade->i18n( $festivity->grade ),
                     '<i>' . $festivity->name . '</i>',
@@ -2193,9 +2212,11 @@ private function applyDiocesanCalendar() {
                     if( $this->Cal->inSolemnities( $currentFeastDate ) && $key != $this->Cal->solemnityKeyFromDate( $currentFeastDate ) ) {
                         //there seems to be a coincidence with a different Solemnity on the same day!
                         //should we attempt to move to the next open slot?
-                        $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . sprintf(
-                            $this->LitSettings->DiocesanCalendar . ": the Solemnity '%s', proper to the calendar of the " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " and usually celebrated on %s, coincides with the Sunday or Solemnity '%s' in the year %d! Does something need to be done about this?",
+                        $this->Messages[] = '<span style="padding:3px 6px; font-weight: bold; background-color: #FFC;color:Red;border-radius:6px;">IMPORTANT</span> ' . $this->LitSettings->DiocesanCalendar . ": " .  sprintf(
+                            /**translators: 1: Festivity name, 2: Name of the diocese, 3: Festivity date, 4: Coinciding festivity name, 5: Requested calendar year */
+                            'The Solemnity \'%1$s\', proper to the calendar of the %2$s and usually celebrated on %3$s, coincides with the Sunday or Solemnity \'%4$s\' in the year %5$d! Does something need to be done about this?',
                             '<i>' . $obj->name . '</i>',
+                            $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese,
                             '<b>' . $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ) . '</b>',
                             '<i>' . $this->Cal->solemnityFromDate( $currentFeastDate )->name . '</i>',
                             $this->LitSettings->Year
@@ -2205,10 +2226,12 @@ private function applyDiocesanCalendar() {
                 } else if ( $obj->grade <= LitGrade::FEAST && !$this->Cal->inSolemnities( $currentFeastDate ) ) {
                     $this->Cal->addFestivity( $this->LitSettings->DiocesanCalendar . "_" . $key, new Festivity( "[ " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " ] " . $obj->name, $currentFeastDate, $obj->color, LitFeastType::FIXED, $obj->grade, $obj->common ) );
                 } else {
-                    $this->Messages[] = sprintf(
-                        $this->LitSettings->DiocesanCalendar . ": the %s '%s', proper to the calendar of the " . $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese . " and usually celebrated on %s, is suppressed by the Sunday or Solemnity %s in the year %d",
+                    $this->Messages[] = $this->LitSettings->DiocesanCalendar . ": " . sprintf(
+                        /**translators: 1: Festivity grade, 2: Festivity name, 3: Name of the diocese, 4: Festivity date, 5: Coinciding festivity name, 6: Requested calendar year */
+                        'The %1$s \'%2$s\', proper to the calendar of the %3$s and usually celebrated on %4$s, is suppressed by the Sunday or Solemnity %5$s in the year %6$d',
                         $this->LitGrade->i18n( $obj->grade, false ),
                         '<i>' . $obj->name . '</i>',
+                        $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->diocese,
                         '<b>' . $this->dayAndMonth->format( $currentFeastDate->format( 'U' ) ) . '</b>',
                         '<i>' . $this->Cal->solemnityFromDate( $currentFeastDate )->name . '</i>',
                         $this->LitSettings->Year

From 8fe40309a93a805a03d0391b055608cee2fb724f Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 08:21:16 +0000
Subject: [PATCH 148/152] regenerated i18n/litcal.pot from source files

---
 i18n/litcal.pot | 203 ++++++++++++++++++++++++++----------------------
 1 file changed, 109 insertions(+), 94 deletions(-)

diff --git a/i18n/litcal.pot b/i18n/litcal.pot
index 2ed8b7da..b958d584 100644
--- a/i18n/litcal.pot
+++ b/i18n/litcal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,99 +24,107 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
 #, php-format
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:607
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
 #, php-format
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:625
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
 #, php-format
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:693
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
 #, php-format
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
 #, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -126,7 +134,7 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -134,7 +142,7 @@ msgstr ""
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -142,17 +150,17 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -161,9 +169,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -176,14 +184,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -196,9 +204,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -214,9 +222,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -226,17 +234,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -245,10 +253,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -260,10 +268,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -275,10 +283,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -288,17 +296,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -310,9 +318,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -320,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -329,29 +337,31 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1431
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1443
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
 #, php-format
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -359,35 +369,36 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1484
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
 #, php-format
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -398,9 +409,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -410,23 +421,24 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -438,28 +450,31 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From 214c4290d9ea9ad1ce66c3bda9b2b05fe7a8b293 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Mon, 6 Jun 2022 07:27:33 +0000
Subject: [PATCH 149/152] Translated using Weblate (Italian)

Currently translated at 100.0% (110 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/it/
---
 i18n/it/LC_MESSAGES/litcal.mo | Bin 14523 -> 15392 bytes
 i18n/it/LC_MESSAGES/litcal.po |  31 +++++++++++++------------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/i18n/it/LC_MESSAGES/litcal.mo b/i18n/it/LC_MESSAGES/litcal.mo
index 556d2a86459d2d070c00328b64da27005d638a18..e94b7c7fb7c445ba2aa0af2655263cde933f6925 100644
GIT binary patch
delta 2874
zcmZ|Qdu$X{6u{wA3beGmEQL}^=|#HMLP1*!Ek%Om{gj90B?wG+r*vVvQ+8)tkjH`*
z0Rx)2VgNM(LDZNivD6qa#DtiL36DexY9a}0zy$k;BnF}q{hi$r48ciGzkBC#@11kc
zY)`E}v>|>ar|Ul9aEQUgYw03-qGtwwI9B%%8HyJ6$2J^*2e1*3<5tYi5-G?1*c-p{
z{Lb?i&s+Ei*Slwn^b?88NE*F3QHy0b4@cu>9ErzKC%l5Xrr&WK-oXi2)l;M!#_%EB
zggV|{9EfkAF6adI#WSemeS>|NUv79e{E7Ko$l_^zpcr+a(O$pS>(9qr&aXt?K%zJV
zcY6I}m_z@h*FT5)##fOkB$L7Ous>!ozl@|o7NuHG;3U+6=b}Df;V=wiAAA*cg10e>
z9jKWp<zgn5<2<ZE&B#lr*WbkMcocQM4=`Rvql1R-;g1+Yi#&DUWn6`O8Knt3F@(#R
zeG-0&t(eVf-@!IKilwAS7j_<Xyh#*}j`JyA$ARR37m|j!Y{%W?V=rd2VLH(PJcb$U
z#|``tJMrKk-X3=qr0y%AV!x-q8#iO1P~;+B#fkVa`?45sqGonxQ7RL4*g}6rQCy@e
zjjuVu;^kY^qWKjyGu=$8xGGT3S9>l%Euyu^t+E}v;9=D9j-saeedL3Z<H*|O1U`-z
z@L`lV-<B5BFw{M&My=*2@sl)>X{Zz2;chL?LJEPGlPc8DZxKF^r%}I#+TzsnaZIPb
z!|U(%`mbOK=M$(e96v>a`jHFx1YW^PEbxguhVxM;-iEr+gE$>O!X<bMyWu=aT#Idy
z=Ne>JWFu-3zmAlX96`<GiBvx>=V<5xuAru<)9YulOnop9sY@yLtVFH;DX0T3LCQfI
zz5WZR<L&eMN0B5-hj;!mQipO4d+GQ8mv<rSQ3{X?`KaHg4|M?(Q1@&WY7uQhP2G#Q
z9uHy$_AE`Ai!104M!j#NcYd$uKGbpELc{#>9*vjrEb8a9bU5k3i|FEx5h6kS1J`1J
z%AAN7unqf+WH3zN5iB2-`s^;DK0lj%4B+Q@6MekRP8?Xy{%@mkh{i!2S|PFrKf}{F
zbF|29%&Zjo8`H+HkLuXe@4$Zifqu6tkuCTWUPG%|WHQbem#UFHsG0Z~HB+}y@0S|#
z-xaskq^i6P^|LyHyqugwEw1a{^-k2H>NP%f|8S&SWEOVE^{C@*Kz(kDXB!sM-;G+-
z?;^>S%i~F@7Eu>UUmxg)I#53H^(B9Hb;Xm2S&7c>dHIdBw0!jaNJsKt6*tSXiNcJc
zc!-vcw~{b~{+Q`R1w@$OcPRPwEJZzL6LXWTdw(pN>4Zb*HWv}k5PHlY>WS5a9{MFU
z5W2nOCM)^7uC?M%e33D%#~NBwiKi03WsFE$oG8r9OIwl{lUY=%b)*^A<LMMK6PI~y
z-32}B5?eBh#@V#URPw*d99&N5v5?S@ej1TWtRpnP3y2(IQQ}f&iElowT4Dv!hv-fC
z2+Hv8v8sJ&kFz~yn_$$q5i1;Rup<#WU>YJ$lktry=B#6UW6_G5W;<fsM%(zRilb$E
zp~+fjn~1}$4Nk<A_(m5;OKK8_3i9KX#eq>$r}vigY>BUeE2h<ng#xD0YOzhdZHFH)
zAp;~Qth{eR7V^LeSy)M#X>?lc7S<MY^);fg=H^6Qzsc=4a|UO}m)IuSn4GuXHvWih
zxxw%nW0|nsY8vdQ8*B->8}AL#YMX##!j5aAw%w#_NiJ94+V7AVziR@PYnx!0H*R7u
zCrsNok$~pLG0hRjZ`%P`Hnn!4SPgFbfFXtHX%+32LyNN#=S#DulVr_t(6tySm0{2X
zM{U0oX7XUjOR%OpWJUc!D`J~a%vs~G?thcqceqKbOsp=;T^Z$aJueq^Ee5@Bd`&3h
zYd-%welnl`Gkz+kZp?M9mY|h5Jz`FK!-)3m_!OrlVmCE8$t<#>SePuvoEGbD9?u+N
zlf37cuBkp^89$i|lO%u8M4hl>LS7=>dr5qbByu$t3TaMw2VGdR<LX~cC#kiiwtZ05
H;k17MHG#-z

delta 2181
zcmYM#eN5F=9LMqRjfeYyLOjHSDHjkzLy4;y3JHcIOCa(I%tVl|G;vMn!KHc0#d2oN
z`CF~Ixtd`Qf8?f@Tt=2|xyojvHJX_Zf0VUyWoy=A#p?axp4D%D@9Ui3{oQlU?|Z%n
zU)?gaIeIZ8@kQh6CMFZx63letd@>(g6+yE?jNlEp46|_quE##yjz3}q*N4nfai8-o
z=ey32@g~0i3Ny{3Hb!G2H_}tgW?&d+V<XPQKGcMV(2u8Z9-hJZ=$~Mgg!Pz?4XE+j
zFc&wX7W52Wj~;5g0Ze0l8*&ePhIxE(&h@XM21?*V1Eiz+1$<;-Ir0X!5c9Fs^&iI!
z`nz0zKkAJSBSYF*%)!eTVtyN=LG~=bEF{A+Py<gv{UCx<u?Ewy6E#5(_F_LOGou(l
z9}hKS2$hjlsPDT`yZR_<zO5LYL8G6B_V5Tkh7t1g4!(iy*v2TE@Hlp38MD{n%Q%4F
zpcc}{s`dM8sNX$Ints63xD$_1Ku=>e`F|ddXOn*o+(15F$76T}JJ`6Nv621Qi&c~2
z3pj)4=vUuJp<*@_JB%LIV%HS2792oj@-NhzC$m3^n2M~;GEucrnos_ffd$-95p8l`
z^g4H=isc}N@qN4w&!Yysgi7gm$icBI$Qtb`R$z!96=5~1X4aq<)Qg&LYm~-OA8A4U
z*<8+=if|>ec<VtOvpu*2M{z!GV^j_B9%|wfuK$tipT<(|e~x<NKaldU5QTI*=Haav
zZJ}`sjptAk5202%f{XAcY{gl{@d<aKifWJZ0Fr$hL>227NZHs$REn><exM}2fIL)&
zrp5bFTS!AcT#D46wL2d{>dK<10rw)?Zm+rihp0CicKu68a_m=kKZ7$zy;&hn#7flj
z^~j$NTaGz8{~a{6fGwy!>qiyOQB>+q;$|E{?cE~sDw}aNwxXUJboW1T4x`37iv{>C
zzJQ6-%$`6G2bteergJ9o1a81NH*<9G6|BWj8E=h?QOD~S)bm|bZWn%yzhTWxvu80<
z&QZi;xDTt?-`zNZA7CeM`6m`e$nHNhCe1Q?NzRU+@56Y3em)iQ6#k9h<CAmvYlmxZ
zi`T?K)SHi?AJZ%2ry>u-^z$(rYmhbC3QWQs?)#mU<X^?}rn_+p$+BI>WSlTJK42#5
zhq=yt)afWj6>lAqEbBql%6`=Ihfw1Tq7SL%@rBmmT|}mNMgEMubu?8fdN*Ei{J$R^
zl2u-lKOEJTXwdtK0zzA($yAIR368qe6D@?U2Z)C8*8d-CXeJQdgtk=KSxM-+lV~T}
z)ZxmFV{5TWB^0FbAkpFd?w=aej_Ydl3Ik=n<z7=D$G5^;7YI*(h`UO&t|f8Ck8rDN
zYb$gu_1+GI=XKJekgSPVOx#E4x|h%aznjP+^w&o@ZYFddmw8FS(vo{<-9hL|BT|VH
ug3|i$S{+*w{50rY$O^<3WKB+qeHkuE@KwY{i;6?B+VYbrvF%j{eE$N5-sRZ<

diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 0d3439db..d0c5bf57 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2021 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Ubuntu <priest@johnromanodorazio.com>, 2021.
-#
+# John R. D'Orazio <priest@johnromanodorazio.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-05-22 09:41+0000\n"
-"PO-Revision-Date: 2022-02-16 09:56+0000\n"
+"PO-Revision-Date: 2022-06-06 08:21+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/it/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.12.1\n"
 
 #: includes/LitCalAPI.php:229
 #, php-format
@@ -482,6 +482,8 @@ msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
+"Dovremmo creare una nuova festività, tuttavia sembra che non ci sono le "
+"corrette informazioni sulla data per poter procedere"
 
 #: includes/LitCalAPI.php:1904
 #, php-format
@@ -512,31 +514,24 @@ msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
 #: includes/LitCalAPI.php:2039
-#, fuzzy, php-format
-#| msgid ""
-#| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
-#| "applicable to the year %6$d."
+#, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
-"La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
-"(%5$s), applicabile pertanto all'anno %6$d."
+"La %1$s '%2$s' è stata trasferita da %5$s a %6$s secondo il %7$s, per "
+"lasciare luogo a '%3$s': applicabile pertanto all'anno %4$d."
 
 #: includes/LitCalAPI.php:2057
-#, fuzzy, php-format
-#| msgid ""
-#| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
-#| "%4$d (%5$s) and usually celebrated on %6$s, is suppressed by the %7$s "
-#| "'%8$s' in the year %9$d."
+#, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
 "%5$s, to make room for '%6$s', however it is suppressed by the %7$s '%8$s' "
 "in the year %9$d."
 msgstr ""
-"La %1$s '%2$s', aggiunta nella %3$s del Messale Romano dall'anno %4$d (%5$s) "
-"e celebrata solitamente il giorno %6$s, è soppressa dalla %7$s '%8$s' "
-"nell'anno %9$d."
+"La %1$s '%2$s', sarebbe stata trasferita da %3$s a %4$s secondo il %5$s, per "
+"lasciare luogo a '%6$s', tuttavia è soppressa dalla %7$s '%8$s' nell'anno "
+"%9$d."
 
 #. translators: when there are multiple possible commons, this will be the glue "or from the common of..."
 #: includes/LitMessages.php:142 includes/LitMessages.php:153

From 60f70217b9a7326e085e68d8d5d28e15de81067e Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 6 Jun 2022 10:21:21 +0200
Subject: [PATCH 150/152] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/
---
 i18n/de/LC_MESSAGES/litcal.po | 205 +++++++++++++++-------------
 i18n/es/LC_MESSAGES/litcal.po | 208 +++++++++++++++-------------
 i18n/fr/LC_MESSAGES/litcal.po | 203 +++++++++++++++-------------
 i18n/it/LC_MESSAGES/litcal.po | 246 ++++++++++++++++++++--------------
 i18n/la/LC_MESSAGES/litcal.po | 244 +++++++++++++++++++--------------
 i18n/pt/LC_MESSAGES/litcal.po | 205 +++++++++++++++-------------
 6 files changed, 727 insertions(+), 584 deletions(-)

diff --git a/i18n/de/LC_MESSAGES/litcal.po b/i18n/de/LC_MESSAGES/litcal.po
index 9481ccfb..34f85625 100644
--- a/i18n/de/LC_MESSAGES/litcal.po
+++ b/i18n/de/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-06-06 06:40+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: German <https://translate.johnromanodorazio.com/projects/"
@@ -26,99 +26,107 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
 #, php-format
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:607
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
 #, php-format
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:625
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
 #, php-format
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:693
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
 #, php-format
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
 #, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -128,7 +136,7 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -136,7 +144,7 @@ msgstr ""
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -144,17 +152,17 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -163,9 +171,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -178,14 +186,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -198,9 +206,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -216,9 +224,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -228,17 +236,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -247,10 +255,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -262,10 +270,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -277,10 +285,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -290,17 +298,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -312,9 +320,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -322,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -331,29 +339,31 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1431
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1443
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
 #, php-format
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,35 +371,36 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1484
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
 #, php-format
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,9 +411,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -412,23 +423,24 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,28 +452,31 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/es/LC_MESSAGES/litcal.po b/i18n/es/LC_MESSAGES/litcal.po
index cb4d11a3..ef8676b4 100644
--- a/i18n/es/LC_MESSAGES/litcal.po
+++ b/i18n/es/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-05-21 10:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Spanish <https://translate.johnromanodorazio.com/projects/"
@@ -27,101 +27,112 @@ msgid ""
 msgstr ""
 "Solo se admiten los años a partir de 1970. Intentaste solicitar el año %d."
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s día antes de la Epifanía"
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s día después de la Epifanía"
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
-#, php-format
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
+#, fuzzy, php-format
+#| msgid ""
+#| "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
+#| "transferred to %s (%s) as per the %s."
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 "La Solemnidad <i>'%s'</i> coincide con <b>%s</b> en el año %d, por tanto, la "
 "celebración ha sido trasladada a %s (%s) según el %s."
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr "Sábado anterior al Domingo de Ramos"
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto de la Congregación para el Culto Divino"
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:607
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
 #, php-format
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:625
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
 #, php-format
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:693
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
 #, php-format
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
 #, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -131,7 +142,7 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -139,7 +150,7 @@ msgstr ""
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -147,17 +158,17 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -166,9 +177,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -181,14 +192,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -201,9 +212,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -219,9 +230,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -231,17 +242,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -250,10 +261,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -265,10 +276,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -280,10 +291,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -293,17 +304,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -315,9 +326,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -325,7 +336,7 @@ msgid ""
 msgstr ""
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -334,29 +345,31 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1431
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1443
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
 #, php-format
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -364,35 +377,36 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1484
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
 #, php-format
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -403,9 +417,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -415,23 +429,24 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -443,28 +458,31 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/fr/LC_MESSAGES/litcal.po b/i18n/fr/LC_MESSAGES/litcal.po
index a9e7a8e3..b35f7bab 100644
--- a/i18n/fr/LC_MESSAGES/litcal.po
+++ b/i18n/fr/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-02-16 09:56+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: French <https://translate.johnromanodorazio.com/projects/"
@@ -26,99 +26,107 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
 #, php-format
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:607
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
 #, php-format
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:625
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
 #, php-format
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:693
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
 #, php-format
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
 #, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -128,7 +136,7 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -136,7 +144,7 @@ msgstr ""
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -144,17 +152,17 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -163,9 +171,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -178,14 +186,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -198,9 +206,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -216,9 +224,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -228,17 +236,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -247,10 +255,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -262,10 +270,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -277,10 +285,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -290,17 +298,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -312,9 +320,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -322,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -331,29 +339,31 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1431
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1443
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
 #, php-format
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,35 +371,36 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1484
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
 #, php-format
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,9 +411,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -412,23 +423,24 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,28 +452,31 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index d0c5bf57..0405015a 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-06-06 08:21+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
@@ -28,107 +28,128 @@ msgstr ""
 "Sono supportati anni dal 1970 in poi soltanto. Tu invece hai provato a "
 "richiedere l'anno %d."
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per il santorale di: %s."
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr "Non sono stati trovati dati per la traduzione del santorale di: %s."
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "%s giorno prima dell'Epifania"
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "%s giorno dopo l'Epifania"
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
-#, php-format
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
+#, fuzzy, php-format
+#| msgid ""
+#| "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
+#| "transferred to %s (%s) as per the %s."
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 "La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
 "celebrazione è stata trasferita al %s (%s) in accordo con il %s."
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabato che precede la Domenica delle Palme"
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decreto della Congregazione per il Culto Divino"
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "lunedì che segue la Seconda Domenica di Pasqua"
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr "lunedì seguente"
 
-#: includes/LitCalAPI.php:607
-#, php-format
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
+#, fuzzy, php-format
+#| msgid ""
+#| "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
+#| "should ask the Congregation for Divine Worship what to do about this!"
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 "La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
 "Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
 
-#: includes/LitCalAPI.php:625
-#, php-format
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
+#, fuzzy, php-format
+#| msgid ""
+#| "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the "
+#| "year %d, it has been anticipated by one day as per %s."
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 "Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
 "nell'anno %d, la prima è stata anticipata di un giorno come da %s."
 
-#: includes/LitCalAPI.php:693
-#, php-format
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
+#, fuzzy, php-format
+#| msgid ""
+#| "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
+#| "celebrated on %s rather than on the Sunday after Christmas."
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 "'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
 "viene celebrata il %s anziché la Domenica dopo Natale."
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
-#, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
+#, fuzzy, php-format
+#| msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "della %s Settimana dell'Avvento"
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "%s Giorno dell'Ottava di Natale"
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "della %s Settimana di Quaresima"
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr "dopo il Mercoledì delle Ceneri"
 
@@ -138,7 +159,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -146,7 +167,7 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -154,10 +175,10 @@ msgstr "dopo il Mercoledì delle Ceneri"
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -166,7 +187,7 @@ msgstr ""
 "La %1$s '%2$s' è stata inserita il giorno %3$s a partire dall'anno %4$d "
 "(%5$s), applicabile pertanto all'anno %6$d."
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -177,9 +198,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -195,14 +216,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "La %1$s '%2$s' è soppiantata dalla %3$s '%4$s' nell'anno %5$d."
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr "Costituzione Apostolica Missale Romanum"
 
@@ -215,9 +236,9 @@ msgstr "Costituzione Apostolica Missale Romanum"
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -236,9 +257,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -250,10 +271,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -262,7 +283,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative (%4$s)."
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr "il lunedì dopo la Pentecoste"
 
@@ -271,10 +292,10 @@ msgstr "il lunedì dopo la Pentecoste"
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -288,10 +309,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -305,10 +326,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -320,10 +341,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -332,7 +353,7 @@ msgstr ""
 "'%1$s' è stato dichiarato Dottore della Chiesa sin dal %2$d, applicabile "
 "pertanto all'anno %3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr "e Dottore della Chiesa"
 
@@ -344,9 +365,9 @@ msgstr "e Dottore della Chiesa"
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -356,7 +377,7 @@ msgstr ""
 "superata dalla %6$s '%7$s' nell'anno %8$d."
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -365,7 +386,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -374,27 +395,36 @@ msgstr ""
 "Nell'anno %1$d, la %2$s '%3$s' è stata soppressa dalla %4$s '%5$s', aggiunta "
 "il giorno %6$s sin dal %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1431
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
+#, fuzzy, php-format
+#| msgid ""
+#| "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
+#| "since the year 2002 (%s), applicable to the year %d."
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 "La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
 "dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1443
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
+#, fuzzy, php-format
+#| msgid ""
+#| "The optional memorial '%s', which would have been superseded this year by "
+#| "a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+#| "Aug. 12 since the year 2002 (%s), applicable to the year %d."
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 "La memoria facoltativa '%s', che sarebbe stata soppressa quest'anno da una "
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
 "trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -405,41 +435,47 @@ msgstr ""
 "sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d. Tuttavia, è "
 "soppressa da una Domenica, una Solennità o una Festa '%4$s' nell'anno %3$d."
 
-#: includes/LitCalAPI.php:1484
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
+#, fuzzy, php-format
+#| msgid ""
+#| "The Feast '%s' would have been suppressed this year ( 2009 ) since it "
+#| "falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+#| "%s it has been reinstated so that local churches can optionally celebrate "
+#| "the memorial."
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 "La Festa '%s' sarebbe stata soppressa quest'anno ( 2009 ) visto che cade di "
 "Domenica, tuttavia trattandosi dell'Anno dell'Apostolo Paolo, è stata "
 "restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "della %s Settimana di Pasqua"
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "della %s Settimana del Tempo Ordinario"
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria di Santa Maria in sabato"
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 "Errore nella lettura o nella decodifica dei dati per la Regione più ampia "
 "dal file %s."
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -451,9 +487,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -465,10 +501,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -477,7 +513,7 @@ msgstr ""
 "La Memoria '%1$s' coincide con un'altra Memoria '%2$s' nell'anno %3$d. Tutte "
 "e due sono ridotte al grado di memorie facoltative."
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
@@ -485,7 +521,8 @@ msgstr ""
 "Dovremmo creare una nuova festività, tuttavia sembra che non ci sono le "
 "corrette informazioni sulla data per poter procedere"
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr "Trovato un file con dati per il santorale di: %s"
@@ -497,9 +534,9 @@ msgstr "Trovato un file con dati per il santorale di: %s"
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -508,12 +545,14 @@ msgstr ""
 "La %1$s '%2$s' (%3$s), aggiunta al calendario nazionale nel %4$s, è tuttavia "
 "superata dalla %5$s '%6$s' nell'anno %7$d"
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr "Non è stato trovato un file con i dati del santorale di: %s"
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
@@ -522,7 +561,8 @@ msgstr ""
 "La %1$s '%2$s' è stata trasferita da %5$s a %6$s secondo il %7$s, per "
 "lasciare luogo a '%3$s': applicabile pertanto all'anno %4$d."
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "
diff --git a/i18n/la/LC_MESSAGES/litcal.po b/i18n/la/LC_MESSAGES/litcal.po
index 865bca86..d9b09020 100644
--- a/i18n/la/LC_MESSAGES/litcal.po
+++ b/i18n/la/LC_MESSAGES/litcal.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-03-03 16:15+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Latin <https://translate.johnromanodorazio.com/projects/"
@@ -27,107 +27,128 @@ msgid ""
 msgstr ""
 "Petere potes nisi ab annis MCMLXX et ultra. Tu anno %d conatus est petere."
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr "Dies %s ante Epiphaniam"
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr "Dies %s post Epiphaniam"
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
-#, php-format
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
+#, fuzzy, php-format
+#| msgid ""
+#| "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
+#| "transferred to %s (%s) as per the %s."
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 "Coincidet enim Sollemnitas <i>'%s'</i> cum <b>%s</b> in anno %d, ergo "
 "traslata est celebratio ad %s (%s) secundum %s."
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr "sabbatum ante Dominicam in Palmis"
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr "Decretum Congregationis pro Cultu Divino"
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr "diem Lunæ post Dominicam Secundam Paschæ"
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr "diem Lunæ proximum"
 
-#: includes/LitCalAPI.php:607
-#, php-format
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
+#, fuzzy, php-format
+#| msgid ""
+#| "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
+#| "should ask the Congregation for Divine Worship what to do about this!"
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 "Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in anno %d. "
 "Oportet quaerere a Congregatione Cultu Divino quid facere!"
 
-#: includes/LitCalAPI.php:625
-#, php-format
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
+#, fuzzy, php-format
+#| msgid ""
+#| "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the "
+#| "year %d, it has been anticipated by one day as per %s."
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 "Ex causa Sollemnitas <i>'%s'</i> coincidet cum Sollemnitate <i>'%s'</i> in "
 "anno %d, anticipata est ab uno die secundum %s."
 
-#: includes/LitCalAPI.php:693
-#, php-format
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
+#, fuzzy, php-format
+#| msgid ""
+#| "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
+#| "celebrated on %s rather than on the Sunday after Christmas."
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 "'%s' coincidet cum Dominica in anno %d, ergo Festum <i>'%s'</i> celebrentur "
 "die %s quam Dominica post Nativitate."
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
-#, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
+#, fuzzy, php-format
+#| msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr "<i>'%s'</i> subplantata est ab %s <i>'%s'</i> in anno %d."
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr "Hebdomadæ %s Adventus"
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr "Dies %s Octavæ Nativitatis"
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr "Hebdomadæ %s Quadragesimæ"
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr "post Feria IV Cinerum"
 
@@ -137,7 +158,7 @@ msgstr "post Feria IV Cinerum"
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -145,7 +166,7 @@ msgstr "post Feria IV Cinerum"
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -153,10 +174,10 @@ msgstr "post Feria IV Cinerum"
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -165,7 +186,7 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -174,9 +195,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -192,14 +213,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr "%1$s '%2$s' subplantata est ab %3$s '%4$s' in anno %5$d."
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -212,9 +233,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -232,9 +253,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -246,10 +267,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -258,7 +279,7 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum (%4$s)."
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr "dies Lunae post Pentecostem"
 
@@ -267,10 +288,10 @@ msgstr "dies Lunae post Pentecostem"
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -284,10 +305,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -301,10 +322,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -316,10 +337,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
@@ -328,7 +349,7 @@ msgstr ""
 "'%1$s' declarato/a est Doctor Ecclesiæ ab anno %2$d, ergo applicatur ad anno "
 "%3$d (%4$s)."
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 #, fuzzy
 #| msgid "Dedication of a Church"
 msgid "and Doctor of the Church"
@@ -342,9 +363,9 @@ msgstr "Dedicationis ecclesiæ"
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -354,7 +375,7 @@ msgstr ""
 "%6$s '%7$s' in anno %8$d."
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -363,7 +384,7 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
@@ -372,27 +393,36 @@ msgstr ""
 "In anno %1$d, %2$s '%3$s' subplantata est ad %4$s '%5$s', aggregata in die "
 "%6$s ab anno %7$d (%8$s)."
 
-#: includes/LitCalAPI.php:1431
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
+#, fuzzy, php-format
+#| msgid ""
+#| "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
+#| "since the year 2002 (%s), applicable to the year %d."
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 "Memoria ad libitum <i>'%s'</i> traslata est de 12 Dec. ad 12 Aug. ab anno "
 "2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1443
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
+#, fuzzy, php-format
+#| msgid ""
+#| "The optional memorial '%s', which would have been superseded this year by "
+#| "a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+#| "Aug. 12 since the year 2002 (%s), applicable to the year %d."
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 "Memoria ad libitum <i>'%s'</i> qua subplantata fuisset ab Dominica aut "
 "Sollemnitate si celebrata fuisset in die 12 Dec., nihilominus traslata est "
 "ad 12 Aug. ab anno 2002 (%s), ergo viget in anno %d."
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -403,38 +433,44 @@ msgstr ""
 "anno 2002 (%2$s), ergo viget in anno %3$d. Nihilominus subplantata est ab "
 "Dominica, aut Sollemnitate, aut Festu <i>\\'%4$s\\'</i> in anno %3$d."
 
-#: includes/LitCalAPI.php:1484
-#, php-format
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
+#, fuzzy, php-format
+#| msgid ""
+#| "The Feast '%s' would have been suppressed this year ( 2009 ) since it "
+#| "falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+#| "%s it has been reinstated so that local churches can optionally celebrate "
+#| "the memorial."
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 "Festum '%s' hoc anno ( 2009 ) supprimeretur quia congruit cum Dominica, "
 "tamen quamvis sit Annus Pauli Apostoli, restituta est secundum %s ut "
 "permittant ecclesias locales ad memoriam celebrandam."
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr "Hebdomadæ %s Temporis Paschali"
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr "Hebdomadæ %s Temporis Ordinarii"
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr "Memoria Sanctæ Mariæ in Sabbato"
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -445,9 +481,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -459,10 +495,10 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
@@ -471,13 +507,14 @@ msgstr ""
 "Memoria '%1$s' coincidet cum alia Memoria '%2$s' in anno %3$d. Ergo ambo "
 "simul redunctur in gradu Memoriæ ad libitum."
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -489,9 +526,9 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
@@ -500,12 +537,14 @@ msgstr ""
 "%1$s '%2$s' (%3$s), aggregata calendario nationali in %4$s, subplantata est "
 "ab %5$s '%6$s' in anno %7$d"
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
@@ -517,7 +556,8 @@ msgstr ""
 "%1$s <i>'%2$s'</i> aggregata est igitur in die %3$s ab anno %4$d (%5$s), "
 "ergo viget in anno %6$d."
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, fuzzy, php-format
 #| msgid ""
 #| "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year "
diff --git a/i18n/pt/LC_MESSAGES/litcal.po b/i18n/pt/LC_MESSAGES/litcal.po
index 84fe2e05..9e6d4d53 100644
--- a/i18n/pt/LC_MESSAGES/litcal.po
+++ b/i18n/pt/LC_MESSAGES/litcal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
-"POT-Creation-Date: 2022-05-22 09:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-06 08:21+0000\n"
 "PO-Revision-Date: 2022-06-02 20:16+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Portuguese <https://translate.johnromanodorazio.com/projects/"
@@ -26,99 +26,107 @@ msgid ""
 "%d."
 msgstr ""
 
-#: includes/LitCalAPI.php:264
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:265
 #, php-format
 msgid "Data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:270
+#. translators: name of the Roman Missal
+#: includes/LitCalAPI.php:272
 #, php-format
 msgid "Translation data for the sanctorale from %s could not be found."
 msgstr ""
 
-#: includes/LitCalAPI.php:346 includes/LitCalAPI.php:385
+#: includes/LitCalAPI.php:348 includes/LitCalAPI.php:387
 #, php-format
 msgid "%s day before Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:360 includes/LitCalAPI.php:398
+#: includes/LitCalAPI.php:362 includes/LitCalAPI.php:400
 #, php-format
 msgid "%s day after Epiphany"
 msgstr ""
 
-#: includes/LitCalAPI.php:550 includes/LitCalAPI.php:566
-#: includes/LitCalAPI.php:592
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral (ex. the Saturday preceding Palm Sunday), 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:597
 #, php-format
 msgid ""
-"The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-"transferred to %s (%s) as per the %s."
+"The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
+"been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:554
+#: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
 msgstr ""
 
-#: includes/LitCalAPI.php:559 includes/LitCalAPI.php:575
-#: includes/LitCalAPI.php:601 includes/LitCalAPI.php:629
-#: includes/LitCalAPI.php:918 includes/LitCalAPI.php:1037
-#: includes/LitCalAPI.php:1093 includes/LitCalAPI.php:1252
-#: includes/LitCalAPI.php:1297 includes/LitCalAPI.php:1324
-#: includes/LitCalAPI.php:1433 includes/LitCalAPI.php:1445
-#: includes/LitCalAPI.php:1460 includes/LitCalAPI.php:1486
+#: includes/LitCalAPI.php:562 includes/LitCalAPI.php:579
+#: includes/LitCalAPI.php:606 includes/LitCalAPI.php:636
+#: includes/LitCalAPI.php:928 includes/LitCalAPI.php:1047
+#: includes/LitCalAPI.php:1103 includes/LitCalAPI.php:1262
+#: includes/LitCalAPI.php:1307 includes/LitCalAPI.php:1334
+#: includes/LitCalAPI.php:1444 includes/LitCalAPI.php:1457
+#: includes/LitCalAPI.php:1472 includes/LitCalAPI.php:1499
 #: includes/FestivityCollection.php:365
 msgid "Decree of the Congregation for Divine Worship"
 msgstr ""
 
-#: includes/LitCalAPI.php:570
+#: includes/LitCalAPI.php:574
 msgid "the Monday following the Second Sunday of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:596
+#: includes/LitCalAPI.php:601
 msgid "the following Monday"
 msgstr ""
 
-#: includes/LitCalAPI.php:607
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
+#: includes/LitCalAPI.php:613
 #, php-format
 msgid ""
-"The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-"should ask the Congregation for Divine Worship what to do about this!"
+"The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
+"We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
 
-#: includes/LitCalAPI.php:625
+#. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
+#: includes/LitCalAPI.php:632
 #, php-format
 msgid ""
-"Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the year "
-"%d, it has been anticipated by one day as per %s."
+"Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
+"year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
 
-#: includes/LitCalAPI.php:693
+#. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
+#: includes/LitCalAPI.php:701
 #, php-format
 msgid ""
-"'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-"celebrated on %s rather than on the Sunday after Christmas."
+"'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
+"celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
 
-#: includes/LitCalAPI.php:727 includes/LitCalAPI.php:751
+#. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
+#: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
 #, php-format
-msgid "'%s' is superseded by the %s '%s' in the year %d."
+msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:804
+#: includes/LitCalAPI.php:814
 #, php-format
 msgid "of the %s Week of Advent"
 msgstr ""
 
-#: includes/LitCalAPI.php:821
+#: includes/LitCalAPI.php:831
 #, php-format
 msgid "%s Day of the Octave of Christmas"
 msgstr ""
 
-#: includes/LitCalAPI.php:845
+#: includes/LitCalAPI.php:855
 #, php-format
 msgid "of the %s Week of Lent"
 msgstr ""
 
-#: includes/LitCalAPI.php:850
+#: includes/LitCalAPI.php:860
 msgid "after Ash Wednesday"
 msgstr ""
 
@@ -128,7 +136,7 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity being created
@@ -136,7 +144,7 @@ msgstr ""
 #.  3. Indication of the mobile date for the festivity being created
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
 #. translators:
 #.  1. Grade or rank of the festivity
@@ -144,17 +152,17 @@ msgstr ""
 #.  3. Day of the festivity
 #.  4. Year from which the festivity has been added
 #.  5. Source of the information
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:870 includes/LitCalAPI.php:1131
-#: includes/LitCalAPI.php:1308 includes/LitCalAPI.php:1825
+#: includes/LitCalAPI.php:880 includes/LitCalAPI.php:1141
+#: includes/LitCalAPI.php:1318 includes/LitCalAPI.php:1840
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been added on %3$s since the year %4$d (%5$s), "
 "applicable to the year %6$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:904 includes/LitCalAPI.php:996
+#: includes/LitCalAPI.php:914 includes/LitCalAPI.php:1006
 msgid ""
 "Vatican Press conference: Presentation of the Editio Typica Tertia of the "
 "Roman Missal"
@@ -163,9 +171,9 @@ msgstr ""
 #. translators:
 #.  1. Grade or rank of the festivity
 #.  2. Name of the festivity
-#.  3. Current year
+#.  3. Requested calendar year
 #.
-#: includes/LitCalAPI.php:950
+#: includes/LitCalAPI.php:960
 #, php-format
 msgid ""
 "The %1$s '%2$s' either falls between 17 Dec. and 24 Dec., or during the "
@@ -178,14 +186,14 @@ msgstr ""
 #.  2. Name of the festivity that has been superseded
 #.  3. Grade or rank of the festivity that is superseding
 #.  4. Name of the festivity that is superseding
-#.  5. Current year
+#.  5. Requested calendar year
 #.
-#: includes/LitCalAPI.php:972
+#: includes/LitCalAPI.php:982
 #, php-format
 msgid "The %1$s '%2$s' is superseded by the %3$s '%4$s' in the year %5$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:992
+#: includes/LitCalAPI.php:1002
 msgid "Apostolic Constitution Missale Romanum"
 msgstr ""
 
@@ -198,9 +206,9 @@ msgstr ""
 #.  6. Date in which the superseded festivity is usually celebrated
 #.  7. Grade or rank of the festivity that is superseding
 #.  8. Name of the festivity that is superseding
-#.  9. Current year
+#.  9. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1014
+#: includes/LitCalAPI.php:1024
 #, php-format
 msgid ""
 "The %1$s '%2$s', added in the %3$s of the Roman Missal since the year %4$d "
@@ -216,9 +224,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of the superseding festivity
 #.  7. Name of the superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1050
+#: includes/LitCalAPI.php:1060
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -228,17 +236,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1089
+#: includes/LitCalAPI.php:1099
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1110
+#: includes/LitCalAPI.php:1120
 msgid "the Monday after Pentecost"
 msgstr ""
 
@@ -247,10 +255,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New name of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1166
+#: includes/LitCalAPI.php:1176
 #, php-format
 msgid ""
 "The name of the %1$s '%2$s' has been changed to %3$s since the year %4$d, "
@@ -262,10 +270,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1188
+#: includes/LitCalAPI.php:1198
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been raised to the rank of %3$s since the year %4$d, "
@@ -277,10 +285,10 @@ msgstr ""
 #.  2. Name of the festivity
 #.  3. New grade of the festivity
 #.  4. Year from which the grade has been changed
-#.  5. Current year
+#.  5. Requested calendar year
 #.  6. Source of the information
 #.
-#: includes/LitCalAPI.php:1198
+#: includes/LitCalAPI.php:1208
 #, php-format
 msgid ""
 "The %1$s '%2$s' has been lowered to the rank of %3$s since the year %4$d, "
@@ -290,17 +298,17 @@ msgstr ""
 #. translators:
 #.  1. Name of the festivity
 #.  2. Year in which was declared Doctor
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1232
+#: includes/LitCalAPI.php:1242
 #, php-format
 msgid ""
 "'%1$s' has been declared a Doctor of the Church since the year %2$d, "
 "applicable to the year %3$d (%4$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1240
+#: includes/LitCalAPI.php:1250
 msgid "and Doctor of the Church"
 msgstr ""
 
@@ -312,9 +320,9 @@ msgstr ""
 #.  5. Source of the information
 #.  6. Grade or rank of superseding festivity
 #.  7. Name of superseding festivity
-#.  8. Current year
+#.  8. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1345
+#: includes/LitCalAPI.php:1355
 #, php-format
 msgid ""
 "The %1$s '%2$s', added on %3$s since the year %4$d (%5$s), is however "
@@ -322,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. translators:
-#.  1. Current year
+#.  1. Requested calendar year
 #.  2. Grade or rank of suppressed festivity
 #.  3. Name of suppressed festivity
 #.  4. Grade or rank of the festivity being created
@@ -331,29 +339,31 @@ msgstr ""
 #.  7. Year from which the festivity has been added
 #.  8. Source of the information
 #.
-#: includes/LitCalAPI.php:1373
+#: includes/LitCalAPI.php:1383
 #, php-format
 msgid ""
 "In the year %1$d, the %2$s '%3$s' has been suppressed by the %4$s '%5$s', "
 "added on %6$s since the year %7$d (%8$s)."
 msgstr ""
 
-#: includes/LitCalAPI.php:1431
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1442
 #, php-format
 msgid ""
-"The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-"since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
+"since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1443
+#. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
+#: includes/LitCalAPI.php:1455
 #, php-format
 msgid ""
-"The optional memorial '%s', which would have been superseded this year by a "
-"Sunday or Solemnity were it on Dec. 12, has however been transferred to Aug. "
-"12 since the year 2002 (%s), applicable to the year %d."
+"The optional memorial '%1$s', which would have been superseded this year by "
+"a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
+"Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1458
+#: includes/LitCalAPI.php:1470
 #, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
@@ -361,35 +371,36 @@ msgid ""
 "superseded by a Sunday, a Solemnity, or a Feast '%4$s' in the year %3$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:1484
+#. translators: 1: Festivity name, 2: Source of the information
+#: includes/LitCalAPI.php:1497
 #, php-format
 msgid ""
-"The Feast '%s' would have been suppressed this year ( 2009 ) since it falls "
-"on a Sunday, however being the Year of the Apostle Paul, as per the %s it "
-"has been reinstated so that local churches can optionally celebrate the "
-"memorial."
+"The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
+"falls on a Sunday, however being the Year of the Apostle Paul, as per the "
+"%2$s it has been reinstated so that local churches can optionally celebrate "
+"the memorial."
 msgstr ""
 
-#: includes/LitCalAPI.php:1508
+#: includes/LitCalAPI.php:1521
 #, php-format
 msgid "of the %s Week of Easter"
 msgstr ""
 
-#: includes/LitCalAPI.php:1544 includes/LitCalAPI.php:1573
+#: includes/LitCalAPI.php:1557 includes/LitCalAPI.php:1586
 #, php-format
 msgid "of the %s Week of Ordinary Time"
 msgstr ""
 
-#: includes/LitCalAPI.php:1596
+#: includes/LitCalAPI.php:1609
 msgid "Saturday Memorial of the Blessed Virgin Mary"
 msgstr ""
 
-#: includes/LitCalAPI.php:1621 includes/LitCalAPI.php:1624
+#: includes/LitCalAPI.php:1634 includes/LitCalAPI.php:1637
 #, php-format
 msgid "Error retrieving and decoding Wider Region data from file %s."
 msgstr ""
 
-#: includes/LitCalAPI.php:1631
+#: includes/LitCalAPI.php:1644
 #, php-format
 msgid "Error retrieving and decoding National data from file %s."
 msgstr ""
@@ -400,9 +411,9 @@ msgstr ""
 #.  3. Date on which the festivity is usually celebrated
 #.  4. Grade of the superseding festivity
 #.  5. Name of the superseding festivity
-#.  6. Current year
+#.  6. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1664 includes/LitCalAPI.php:1997
+#: includes/LitCalAPI.php:1677
 #, php-format
 msgid ""
 "The %1$s '%2$s', usually celebrated on %3$s, is suppressed by the %4$s "
@@ -412,23 +423,24 @@ msgstr ""
 #. translators:
 #.  1. Name of the first coinciding Memorial
 #.  2. Name of the second coinciding Memorial
-#.  3. Current year
+#.  3. Requested calendar year
 #.  4. Source of the information
 #.
-#: includes/LitCalAPI.php:1729
+#: includes/LitCalAPI.php:1742
 #, php-format
 msgid ""
 "The Memorial '%1$s' coincides with another Memorial '%2$s' in the year %3$d. "
 "They are both reduced in rank to optional memorials."
 msgstr ""
 
-#: includes/LitCalAPI.php:1790
+#: includes/LitCalAPI.php:1805
 msgid ""
 "We should be creating a new festivity, however we do not seem to have the "
 "correct date information in order to proceed"
 msgstr ""
 
-#: includes/LitCalAPI.php:1904
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1920
 #, php-format
 msgid "Found a sanctorale data file for %s"
 msgstr ""
@@ -440,28 +452,31 @@ msgstr ""
 #.  4. Edition of the Roman Missal
 #.  5. Superseding festivity grade
 #.  6. Superseding festivity name
-#.  7. Current year
+#.  7. Requested calendar year
 #.
-#: includes/LitCalAPI.php:1934
+#: includes/LitCalAPI.php:1950
 #, php-format
 msgid ""
 "The %1$s '%2$s' (%3$s), added to the national calendar in the %4$s, is "
 "superseded by the %5$s '%6$s' in the year %7$d"
 msgstr ""
 
-#: includes/LitCalAPI.php:1948
+#. translators: Name of the Roman Missal
+#: includes/LitCalAPI.php:1965
 #, php-format
 msgid "Could not find a sanctorale data file for %s"
 msgstr ""
 
-#: includes/LitCalAPI.php:2039
+#. translators: 1. Festivity grade, 2. Festivity name, 3. New festivity name, 4: Requested calendar year, 5. Old date, 6. New date
+#: includes/LitCalAPI.php:2057
 #, php-format
 msgid ""
 "The %1$s '%2$s' is transferred from %5$s to %6$s as per the %7$s, to make "
 "room for '%3$s': applicable to the year %4$d."
 msgstr ""
 
-#: includes/LitCalAPI.php:2057
+#. translators: 1. Festivity grade, 2. Festivity name, 3. Old date, 4. New date, 5. Source of the information, 6. New festivity name, 7. Superseding festivity grade, 8. Superseding festivity name, 9: Requested calendar year
+#: includes/LitCalAPI.php:2076
 #, php-format
 msgid ""
 "The %1$s '%2$s' would have been transferred from %3$s to %4$s as per the "

From ce7975596bdde2e80699152c70e817f516c37e95 Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Mon, 6 Jun 2022 08:56:12 +0000
Subject: [PATCH 151/152] Translated using Weblate (Italian)

Currently translated at 100.0% (110 of 110 strings)

Translation: Liturgical Calendar/API strings
Translate-URL: https://translate.johnromanodorazio.com/projects/liturgical-calendar/api-strings/it/
---
 i18n/it/LC_MESSAGES/litcal.mo | Bin 15392 -> 15496 bytes
 i18n/it/LC_MESSAGES/litcal.po |  79 ++++++++++++----------------------
 2 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/i18n/it/LC_MESSAGES/litcal.mo b/i18n/it/LC_MESSAGES/litcal.mo
index e94b7c7fb7c445ba2aa0af2655263cde933f6925..c8c076c5b7765a25a8d476a0dc5945941040c76b 100644
GIT binary patch
delta 2555
zcmaLXd2Ccg9KiAEMGsm*u-k6w@!IaPEfjjU6j~}Ehsco<3kk85ZM)dTWox@FSX5Re
z2oZyZQH+=dP-;~C16r&`5;dvy;13}ZC4d|%V35Orgg{Kd@9({b;y-Tk_A@hY-pst;
z{O0X^YE$>C)!`SFQhVc-YQ@R~rK)fz-iOC+FWBC+jUBGkSnfM;G}d4e)?ooQVky3i
z6YvXk;1!I;m_%!yq(l`~H8jkoAqF?#{kR!rz#dG+JtzzM5=Y_@lmXA;2>i>wKb(i0
z)YDM<m!XU^!>-ra_2u{g?ZKq5^#<!{$fV&7ls6i{QFzd<pG0}%tH@j`mC;ksjRZy2
zAVE}f?D`^<aT-wiw_`4@Ls{_KDC75qDTF8tp@gQ2yKy)T7vfx$h-^o>{~->;{U{S2
zzycgX*~)9!h24bdBm4s!v6n$sVGOedFoe@Fe1^gr3b`z|7vI9&IF0zo!p@@%xHQ=s
z=rCTSUPSyiVLD-W9(z%vhyCit1NbhMvmes`C%lZ`q$#x(2gaBS3af|Hm3o1OkMTH8
z&QR({OlCi7@e(e^f-Ec4>ro=H1y|!XjK(Cx3i&9MoEeJ}nOc<G3ZS%i*ltD#`KNYM
zU<`EtBk=^vfTvJG{VPV{@5tiS6)eK|Y^8E=GD<Qvpe(EdWx};M5TVp_DC1X>0Fs<b
zkatw=_!9H0S18EwOLHkT6W5~*@GVB+A-jIWt{+1W?I&?G#<;C)cVad5JS;;W7UFi4
zi4USI^eoQCTNqwKVcJ-0!Z%TpZHMhXWLMN6CgK^C<98V)l(+4A3acT1RUS%&D((6r
zl;^xiUaFw&IwbAX77y{40e8_rKBzvF`gbS;p0?{(kSMA<c6)Xn`9Zx1Igx4>O8-ZZ
zZ;Wb2@=>*+EMOzbmc52@T!&C1cQ}vuw^KMvLo6=Nw_JvgQD1@5anNo*YI_=Gpx@BI
zYq$+ZkF!qG2e_Yl&UmFd@hJLn9vQh32e1~i!xPwV3SR8NbNCLfpJ*LB4;v^0^k55)
z;x%sI8r+D%ViF8*;7(jq!e<v#OO^Tzd+{c=lo35_D7O~cP+@%s!q+L73#cTa=x`1%
z;ou}bo4B`%jK%9Hk(f8xiqLX=mU=5j<9W=&i|D}NQ>^2cgE7<>qTH`X$*C@@9#&f^
zkVmQyhv6}l0nea3c+U1B%CWhMlGP(fb)u|lQF3M_O8=)(#(5q&edcF34ySX?<&tfd
zAHy(@o)|k(&W8DWi2tcv0WKL*>8@B$#0uRL>yeqw-yHs%xR#qW>l`Tkb8KOaL`Poa
zaju#6-3PJWF0(V{>5xS}!o?1oKT=OE)$`+0l9o|wv>MeC-5%E*QKx^1^TbP&oR`Hq
zCVocJ0=vgT9H#5zn{;MER%D4w*CaTdrLK_2@P~|MU%=PY;qCOb7;QnrUFOnHBoykt
zcz=1Z-6PcXq^~37YoSL|x6#?^Gu$Pvkl}G#Lj=vHZlAY9p6>rTp)w}2*rjie$kCst
zB<tdl6C!C|Hu5X8+2z>43i{u7bVU5yD@A`lX1?x8P0TUpT;UA_Lgs2@9{;@)l)Cg#
zYJszi_B?mFE0k||Lk7#UmQ~@>dz|z8>ztoP>E;Zl-j#krCb^ZdU0+Dg>ED;RCt45Y
zx~G)5S_<T;PH(WY%?NmnS-w!G*QoYSwO*>a&_C5!?e_(J|AfbD_ycBiGF&cQpX*OD
zJIivVvp!jnk|m4%?+`&>AmH%^gKcJHo^h=-LvTLd<Djqkpm9$Z-Ysifg#@d9+zGR1
zQPB<w)}bPw8La<#a8*fD^4-N4&E6KD(c(9^N!N}~)6u1Qad$(ei%K0)6|RuJQ?{W0
i_0m71^e>fZI<xYWL~8A%_jF@rzD{#z_qSGk68SeJxraso

delta 2471
zcmZY9du&rx9Ki9jjc(mbV1u#l0T;H~ZSKL?fP!PNp*%AN2?HYp?AF3cO3T{uSa?(%
z2qVk~Cm5I#Q6^vvO6+C~B9a)1njjb@IEhP80vg;OVickh{r=jk(Rh=y&pGFw{_eTI
z^Sj&IadgXbHQ`pJ)ahiUcAzaqsY*PA58$V!1E$}b-o*#GpO~stCYE73)?q0&Vij(~
zGCYl0IEYF33r@rPsVb~y(3zU1lm$29NZg7Nup6`SMU)No;RyT?CE%Ah9B-TVe@7eR
z6n-r03sK@!nd3ThyckC@zbZW(dxH=YW0}~4@<zuo1J9V_izsh=9eIYb5`7GgMv|e*
zkR&RnIj%>E(}1$xg$3wG+3*3B_^*cPgy{66q^6j=R;<KEoQ{%_eJJ-|!bI#vdEgsZ
ziv1`@_$_Wk7isFptGF7w39=rC(1$B{dOe0ern8w&D%*VxJFypw$&YO8Gn9b!qho>I
z#aoQC$^TxIH0*>f?8a2iOCEF>k7E+&aU0*nA?(TF?Qw5zbX{2G<|*|x6J59s-T6vg
z#_Ko}-{xGF;T@Dz&mR}d#8TYEcqI<QFOa>fuTW~{N0iK1j96_=LYa4(F2OA7PpzZF
zTD247@fDPSy(p=E9TV_0vU$~q6Y&yGKs7#AOa&-M<U}dvS@=$zQgcw^-)FHDXFi3%
zyQ!(z%JWqdou}{|%GXd=7z+@_1jf6~ahExM79GrMlsA44DIawSYj6;&G1snC1ujN;
z@RKN2--C1UEetQGbC-?<8!2%qwkFfH$f>9flq!A!sV8*|C6#^V_#(;%22nCJWR9)u
zQhqlEsY_L8T8&cuk2uJ`1YFJp^`Kf&#=B4g9yG_jNETJUIe!(YLv<6=@egx8rHBG#
zY(wf%*-<ty1LepTpw!S-l*~O{ME=|8^e~ZxX~i)|;Y!ANC<{Bx`EJvLD1nZkfhX}9
z`~)}SV<lt<FJn9Ien=@V{)X$&O=Zr+OJO>lbcUA^3^g9Z%JSG}cLgQDLJrc6=kX5O
zd7V9&UCFuPQS8C-la$(zXYm})uTttBTC0`%6XPaxjN+8o|AFu!I^Qs1nX1%w{0?uT
z%c<0CoHvc*!Tl(ixPg+XdnoJG^w`(31IID!#4J39yqh|MQd_so`$H%-mHu#aeOQ&y
zp<dJiOvE-EhFeg6xZSi9^BH%cRP_lYyXq=R&BRmsvOW_fjt%+xqW^Yf!}YWUG<gZR
z_!-a9<w@nX+UNxJi1Je(O+v2H8<QMy3-ysCNB-lC<(fxpraeKEOTL3O`g&5u3>nFb
ztff6lTSS{h`}^WVqF;yAoZw`m7p13`=?3eVbjkBSmu|DR#5L+GR!8y@CNpSF+LAn5
z>OFd`=C4IJB{%EZ6u0h6o>1;CHQHM}LC=~%&?7x#j>i>hHyrkm!|;ZT7LU)<9CWpN
z+(y7}*mX)ug&xYV>ESt9k%5%S7JVZpOE+ex>CBvwdhUp_$fgk&EV?#pcjTk2VBEj%
zW**3E&>v){<q>y{%jXM4<An^bKl;=Tk1I&{q3qJkkWpk06&tRQvB49J-n8ohTSFvl
zJCmT#=C|q3^X9~diuLn(Il1m~wUj*vHne*KewWW!?^z!Rdg(aqx?*gPxh(R-*i*yw
z_`>FRrgcG)e!n0`4;19;UkeH?HQrig_Z8;bLPoS7a@16KYYo50=X1FH{(xbRTqs;;
z(fcPkGX8&02TG<yPLy1;=v@<Ej@T<bak4Nmwoo6QvO;H9Wfq&iYYBM$Enc_BXd#(3
z&9(MWO-1v69;FvmRp*)+AT_R*mO#)Qh_3hg40}kgn7k<RQ`OH2y4Bf!z&TUbIScf8
RXPzE(o|Jy%)U<2ye*yoOa;*RW

diff --git a/i18n/it/LC_MESSAGES/litcal.po b/i18n/it/LC_MESSAGES/litcal.po
index 0405015a..5c6f8ff9 100644
--- a/i18n/it/LC_MESSAGES/litcal.po
+++ b/i18n/it/LC_MESSAGES/litcal.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: priest@johnromanodorazio.com\n"
 "POT-Creation-Date: 2022-06-06 08:21+0000\n"
-"PO-Revision-Date: 2022-06-06 08:21+0000\n"
+"PO-Revision-Date: 2022-06-06 08:59+0000\n"
 "Last-Translator: John R. D'Orazio <priest@johnromanodorazio.com>\n"
 "Language-Team: Italian <https://translate.johnromanodorazio.com/projects/"
 "liturgical-calendar/api-strings/it/>\n"
@@ -54,16 +54,13 @@ msgstr "%s giorno dopo l'Epifania"
 #. translators: 1: Festivity name, 2: Festivity date, 3: Requested calendar year, 4: Explicatory string for the transferral, 5: actual date for the transferral, 6: Decree of the Congregation for Divine Worship
 #: includes/LitCalAPI.php:553 includes/LitCalAPI.php:570
 #: includes/LitCalAPI.php:597
-#, fuzzy, php-format
-#| msgid ""
-#| "The Solemnity '%s' falls on %s in the year %d, the celebration has been "
-#| "transferred to %s (%s) as per the %s."
+#, php-format
 msgid ""
 "The Solemnity '%1$s' falls on %2$s in the year %3$d, the celebration has "
 "been transferred to %4$s (%5$s) as per the %6$s."
 msgstr ""
-"La Solennità <i>'%s'</i> coincide con <b>%s</b> nell'anno %d, pertanto la "
-"celebrazione è stata trasferita al %s (%s) in accordo con il %s."
+"La Solennità <i>'%1$s'</i> cade di %2$s nell'anno %3$d, pertanto la "
+"celebrazione è stata trasferita al %4$s (%5$s) in accordo con il %6$s."
 
 #: includes/LitCalAPI.php:557
 msgid "the Saturday preceding Palm Sunday"
@@ -90,49 +87,40 @@ msgstr "lunedì seguente"
 
 #. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year
 #: includes/LitCalAPI.php:613
-#, fuzzy, php-format
-#| msgid ""
-#| "The Solemnity '%s' coincides with the Solemnity '%s' in the year %d. We "
-#| "should ask the Congregation for Divine Worship what to do about this!"
+#, php-format
 msgid ""
 "The Solemnity '%1$s' coincides with the Solemnity '%2$s' in the year %3$d. "
 "We should ask the Congregation for Divine Worship what to do about this!"
 msgstr ""
-"La Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> nell'anno %d. "
-"Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a riguardo!"
+"La Solennità <i>'%1$s'</i> coincide con la Solennità <i>'%2$s'</i> nell'anno "
+"%3$d. Dovremmo chiedere alla Congregazione del Culto Divino cosa fare a "
+"riguardo!"
 
 #. translators: 1: Festivity name, 2: Coinciding Festivity name, 3: Requested calendar year, 4: Decree of the Congregation for Divine Worship
 #: includes/LitCalAPI.php:632
-#, fuzzy, php-format
-#| msgid ""
-#| "Seeing that the Solemnity '%s' coincides with the Solemnity '%s' in the "
-#| "year %d, it has been anticipated by one day as per %s."
+#, php-format
 msgid ""
 "Seeing that the Solemnity '%1$s' coincides with the Solemnity '%2$s' in the "
 "year %3$d, it has been anticipated by one day as per %4$s."
 msgstr ""
-"Visto che la Solennità <i>'%s'</i> coincide con la Solennità <i>'%s'</i> "
-"nell'anno %d, la prima è stata anticipata di un giorno come da %s."
+"Visto che la Solennità <i>'%1$s'</i> coincide con la Solennità <i>'%2$s'</i> "
+"nell'anno %3$d, la prima è stata anticipata di un giorno come da %4$s."
 
 #. translators: 1: Festivity name (Christmas), 2: Requested calendar year, 3: Festivity name (Holy Family), 4: New date for Holy Family
 #: includes/LitCalAPI.php:701
-#, fuzzy, php-format
-#| msgid ""
-#| "'%s' falls on a Sunday in the year %d, therefore the Feast '%s' is "
-#| "celebrated on %s rather than on the Sunday after Christmas."
+#, php-format
 msgid ""
 "'%1$s' falls on a Sunday in the year %2$d, therefore the Feast '%3$s' is "
 "celebrated on %4$s rather than on the Sunday after Christmas."
 msgstr ""
-"'%s' coincide con una Domenica nell'anno %d, pertanto la Festa <i>'%s'</i> "
-"viene celebrata il %s anziché la Domenica dopo Natale."
+"'%1$s' coincide con una Domenica nell'anno %2$d, pertanto la Festa "
+"<i>'%3$s'</i> viene celebrata il %4$s anziché la Domenica dopo Natale."
 
 #. translators: 1: Festivity name, 2: Superseding Festivity grade, 3: Superseding Festivity name, 4: Requested calendar year
 #: includes/LitCalAPI.php:736 includes/LitCalAPI.php:761
-#, fuzzy, php-format
-#| msgid "'%s' is superseded by the %s '%s' in the year %d."
+#, php-format
 msgid "'%1$s' is superseded by the %2$s '%3$s' in the year %4$d."
-msgstr "<i>'%s'</i> è soppiantata dalla %s <i>'%s'</i> nell'anno %d."
+msgstr "<i>'%1$s'</i> è soppiantata dalla %2$s <i>'%3$s'</i> nell'anno %4$d."
 
 #: includes/LitCalAPI.php:814
 #, php-format
@@ -397,32 +385,26 @@ msgstr ""
 
 #. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
 #: includes/LitCalAPI.php:1442
-#, fuzzy, php-format
-#| msgid ""
-#| "The optional memorial '%s' has been transferred from Dec. 12 to Aug. 12 "
-#| "since the year 2002 (%s), applicable to the year %d."
+#, php-format
 msgid ""
 "The optional memorial '%1$s' has been transferred from Dec. 12 to Aug. 12 "
 "since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
-"La memoria facoltativa '%s' è stata trasferita dal 12 Dic. al 12 Agosto sin "
-"dal 2002 (%s), applicabile pertanto all'anno %d."
+"La memoria facoltativa '%1$s' è stata trasferita dal 12 Dic. al 12 Agosto "
+"sin dal 2002 (%2$s), applicabile pertanto all'anno %3$d."
 
 #. translators: 1: Festivity name, 2: Source of the information, 3: Requested calendar year
 #: includes/LitCalAPI.php:1455
-#, fuzzy, php-format
-#| msgid ""
-#| "The optional memorial '%s', which would have been superseded this year by "
-#| "a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
-#| "Aug. 12 since the year 2002 (%s), applicable to the year %d."
+#, php-format
 msgid ""
 "The optional memorial '%1$s', which would have been superseded this year by "
 "a Sunday or Solemnity were it on Dec. 12, has however been transferred to "
 "Aug. 12 since the year 2002 (%2$s), applicable to the year %3$d."
 msgstr ""
-"La memoria facoltativa '%s', che sarebbe stata soppressa quest'anno da una "
+"La memoria facoltativa '%1$s', che sarebbe stata soppressa quest'anno da una "
 "Domenica o da una Solennità se veniva celebrata il 12 Dic., è stata tuttavia "
-"trasferita al 12 Agosto sin dal 2002 (%s), applicabile pertanto all'anno %d."
+"trasferita al 12 Agosto sin dal 2002 (%2$s), applicabile pertanto all'anno "
+"%3$d."
 
 #: includes/LitCalAPI.php:1470
 #, php-format
@@ -437,21 +419,16 @@ msgstr ""
 
 #. translators: 1: Festivity name, 2: Source of the information
 #: includes/LitCalAPI.php:1497
-#, fuzzy, php-format
-#| msgid ""
-#| "The Feast '%s' would have been suppressed this year ( 2009 ) since it "
-#| "falls on a Sunday, however being the Year of the Apostle Paul, as per the "
-#| "%s it has been reinstated so that local churches can optionally celebrate "
-#| "the memorial."
+#, php-format
 msgid ""
 "The Feast '%1$s' would have been suppressed this year ( 2009 ) since it "
 "falls on a Sunday, however being the Year of the Apostle Paul, as per the "
 "%2$s it has been reinstated so that local churches can optionally celebrate "
 "the memorial."
 msgstr ""
-"La Festa '%s' sarebbe stata soppressa quest'anno ( 2009 ) visto che cade di "
-"Domenica, tuttavia trattandosi dell'Anno dell'Apostolo Paolo, è stata "
-"restituita secondo il %s in modo che le chiese locali abbiano facoltà di "
+"La Festa '%1$s' sarebbe stata soppressa quest'anno ( 2009 ) visto che cade "
+"di Domenica, tuttavia trattandosi dell'Anno dell'Apostolo Paolo, è stata "
+"restituita secondo il %2$s in modo che le chiese locali abbiano facoltà di "
 "mantenere la memoria."
 
 #: includes/LitCalAPI.php:1521

From b399022d309fd4261ed21f79a354afb1dd8b5f7f Mon Sep 17 00:00:00 2001
From: John D'Orazio <priest@johnromanodorazio.com>
Date: Mon, 6 Jun 2022 11:33:16 +0200
Subject: [PATCH 152/152] update readme, prepare for v3.4 release

---
 README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/README.md b/README.md
index b03338dd..1d106ca8 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,25 @@ Two object keys are returned:
 </a>
 
 # CHANGELOG
+## [v3.4](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.4) (June 6th 2022)
+ * Fix issue with Saint Vincent deacon in national calendar for USA c27289f3c893a184d605e8b1a495a48e2e76669d
+ * simplify calculation of Vigil Masses 0afa39b838611554d32fd0d1c2a80a11a92ec696
+ * add cache-control headers to the Metadata enpoint 3d77f602f29d6a3afaacefb43b3b147ca1dedaef
+ * complete move from MySQL tables to JSON source files d9c73447da1f9997eb0716a6591badc2a0e928ab
+ * add DiocesanGroups info to the Metadata endpoint a378f16e5072c4c298b5bf31263222f159148fbb
+ * move National Calendar data and Wider Region calendar data to JSON source files 1716486704a51eca41cdc066e66744c9c832f05b, 4e298779201e49ab820453be2e8c3f1083082935, 15f16c38cd4c1ba0ded4805760f8c369b9584b49, 5b27417ed32f782c50527f4d7a33df1318f60767, 1247b98d309a7d7eb936740a4094213b826a9ef5, cdf8bdb99f8ddaff52382259ec600a6ec33058a2, 62ad9461757c4e7e6b7c22a2ed5b0567f6052bd7, 7395ef4e75ef0548fcf5dff916cc9b2e77d9f8f6, e5d010f093da4599d9b378396a0b89e7d2763a1f, 9ada5aa092888a1c5ab1df31bc19c185273634f5, c9646a6b24ee9998aed74d077b455231f67183de, 25aa01a8ffd4abf2df97f4fd7ce035361310c6bb, ea5beacd4d21c050aaf0629596feef430f4faa5b, b81b8681c1d2307d3ad95c0aefc15fca3cb92aa2, a837f7b739e215af6eba2337b513200af778d71c, 7e9e894e5320ace19eadcdd656e90f5a7ac5e911, 4d1eca213b11a8231cfa4938908cbcca617b88df, e86ccdace21b6545a2f5c6ea6328ddafe849ba39, 445d22c865709f5621f1b4a3098d8471109650e0, a0e693f2abdd458c85d0526fbde09e85850be74c, 
+ * add cache-control headers to the Main endpoint d2ae04de03a2b08360c7ab62e04830c41a34a0f7 and df7e17da9e9e331cfb84f6b7ccb4af4c5632bd41
+ * add WiderRegions info to the Metadata endpoint b3f567f71a7566da8ba20cc943bd4578534c3ac4
+ * add methods to FestivityCollection a9e176092f44da4fe0fe505097bd69ddc5ea614a
+ * add year limits to Roman Missals 0f939ba6dcca1866b13721bafc5f519c47d8ed16
+ * fix enum validations 4c595c17e1bbf41e6c87e25aa043b97664cbb577, c3d2492f926faeaca5819e27e0b829369669b16a
+ * various fixes 8330fa096b7e0a4154dcc6e00a3d7100d81f1896, 6cf80da677a203ccfdd0d6b0a97aeebd63b3e011, a7e85de029fec3f2952129b97fc0428c740232cc, 4e0a5979552a79382f74edb052f4578333d2a007, 8ee7065c334aa93e6fe0a078b312256cad7cf061, 44df76f230d2595c57a0abe44539efb543f0dc4f, 5638ec6950ac5742175d7e6656c18af873b43cfd, 4f7c11f106496a7d31c504444927182676b567c4, 4decc12dd019a11c2fb0d632df9c34298750f5fa, 54500104b1276c826796542919c53b86fb32c4e6, e2c1f6c71b5fbda4757ecd8cef82dda5c570d8f7, fcb11085ca5c7f3bf82b5dc36808e2e57b4cbbdb, ec772a0b228b76d652436ba2c221f4824808b6a6, d804c7e5d686e59d633ee50df76553291df477e9, a52019ed070436b5d271b05591d5d2e7f5d93477, 8eadab79ea5200535b21a6f7a37257a7a13305e7
+ * add Roman Missal info to the Metadata endpoint 715c28ac7b8113df0aa2c8ad81092828a13c619b
+ * output 404 error for unavailable resources 0bcbd3b09bbe4f8e6d6ddae9cdc1c732a824091a
+ * define JSON schemas b66f4d243834a6e19d33505f7ce123ddee651c51, 0db16a7748e4d10bd6c10e3491cf5325232080ca, 1574c01ab4c66bdbcad1f050ea9e2aa580e2d7a1, a70f38350e6eca9e44979ad900c1b8e75787bd92, a9ac10eb96a3a5c409d306812d4d65e98d4b4dd6, bd2ba8ba4a8ff99a25002cc6835b44280ee00e60, fabf7b65a2996695e510768272d84741c2bf8c3e, 8b8ae2a50ad926b4ebcb932aacc0d66d26eb969b, 85066b8e946117609c5a944987c943b127d084ea, 8a66bf4ab497f3c0e9dff64262c737a0f12bbb55, 3f79b058b666061b71a44b8c3bc7a710c0a25f95, 5e82f30e2ca0386a8445080a5173d36a7675dff3, 552eaa3a8a08e1872865b030e6006a7d2e3f2ca9, f6823001940c4fb2b7bc8ad84c26073cc031c1ae, b48bb7274b3dd436ad22fb2187724cec3e665319, 289f4c2caf21de6b646b699d6a2e7ae5af054fe1, 1245cfcaf9b2014a3cdc63c9d021bd09a2525e31, a4d8bc42692d5609e0d4b4057d7f4c8c2ca2dbb7, 1257b9b839408f9a7abb665828a2d5bae46ec356, baef32b45f91bd7abc05845f1fcb0a91ec62ec3c, 09edca182dfb11dfd0ab81310a20e3494c931688, 228af9cbc07ec41004046af44b37101fab410f1f
+ * create JSON schema validation 3938a278a7fe78bdda30d5d77de6766baa9c7ea1, 85702b023e78159d140cdb301f06d22f0cad4efe, a296cc556ef5d166e5cea4b66c2ddd2fd83334f0, 21f254090b4be79fef871ca02fb9c7fb4b2f5ebb, 765bac9eba97910f200d6cc6f0030f0ada17975f, 10d7619811bef7f55a6498cf3c3351ddfe1f6ae6, 4828724ff4ce90ed66e1572ccec5ede20aa21004, 9cbb8e637b3785ae2839a75c0eb63434b1232bcb, 16809cbc78ee9aa2b9155f0347f49af81f7322c3, a1de05c641b6d103b89577ca225da3d95073bb65
+ * add more data for National Calendars to the Metadata endpoint 34ef54f06d5183b463cce0305f649c182edca2b3
+ * update translations
 ## [v3.3](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v3.3) (January 27th 2022)
  * move festivity data from the 2008 Editio Typica Tertia emendata out from the `LitCalAPI.php`, to a JSON file
  * move data for festivities from Decrees of the Congregation of Divine Worship out from the `LitCalAPI.php`, to a JSON file