From 13e3887dd8883569906bd79a3add501623e0b76e Mon Sep 17 00:00:00 2001 From: Mantas Masalskis Date: Thu, 5 May 2022 16:17:52 +0200 Subject: [PATCH] Fixes #4066 - Zammad notification emails have a broken reason footer line --- app/models/transaction/notification.rb | 8 ++++---- i18n/zammad.pot | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/models/transaction/notification.rb b/app/models/transaction/notification.rb index 622384721..f4095e557 100644 --- a/app/models/transaction/notification.rb +++ b/app/models/transaction/notification.rb @@ -62,14 +62,14 @@ class Transaction::Notification next if !mention_user.group_access?(ticket.group_id, 'read') possible_recipients.push mention_user - recipients_reason[mention_user.id] = 'are subscribed' + recipients_reason[mention_user.id] = __('are subscribed') end end # apply owner if ticket.owner_id != 1 possible_recipients.push ticket.owner - recipients_reason[ticket.owner_id] = 'are assigned' + recipients_reason[ticket.owner_id] = __('are assigned') end # apply out of office agents @@ -98,7 +98,7 @@ class Transaction::Notification recipients_and_channels.push result next if recipients_reason[user.id] - recipients_reason[user.id] = 'are in group' + recipients_reason[user.id] = __('are in group') end # send notifications @@ -349,7 +349,7 @@ class Transaction::Notification return if !replacements.add?(replacement) - reasons[replacement.id] = 'are the out-of-office replacement of the owner' + reasons[replacement.id] = __('are the out-of-office replacement of the owner') end def possible_recipients_of_group(group_id) diff --git a/i18n/zammad.pot b/i18n/zammad.pot index f211a53a7..e4adf6632 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -10751,6 +10751,22 @@ msgstr "" msgid "archived" msgstr "" +#: app/models/transaction/notification.rb +msgid "are assigned" +msgstr "" + +#: app/models/transaction/notification.rb +msgid "are in group" +msgstr "" + +#: app/models/transaction/notification.rb +msgid "are subscribed" +msgstr "" + +#: app/models/transaction/notification.rb +msgid "are the out-of-office replacement of the owner" +msgstr "" + #: app/assets/javascripts/app/views/ticket_overview/batch_overlay.jst.eco msgid "assign tickets" msgstr ""