uppercase values

Liturgical-Calendar · Jun 22, 2024 · 7a85d93 · 7a85d93
1 parent b19e4cf
commit 7a85d93
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/AnniversaryCalculator.php b/src/AnniversaryCalculator.php
@@ -219,14 +219,23 @@ private function prepareL10N(): void
         $localeArray = [
             $this->parameterData["LOCALE"] . '.utf8',
             $this->parameterData["LOCALE"] . '.UTF-8',
+            $this->parameterData["LOCALE"],
             $this->parameterData["BASE_LOCALE"] . '_' . strtoupper($this->parameterData["BASE_LOCALE"]) . '.utf8',
             $this->parameterData["BASE_LOCALE"] . '_' . strtoupper($this->parameterData["BASE_LOCALE"]) . '.UTF-8',
-            $this->parameterData["LOCALE"],
-            $this->parameterData["BASE_LOCALE"] . '_' . strtoupper($this->parameterData["BASE_LOCALE"])
+            $this->parameterData["BASE_LOCALE"] . '_' . strtoupper($this->parameterData["BASE_LOCALE"]),
+            $this->parameterData["BASE_LOCALE"] . '.utf8',
+            $this->parameterData["BASE_LOCALE"] . '.UTF-8',
+            $this->parameterData["BASE_LOCALE"]
         ];
-        setlocale(LC_ALL, $localeArray);
-        bindtextdomain("litcal", "i18n");
-        textdomain("litcal");
+        $locale = setlocale(LC_ALL, $localeArray);
+        $textdomainpath = bindtextdomain("litcal", "i18n");
+        $textdomain = textdomain("litcal");
+        $this->RESPONSE->Messages[] = sprintf(
+            _('PHP setlocale set to locale %1$s, text domain path set to %2$s, text domain set to %3$s'),
+            $locale ? $locale : 'false',
+            $textdomainpath,
+            $textdomain
+        );
     }
 
     private function setReponseContentTypeHeader()

diff --git a/src/AnniversaryCalculator/LitEvent.php b/src/AnniversaryCalculator/LitEvent.php
@@ -101,14 +101,14 @@ public function __construct(array $rowData)
         $this->eventDay            = $rowData["EVENT_DAY"];
         $this->memorialMonth       = $rowData["MEMORIAL_MONTH"];
         $this->memorialDay         = $rowData["MEMORIAL_DAY"];
-        $this->calendar            = $rowData["CALENDAR"];
+        $this->calendar            = $LitCalendar->isValid($rowData["CALENDAR"]) ? strtoupper($rowData["CALENDAR"]) : '???';
         $this->calendarLcl         = $LitCalendar->i18n($rowData["CALENDAR"]);
         $this->placeOfBirth        = $rowData["PLACE_OF_BIRTH"];
         $this->placeOfDeath        = $rowData["PLACE_OF_DEATH"];
         $this->placeOfBurial       = $rowData["PLACE_OF_BURIAL"];
         $this->mainShrine          = $rowData["MAIN_SHRINE"];
         $this->places              = $rowData["PLACES"];
-        $this->areaOfInterest      = $rowData["AREA"] ? explode(",", $rowData["AREA"]) : [];
+        $this->areaOfInterest      = $rowData["AREA"] ? array_map('strtoupper', explode(",", $rowData["AREA"])) : [];
         $this->areaOfInterestLcl   = $rowData["AREA"] ? $AreaInterest->i18n(explode(",", $rowData["AREA"])) : [];
         $this->notes               = $rowData["NOTES"];
         $this->patronage           = $rowData["PATRONAGE"];