diff options
| author | Starfall <us@starfall.systems> | 2022-06-06 14:06:41 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-06-06 14:06:41 -0500 |
| commit | 6e1ebaca0d241d3e9047382e47d7b7136bc4d404 (patch) | |
| tree | 4257f127bd9f10897182914602b31b1ecef401f7 /app/workers | |
| parent | bd872c93333b90f85d90bc60f5690537bee15ee2 (diff) | |
| parent | 3d841eba69b340aac4f012fb388f9e9761ec2ba5 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/move_worker.rb | 4 | ||||
| -rw-r--r-- | app/workers/web/push_notification_worker.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index 4a900e3b8..c3167f9ca 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -47,7 +47,7 @@ class MoveWorker def copy_account_notes! AccountNote.where(target_account: @source_account).find_each do |note| - text = I18n.with_locale(note.account.user&.locale || I18n.default_locale) do + text = I18n.with_locale(note.account.user&.locale.presence || I18n.default_locale) do I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct) end @@ -90,7 +90,7 @@ class MoveWorker def add_account_note_if_needed!(account, id) unless AccountNote.where(account: account, target_account: @target_account).exists? - text = I18n.with_locale(account.user&.locale || I18n.default_locale) do + text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do I18n.t(id, acct: @source_account.acct) end AccountNote.create!(account: account, target_account: @target_account, comment: text) diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb index 57f5b5c22..1ed5bb9e0 100644 --- a/app/workers/web/push_notification_worker.rb +++ b/app/workers/web/push_notification_worker.rb @@ -51,7 +51,7 @@ class Web::PushNotificationWorker private def push_notification_json - json = I18n.with_locale(@subscription.locale || I18n.default_locale) do + json = I18n.with_locale(@subscription.locale.presence || I18n.default_locale) do ActiveModelSerializers::SerializableResource.new( @notification, serializer: Web::NotificationSerializer, |