Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.4-lts

2024-10-21 20:07:10 +09:00 · 2024-10-21 20:07:10 +09:00 · fbd8709c65
commit fbd8709c65
parent ab8d27794b 9adb96f3a1
271 changed files with 2107 additions and 1174 deletions
--- a/app/workers/web/push_notification_worker.rb
+++ b/app/workers/web/push_notification_worker.rb
@ -55,12 +55,8 @@ class Web::PushNotificationWorker
  end

  def push_notification_json
-    Oj.dump(serialized_notification_in_subscription_locale.as_json)
-  end
-
-  def serialized_notification_in_subscription_locale
    I18n.with_locale(@subscription.locale.presence || I18n.default_locale) do
-      serialized_notification
+      Oj.dump(serialized_notification.as_json)
    end
  end