GEWIS · tomudding · Apr 27, 2025 · Apr 27, 2025
diff --git a/module/Activity/src/Service/Activity.php b/module/Activity/src/Service/Activity.php
@@ -11,6 +11,7 @@
 use Activity\Model\SignupField as SignupFieldModel;
 use Activity\Model\SignupList as SignupListModel;
 use Activity\Model\SignupOption as SignupOptionModel;
+use Application\Model\Enums\Languages;
 use Application\Service\Email as EmailService;
 use Company\Model\Company as CompanyModel;
 use Company\Service\Company as CompanyService;
@@ -352,7 +353,7 @@
         ?OrganModel $organ,
     ): void {
         // Default to an English title, otherwise use the Dutch title
-        $activityTitle = $activity->getName()->getText('en');
+        $activityTitle = $activity->getName()->getText(Languages::English);
         $activityTime = $activity->getBeginTime()->format('d-m-Y H:i');
 
         $type = sprintf('activity_creation_require_%s', $facilityType);
@@ -457,7 +458,7 @@

        if (0 !== $currentActivity->getUpdateProposal()->count()) {
            $proposal = $currentActivity->getUpdateProposal()->first();
            //Remove old update proposal
            $oldUpdate = $proposal->getNew();
            $proposal->setNew($newActivity);
            $em->remove($oldUpdate);

diff --git a/module/Activity/view/activity/admin/view.phtml b/module/Activity/view/activity/admin/view.phtml
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Activity\Model\Activity as ActivityModel;
+use Application\Model\Enums\Languages;
 use Application\View\HelperTrait;
 use Laminas\View\Renderer\PhpRenderer;
 
@@ -82,10 +83,10 @@ $this->breadcrumbs()
             <tr>
                 <td><?= $activity->getId() ?></td>
                 <td>
-                    <a href="<?= $this->url('activity/view', ['id' => $activity->getId()]) ?>"><?= $activity->getName()->getText("nl") ?></a>
+                    <a href="<?= $this->url('activity/view', ['id' => $activity->getId()]) ?>"><?= $activity->getName()->getText(Languages::Dutch) ?></a>
                 </td>
                 <td>
-                    <a href="<?= $this->url('activity/view', ['id' => $activity->getId()]) ?>"><?= $activity->getName()->getText("en") ?></a>
+                    <a href="<?= $this->url('activity/view', ['id' => $activity->getId()]) ?>"><?= $activity->getName()->getText(Languages::English) ?></a>
                 </td>
                 <td><?= $activity->getBeginTime()->format('Y-m-d') ?></td>
                 <td><?= (null === $activity->getOrgan()) ? $this->translate('None') : $this->escapeHtml($activity->getOrgan()->getAbbr()) ?></td>

diff --git a/module/Activity/view/email/activity-update-proposed.phtml b/module/Activity/view/email/activity-update-proposed.phtml
@@ -1,12 +1,17 @@
+<?php
+
+use Application\Model\Enums\Languages;
+
+?>
 For English, see below.
 
 L.s.<br/><br/>
 
 Er is een voorstel gedaan om een activiteit aan te passen op de GEWIS website.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("nl")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::Dutch)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("nl")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::Dutch)) ?></p>
 
 <table>
     <tr>
@@ -19,11 +24,11 @@ Er is een voorstel gedaan om een activiteit aan te passen op de GEWIS website.
     </tr>
     <tr>
         <td><strong>Locatie:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::Dutch)) ?></td>
     </tr>
     <tr>
         <td><strong>Kosten:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::Dutch)) ?></td>
     </tr>
 </table>
 <br/>
@@ -38,9 +43,9 @@ L.s.<br/><br/>
 
 An update proposal was made for an activity on the GEWIS website. See below for details.
 
-<h1><?= $this->escapeHtml($activity->getName()->getText("en")) ?></h1>
+<h1><?= $this->escapeHtml($activity->getName()->getText(Languages::English)) ?></h1>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("en")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::English)) ?></p>
 
 <table>
     <tr>
@@ -53,11 +58,11 @@ An update proposal was made for an activity on the GEWIS website. See below for
     </tr>
     <tr>
         <td><strong>Location:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::English)) ?></td>
     </tr>
     <tr>
         <td><strong>Costs:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::English)) ?></td>
     </tr>
 </table>
 <br/>

diff --git a/module/Activity/view/email/activity-updated.phtml b/module/Activity/view/email/activity-updated.phtml
@@ -1,12 +1,17 @@
+<?php
+
+use Application\Model\Enums\Languages;
+
+?>
 For English, see below.
 
 L.s.<br/><br/>
 
 Er is een activiteit aangepast op de GEWIS website.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("nl")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::Dutch)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("nl")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::Dutch)) ?></p>
 
 <table>
     <tr>
@@ -19,11 +24,11 @@ Er is een activiteit aangepast op de GEWIS website.
     </tr>
     <tr>
         <td><strong>Locatie:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::Dutch)) ?></td>
     </tr>
     <tr>
         <td><strong>Kosten:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::Dutch)) ?></td>
     </tr>
 </table>
 <br/>
@@ -39,9 +44,9 @@ L.s.<br/><br/>
 
 An activity was updated on the GEWIS website. See below for details.
 
-<h1><?= $this->escapeHtml($activity->getName()->getText("en")) ?></h1>
+<h1><?= $this->escapeHtml($activity->getName()->getText(Languages::English)) ?></h1>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("en")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::English)) ?></p>
 
 <table>
     <tr>
@@ -54,11 +59,11 @@ An activity was updated on the GEWIS website. See below for details.
     </tr>
     <tr>
         <td><strong>Location:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::English)) ?></td>
     </tr>
     <tr>
         <td><strong>Costs:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::English)) ?></td>
     </tr>
 </table>
 <br/>

diff --git a/module/Activity/view/email/activity.phtml b/module/Activity/view/email/activity.phtml
@@ -1,12 +1,17 @@
+<?php
+
+use Application\Model\Enums\Languages;
+
+?>
 For English, see below.
 
 L.s.<br/><br/>
 
 Er is een nieuwe activiteit aangemaakt op de GEWIS website.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("nl")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::Dutch)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("nl")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::Dutch)) ?></p>
 
 <table>
     <tr>
@@ -19,11 +24,11 @@ Er is een nieuwe activiteit aangemaakt op de GEWIS website.
     </tr>
     <tr>
         <td><strong>Locatie:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::Dutch)) ?></td>
     </tr>
     <tr>
         <td><strong>Kosten:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("nl")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::Dutch)) ?></td>
     </tr>
 </table>
 <br/>
@@ -39,9 +44,9 @@ L.s.<br/><br/>
 
 A new activity was created at the GEWIS website. See below for details.
 
-<h1><?= $this->escapeHtml($activity->getName()->getText("en")) ?></h1>
+<h1><?= $this->escapeHtml($activity->getName()->getText(Languages::English)) ?></h1>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("en")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::English)) ?></p>
 
 <table>
     <tr>
@@ -54,11 +59,11 @@ A new activity was created at the GEWIS website. See below for details.
     </tr>
     <tr>
         <td><strong>Location:</strong></td>
-        <td><?= $this->escapeHtml($activity->getLocation()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getLocation()->getText(Languages::English)) ?></td>
     </tr>
     <tr>
         <td><strong>Costs:</strong></td>
-        <td><?= $this->escapeHtml($activity->getCosts()->getText("en")) ?></td>
+        <td><?= $this->escapeHtml($activity->getCosts()->getText(Languages::English)) ?></td>
     </tr>
 </table>
 <br/>

diff --git a/module/Activity/view/email/activity_created_require_GEFLITST.phtml b/module/Activity/view/email/activity_created_require_GEFLITST.phtml
@@ -1,12 +1,17 @@
+<?php
+
+use Application\Model\Enums\Languages;
+
+?>
 For English, see below.
 
 L.s.<br/><br/>
 
 Er is een nieuwe activiteit aangemaakt op de GEWIS website waarvoor een fotograaf van GEFLITST nodig is.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("nl")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::Dutch)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("nl")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::Dutch)) ?></p>
 
 <br/>
 
@@ -23,9 +28,9 @@ L.s.<br/><br/>
 
 A new activity has been created on the GEWIS website that needs a photographer of GEFLITST.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("en")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::English)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("en")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::English)) ?></p>
 
 <br/>
 

diff --git a/module/Activity/view/email/activity_created_require_Zettle.phtml b/module/Activity/view/email/activity_created_require_Zettle.phtml
@@ -1,12 +1,17 @@
+<?php
+
+use Application\Model\Enums\Languages;
+
+?>
 For English, see below.
 
 L.s.<br/><br/>
 
 Er is een nieuwe activiteit aangemaakt op de GEWIS website waarvoor een Zettle nodig is.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("nl")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::Dutch)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("nl")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::Dutch)) ?></p>
 
 <br/>
 
@@ -23,9 +28,9 @@ L.s.<br/><br/>
 
 A new activity has been created on the GEWIS website that needs Zettle for payments.
 
-<h3><?= $this->escapeHtml($activity->getName()->getText("en")) ?></h3>
+<h3><?= $this->escapeHtml($activity->getName()->getText(Languages::English)) ?></h3>
 
-<p><?= $this->escapeHtml($activity->getDescription()->getText("en")) ?></p>
+<p><?= $this->escapeHtml($activity->getDescription()->getText(Languages::English)) ?></p>
 
 <br/>
 

diff --git a/module/Application/src/Model/LocalisedText.php b/module/Application/src/Model/LocalisedText.php
@@ -69,21 +69,23 @@ public function updateValueNL(?string $valueNL): void
      *
      * @throws InvalidArgumentException
      */
-    public function getText(?string $locale = null): ?string
+    public function getText(?Languages $locale = null): ?string
     {
         if (null === $locale) {
             $locale = $this->getPreferredLocale();
+        } else {
+            $locale = $locale->getLangParam();
         }
 
         return match ($locale) {
-            'nl' => null !== $this->valueNL ? $this->valueNL : $this->valueEN,
-            'en' => null !== $this->valueEN ? $this->valueEN : $this->valueNL,
+            Languages::Dutch->getLangParam() => null !== $this->valueNL ? $this->valueNL : $this->valueEN,
+            Languages::English->getLangParam() => null !== $this->valueEN ? $this->valueEN : $this->valueNL,
             default => throw new InvalidArgumentException('Locale not supported: ' . $locale),
         };
     }
 
     /**
-     * @return string the preferred language: either 'nl'  or 'en'
+     * @psalm-return 'en'|'nl' - From {@link Languages::getLangParam()}.
      */
     private function getPreferredLocale(): string
     {
@@ -102,12 +104,12 @@ public function getExactText(?Languages $locale = null): ?string
         if (null === $locale) {
             $locale = $this->getPreferredLocale();
         } else {
-            $locale = $locale->value;
+            $locale = $locale->getLangParam();
         }
 
         return match ($locale) {
-            'nl' => $this->valueNL,
-            'en' => $this->valueEN,
+            Languages::Dutch->getLangParam() => $this->valueNL,
+            Languages::English->getLangParam() => $this->valueEN,
             default => throw new InvalidArgumentException('Locale not supported: ' . $locale),
         };
     }

diff --git a/module/Frontpage/view/frontpage/frontpage/home.phtml b/module/Frontpage/view/frontpage/frontpage/home.phtml
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Activity\Model\Activity as ActivityModel;
+use Application\Model\Enums\Languages;
 use Application\View\HelperTrait;
 use Company\Model\CompanyBannerPackage as CompanyBannerPackageModel;
 use Decision\Service\AclService as DecisionAclService;
@@ -177,7 +178,7 @@ $lang = $this->plugin('translate')->getTranslator()->getLocale();
                             <?php foreach ($activities as $activity): ?>
                                 <a class="list-group-item"
                                    href="<?= $this->url('activity/view', ['id' => $activity->getId()]) ?>">
-                                    <h4 class="list-group-item-heading"><?= $activity->getName()->getText($lang) ?></h4>
+                                    <h4 class="list-group-item-heading"><?= $activity->getName()->getText(Languages::fromLangParam($lang)) ?></h4>
                                     <p class="list-group-item-text text-muted"><?= ucfirst($this->dateFormat($activity->getBeginTime(), IntlDateFormatter::FULL, IntlDateFormatter::SHORT, $lang)); ?></p>
                                 </a>
                             <?php endforeach; ?>