Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #4066 - Zammad notification emails have a broken reason footer line

Browse source
This commit is contained in:
Mantas Masalskis 2022-05-05 16:17:52 +02:00
parent ee6f1650cb
commit 13e3887dd8
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/transaction/notification.rb
View file

@ -62,14 +62,14 @@ class Transaction::Notification
next if !mention_user.group_access?(ticket.group_id, 'read') next if !mention_user.group_access?(ticket.group_id, 'read')
possible_recipients.push mention_user possible_recipients.push mention_user
recipients_reason[mention_user.id] = 'are subscribed' recipients_reason[mention_user.id] = __('are subscribed')
end end
end end
# apply owner # apply owner
if ticket.owner_id != 1 if ticket.owner_id != 1
possible_recipients.push ticket.owner possible_recipients.push ticket.owner
recipients_reason[ticket.owner_id] = 'are assigned' recipients_reason[ticket.owner_id] = __('are assigned')
end end
# apply out of office agents # apply out of office agents
@ -98,7 +98,7 @@ class Transaction::Notification
recipients_and_channels.push result recipients_and_channels.push result
next if recipients_reason[user.id] next if recipients_reason[user.id]
recipients_reason[user.id] = 'are in group' recipients_reason[user.id] = __('are in group')
end end
# send notifications # send notifications
@ -349,7 +349,7 @@ class Transaction::Notification
return if !replacements.add?(replacement) 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 end
def possible_recipients_of_group(group_id) def possible_recipients_of_group(group_id)

16
i18n/zammad.pot
View file

@ -10751,6 +10751,22 @@ msgstr ""
msgid "archived" msgid "archived"
msgstr "" 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 #: app/assets/javascripts/app/views/ticket_overview/batch_overlay.jst.eco
msgid "assign tickets" msgid "assign tickets"
msgstr "" msgstr ""