Merge pull request #74 from HiEventsDev/develop

I18N fixes + Fix sold out ticket breaking preventing checkout

Author: daveearley

backend/app/DomainObjects/MessageDomainObject.php

@@ -25,12 +25,12 @@ public static function getAllowedSorts(): AllowedSorts
         return new AllowedSorts(
             [
                 self::CREATED_AT => [
-                    'asc' => 'Sent Date Oldest',
-                    'desc' => 'Sent Date Newest',
+                    'asc' => __('Sent Date Oldest'),
+                    'desc' => __('Sent Date Newest'),
                 ],
                 self::SUBJECT => [
-                    'asc' => 'Subject A-Z',
-                    'desc' => 'Subject Z-A',
+                    'asc' => __('Subject A-Z'),
+                    'desc' => __('Subject Z-A'),
                 ],
             ],
         );

backend/app/Http/Middleware/SetUserLocaleMiddleware.php

@@ -4,12 +4,17 @@
 
 use Closure;
 use HiEvents\DomainObjects\UserDomainObject;
+use HiEvents\Services\Application\Locale\LocaleService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 
 class SetUserLocaleMiddleware
 {
+    public function __construct(private readonly LocaleService $localeService)
+    {
+    }
+
     public function handle(Request $request, Closure $next)
     {
         $this->setLocale($request);
@@ -34,7 +39,7 @@ protected function setLocale(Request $request): void
     protected function setLocaleFromCookie(Request $request): bool
     {
         if ($locale = $request->cookie('locale')) {
-            App::setLocale($locale);
+            App::setLocale($this->localeService->getLocaleOrDefault($locale));
             return true;
         }
 
@@ -56,7 +61,7 @@ protected function setLocaleFromUser(): bool
     protected function setLocaleFromAcceptLanguage(Request $request): bool
     {
         if ($request->hasHeader('Accept-Language')) {
-            App::setLocale($request->header('Accept-Language'));
+            App::setLocale($this->localeService->getLocaleOrDefault($request->getPreferredLanguage()));
             return true;
         }
 

backend/lang/de.json

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "Um die Einladung anzunehmen, klicken Sie bitte auf den unten stehenden Link:",
     "Accept Invitation": "Einladung annehmen",
     "All rights reserved.": "Alle Rechte vorbehalten.",
-    "Congratulations 🎉": "Herzlichen Glückwunsch 🎉."
-}
+    "Congratulations 🎉": "Herzlichen Glückwunsch 🎉.",
+    "Sent Date Oldest": "Gesendet Datum Älteste",
+    "Sent Date Newest": "Gesendet Datum Neueste",
+    "Subject A-Z": "Betreff A-Z",
+    "Subject Z-A": "Betreff Z-A"
+}

backend/lang/es.json

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "Para aceptar la invitación, haga clic en el siguiente enlace:",
     "Accept Invitation": "Aceptar invitación",
     "All rights reserved.": "Todos los derechos reservados.",
-    "Congratulations 🎉": "Enhorabuena 🎉"
-}
+    "Congratulations 🎉": "Enhorabuena 🎉",
+    "Sent Date Oldest": "Fecha de Envío Más Antigua",
+    "Sent Date Newest": "Fecha de Envío Más Reciente",
+    "Subject A-Z": "Asunto A-Z",
+    "Subject Z-A": "Asunto Z-A"
+}

backend/lang/es/validation.php

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "Pour accepter l'invitation, veuillez cliquer sur le lien ci-dessous :",
     "Accept Invitation": "Accepter l'invitation",
     "All rights reserved.": "Tous droits réservés.",
-    "Congratulations 🎉": "Félicitations 🎉"
-}
+    "Congratulations 🎉": "Félicitations 🎉",
+    "Sent Date Oldest": "Date d'Envoi la Plus Ancienne",
+    "Sent Date Newest": "Date d'Envoi la Plus Récente",
+    "Subject A-Z": "Objet A-Z",
+    "Subject Z-A": "Objet Z-A"
+}

backend/lang/fr.json

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "Para aceitar o convite, clique no link abaixo:",
     "Accept Invitation": "Aceitar convite",
     "All rights reserved.": "Todos os direitos reservados.",
-    "Congratulations 🎉": "Parabéns 🎉"
-}
+    "Congratulations 🎉": "Parabéns 🎉",
+    "Sent Date Oldest": "Data de Envio Mais Antiga",
+    "Sent Date Newest": "Data de Envio Mais Recente",
+    "Subject A-Z": "Assunto A-Z",
+    "Subject Z-A": "Assunto Z-A"
+}

backend/lang/pt-br.json

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "Para aceitar o convite, clique na hiperligação abaixo:",
     "Accept Invitation": "Aceitar o convite",
     "All rights reserved.": "Todos os direitos reservados.",
-    "Congratulations 🎉": "Parabéns 🎉"
-}
+    "Congratulations 🎉": "Parabéns 🎉",
+    "Sent Date Oldest": "Data de Envio Mais Antiga",
+    "Sent Date Newest": "Data de Envio Mais Recente",
+    "Subject A-Z": "Assunto A-Z",
+    "Subject Z-A": "Assunto Z-A"
+}

backend/lang/pt.json

@@ -259,5 +259,10 @@
     "Congratulations! You\\'ve received a new order for ": "",
     "What\\'s Next?": "",
     "Welcome to :appName! We\\'re excited to have you aboard!": "",
-    "You\\'ve been invited to join :appName.": ""
+    "You\\'ve been invited to join :appName.": "",
+    "Sent Date Oldest": "",
+    "Sent Date Newest": "",
+    "Subject A-Z": "",
+    "Subject Z-A": "",
+    "There are no tickets available. If you would like to assign this ticket to this attendee, please adjust the ticket\\'s available quantity.": ""
 }

backend/lang/ru.json

@@ -245,5 +245,9 @@
     "To accept the invitation, please click the link below:": "要接受邀请，请点击下面的链接：",
     "Accept Invitation": "接受邀请",
     "All rights reserved.": "保留所有权利。",
-    "Congratulations 🎉": "恭喜 🎉"
-}
+    "Congratulations 🎉": "恭喜 🎉",
+    "Sent Date Oldest": "发送日期最早",
+    "Sent Date Newest": "发送日期最新",
+    "Subject A-Z": "主题 A-Z",
+    "Subject Z-A": "主题 Z-A"
+}