fix: Push notifications localization issue

limanmys · Jan 5, 2024 · 397e72c · 397e72c
1 parent 7beff02
commit 397e72c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/app/Classes/NotificationBuilder.php b/app/Classes/NotificationBuilder.php
@@ -15,7 +15,7 @@ class NotificationBuilder
     /**
      * @param Notification $notification
      */
-    public function __construct(private readonly Notification $notification)
+    public function __construct(private $notification, private $locale)
     {
     }
 
@@ -31,7 +31,7 @@ public function convertToBroadcastable(): array
                 $contents = $this->notification->contents;
                 $title = $contents['title'];
                 $content = $contents['content'];
-                $locale = app()->getLocale();
+                $locale = $this->locale;
                 $fallback = env('APP_LOCALE', 'tr');
 
                 if (isset($title[$locale])) {

diff --git a/app/Http/Controllers/API/NotificationController.php b/app/Http/Controllers/API/NotificationController.php
@@ -19,14 +19,14 @@ class NotificationController extends Controller
      */
     public function index()
     {
-        return auth()->user()
+        return auth('api')->user()
             ->notifications()
             ->withPivot('read_at', 'seen_at')
             ->orderBy('send_at', 'desc')
             ->take(100)
             ->get()
             ->map(function ($notification) {
-                $builder = new NotificationBuilder($notification);
+                $builder = new NotificationBuilder($notification, auth('api')->user()->locale);
 
                 return $builder->convertToBroadcastable();
             });
@@ -39,15 +39,15 @@ public function index()
      */
     public function unread()
     {
-        return auth()->user()
+        return auth('api')->user()
             ->notifications()
             ->withPivot('read_at', 'seen_at')
             ->where('read_at', null)
             ->orderBy('send_at', 'desc')
             ->take(8)
             ->get()
             ->map(function ($notification) {
-                $builder = new NotificationBuilder($notification);
+                $builder = new NotificationBuilder($notification, auth('api')->user()->locale);
 
                 return $builder->convertToBroadcastable();
             });

diff --git a/app/Mail/BasicNotification.php b/app/Mail/BasicNotification.php
@@ -16,21 +16,17 @@ class BasicNotification extends Mailable
 {
     use Queueable, SerializesModels;
 
-    public $user;
-
     public $subject;
 
-    public $notification;
-
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($notification)
+    public function __construct(public $notification, public $user)
     {
         $this->subject = __('Liman MYS Bilgilendirme');
-        $builder = new NotificationBuilder($notification);
+        $builder = new NotificationBuilder($this->notification, $this->user->locale ?? env('APP_LOCALE', 'tr'));
         $this->notification = $builder->convertToBroadcastable();
     }
 
@@ -41,6 +37,9 @@ public function __construct($notification)
      */
     public function build()
     {
+        // Set session locale
+        app()->setLocale($this->user->locale ?? env('APP_LOCALE', 'tr'));
+
         return $this->from([
             'address' => env('APP_NOTIFICATION_EMAIL'),
             'name' => __('Liman Bildiri Sistemi'),

diff --git a/app/Notifications/NotificationSent.php b/app/Notifications/NotificationSent.php
@@ -18,7 +18,7 @@ class NotificationSent extends Notification
      *
      * @return void
      */
-    public function __construct(private $notification)
+    public function __construct(private $notification, private $user)
     {
     }
 
@@ -52,7 +52,7 @@ public function toBroadcast(mixed $notifiable): BroadcastMessage
      */
     public function toArray(): array
     {
-        $builder = new NotificationBuilder($this->notification);
+        $builder = new NotificationBuilder($this->notification, $this->user->locale);
         return $builder->convertToBroadcastable();
     }
 }
diff --git a/app/Observers/NotificationObserver.php b/app/Observers/NotificationObserver.php
@@ -26,7 +26,7 @@ private function sendBroadcast(Notification $notification)
             $user->notify(new NotificationSent($notification, $user));
             if (env('MAIL_ENABLED') && $notification && $notification->mail) {
                 try {
-                    Mail::to($user)->send(new BasicNotification($notification));
+                    Mail::to($user)->send(new BasicNotification($notification, $user));
                 } catch (TransportException $e) {
                     // Don't throw anything on when mail server is not active
                 }

diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -1,4 +1,6 @@
 {
+  "Merhaba": "Hello",
+  "Bilginize": "For your information",
   "Email Adresi": "Email Address",
   "Beni Hatırla": "Remember Me",
   "Giriş Yap ": "Login ",

diff --git a/resources/views/email/external_notification.blade.php b/resources/views/email/external_notification.blade.php
@@ -5,13 +5,13 @@
     @endcomponent
   @endslot
 
-  Merhaba,<br /><br />
+  {{__("Merhaba")}},<br /><br />
   {{$notification['content']}}<br /><br />
-  Bilginize.
+  {{__("Bilginize")}}.
 
   @slot('footer')
     @component('mail::footer')
-      Bu email <a href="https://liman.works">Liman MYS</a> dış bildirim sisteminde <b>{{ isset(explode("->", $notification['title'])[1]) ? explode("->", $notification['title'])[1] : 'Liman' }}</b> tarafından oluşturulmuştur.
+      Bu email <a href="https://liman.havelsan.com.tr">Liman MYS</a> dış bildirim sisteminde <b>{{ isset(explode("->", $notification['title'])[1]) ? explode("->", $notification['title'])[1] : 'Liman' }}</b> tarafından oluşturulmuştur.
     @endcomponent
   @endslot