Merge pull request #142 from Liturgical-Calendar/development

Development for v3.6

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: Update POTs
 
 # Controls when the workflow will run
 on:
@@ -29,7 +29,7 @@ jobs:
         run: |
           sudo apt-get install -y gettext
           xgettext --from-code=UTF-8 --add-comments='translators:' --keyword="pgettext:1c,2" -o i18n/litcal.pot includes/LitCalAPI.php includes/LitMessages.php includes/FestivityCollection.php includes/enums/LitColor.php includes/enums/LitCommon.php includes/enums/LitGrade.php
-          echo "::set-output name=POT_LINES_CHANGED::$(git diff -U0 | grep '^[+|-][^+|-]' | grep -Ev '^[+-]"POT-Creation-Date' | wc -l)"
+          echo "POT_LINES_CHANGED=$(git diff -U0 | grep '^[+|-][^+|-]' | grep -Ev '^[+-]"POT-Creation-Date' | wc -l)" >> $GITHUB_OUTPUT
 
       # push the output folder to your repo
       - name: Push changes

.gitignore

@@ -3,4 +3,4 @@ LiturgicalCalendar.iml
 engineCache/*
 allowedOrigins.php
 vendor/*
-
+debug.log

LitCalAllFestivities.php

@@ -21,14 +21,16 @@
     return str_starts_with( $item, "VATICAN_" );
 });
 
-$LOCALE = isset( $_GET["locale"] ) && LitLocale::isValid( strtoupper( $_GET["locale"] ) ) ? strtoupper( $_GET["locale"] ) : "LA";
+$LOCALE = isset( $_GET["locale"] ) ? $_GET["locale"] : "la";
+$LOCALE = strtolower( explode('_', $LOCALE)[0] );
+$LOCALE = LitLocale::isValid( $LOCALE ) ? $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 );
+        if( $I18nPath !== false && file_exists( $I18nPath . "/" . $LOCALE . ".json" ) ) {
+            $NAME = json_decode( file_get_contents( $I18nPath . "/" . $LOCALE . ".json" ), true );
             $DATA = json_decode( file_get_contents( $DataFile ), true );
             foreach( $DATA as $idx => $festivity ) {
                 $key = $festivity[ "TAG" ];
@@ -40,6 +42,52 @@
     }
 }
 
+$DataFile = 'data/propriumdetempore.json';
+$I18nFile = 'data/propriumdetempore/' . $LOCALE . ".json";
+$DATA = json_decode( file_get_contents( $DataFile ), true );
+$NAME = json_decode( file_get_contents( $I18nFile ), true );
+foreach( $DATA as $key => $readings ) {
+    if( false === array_key_exists( $key, $FestivityCollection ) ) {
+        $FestivityCollection[ $key ] = $readings;
+        $FestivityCollection[ $key ][ "TAG" ] = $key;
+        $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+    }
+}
+
+$DataFile = 'data/memorialsFromDecrees/memorialsFromDecrees.json';
+$I18nFile = 'data/memorialsFromDecrees/i18n/' . $LOCALE . ".json";
+$DATA = json_decode( file_get_contents( $DataFile ), true );
+$NAME = json_decode( file_get_contents( $I18nFile ), true );
+foreach( $DATA as $idx => $festivity ) {
+    $key = $festivity[ "Festivity" ][ "TAG" ];
+    if( false === array_key_exists( $key, $FestivityCollection ) ) {
+        $FestivityCollection[ $key ] = $festivity[ "Festivity" ];
+        $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+        if( array_key_exists( "decreeLangs", $festivity[ "Metadata" ] ) ) {
+            $decreeURL = sprintf( $festivity[ "Metadata" ][ "decreeURL" ], 'LA' );
+            if( array_key_exists(strtoupper($LOCALE), $festivity[ "Metadata" ][ "decreeLangs" ]) ) {
+                $decreeLang = $festivity[ "Metadata" ][ "decreeLangs" ][ strtoupper( $LOCALE ) ];
+                $decreeURL = sprintf( $festivity[ "Metadata" ][ "decreeURL" ], $decreeLang );
+            }
+        } else {
+            $decreeURL = $festivity[ "Metadata" ][ "decreeURL" ];
+        }
+        $FestivityCollection[ $key ][ "DECREE" ] = $decreeURL;
+    }
+    else if ( $festivity[ "Metadata" ][ "action" ] === 'setProperty' ) {
+        if( $festivity[ "Metadata" ][ "property" ] === 'name' ) {
+            $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+        }
+        else if( $festivity[ "Metadata" ][ "property" ] === 'grade' ) {
+            $FestivityCollection[ $key ][ "GRADE" ] = $festivity[ "Festivity" ][ "GRADE" ];
+        }
+    }
+    else if( $festivity[ "Metadata" ][ "action" ] === 'makeDoctor' ) {
+        $FestivityCollection[ $key ][ "NAME" ] = $NAME[ $key ];
+    }
+}
+
+
 $responseObj = [ "LitCalAllFestivities" => $FestivityCollection ];
 
 $response = json_encode( $responseObj );

LitCalEngine.php

@@ -5,7 +5,7 @@
  * Author: John Romano D'Orazio
  * Email: priest@johnromanodorazio.com
  * Licensed under the Apache 2.0 License
- * Version 3.4
+ * Version 3.6
  * Date Created: 27 December 2017
  */
 

LitCalMetadata.php

@@ -14,12 +14,18 @@
 header( 'Cache-Control: must-revalidate, max-age=259200' );
 header( 'Content-Type: application/json' );
 
-//National Calendars are defined in the LitCalAPI engine itself,
-//so we don't really have any way of detecting them except declaring them explicitly here
-//If we eventually succeed in finding a rational way to separate national calendars from the central API,
-//then perhaps we will also be able to automatically detect which national calendars are defined
-//Until then, we'll just use this array, and add to it if a new national calendar is built into the LitCalAPI class
-$baseNationalCalendars = [ "ITALY", "USA", "VATICAN" ];
+$widerRegionCalendars = [];
+foreach (glob("nations/*.json") as $filename) {
+    $widerRegionCalendars[] = strtoupper( basename($filename, ".json") );
+}
+
+$baseNationalCalendars = [ "VATICAN" ];
+$directories = array_map('basename', glob( 'nations/*' , GLOB_ONLYDIR) );
+foreach( $directories as $directory ) {
+    if( file_exists( "nations/$directory/$directory.json" ) ) {
+        $baseNationalCalendars[] = $directory;
+    }
+}
 
 if( file_exists( 'nations/index.json' ) ) {
     $index = file_get_contents( 'nations/index.json' );
@@ -41,7 +47,8 @@
                 $nationalCalendarsMetadata[$diocesanCalendars[$key]["nation"]] = [
                     "missals" => [],
                     "widerRegions" => [],
-                    "dioceses" => []
+                    "dioceses" => [],
+                    "settings" => []
                 ];
             }
             $nationalCalendars[$diocesanCalendars[$key]["nation"]][] = $key;
@@ -56,6 +63,7 @@
                 $nationData = json_decode( file_get_contents( "nations/$nation/$nation.json" ) );
                 $nationalCalendarsMetadata[$nation]["missals"] = $nationData->Metadata->Missals;
                 $nationalCalendarsMetadata[$nation]["widerRegions"][] = $nationData->Metadata->WiderRegion->name;
+                $nationalCalendarsMetadata[$nation]["settings"] = $nationData->Settings;
             }
         }
         $filterDirResults = ['..', '.', 'index.json'];