diff --git a/app/mailers/sharing_mailer.rb b/app/mailers/sharing_mailer.rb index a7454569dc0..917714e0cb0 100644 --- a/app/mailers/sharing_mailer.rb +++ b/app/mailers/sharing_mailer.rb @@ -32,7 +32,7 @@ class SharingMailer < ApplicationMailer include MailNotificationHelper helper :mail_notification - def shared_work_package(sharer, membership, group = nil) + def shared_work_package(sharer, membership, group = nil) # rubocop:disable Metrics/AbcSize @sharer = sharer @shared_with_user = membership.principal @invitation_token = @shared_with_user.invited? ? @shared_with_user.invitation_token : nil @@ -40,8 +40,6 @@ class SharingMailer < ApplicationMailer @work_package = membership.entity role = membership.roles.first - @role_rights = derive_role_rights(role) - @allowed_work_package_actions = derive_allowed_work_package_actions(role) @url = optionally_activated_url(work_package_url(@work_package.id), @invitation_token) @notification_url = optionally_activated_url(details_notifications_url(@work_package.id, tab: :activity), @invitation_token) @@ -49,6 +47,8 @@ class SharingMailer < ApplicationMailer message_id(membership, sharer) send_localized_mail(@shared_with_user) do + @role_rights = derive_role_rights(role) + @allowed_work_package_actions = derive_allowed_work_package_actions(role) I18n.t("mail.sharing.work_packages.subject", id: @work_package.id) end end @@ -79,14 +79,14 @@ class SharingMailer < ApplicationMailer allowed_actions = case role.builtin when Role::BUILTIN_WORK_PACKAGE_EDITOR - [I18n.t("work_package.permissions.view"), - I18n.t("work_package.permissions.comment"), - I18n.t("work_package.permissions.edit")] + [I18n.t("work_package.permissions.view_verb"), + I18n.t("work_package.permissions.comment_verb"), + I18n.t("work_package.permissions.edit_verb")] when Role::BUILTIN_WORK_PACKAGE_COMMENTER - [I18n.t("work_package.permissions.view"), - I18n.t("work_package.permissions.comment")] + [I18n.t("work_package.permissions.view_verb"), + I18n.t("work_package.permissions.comment_verb")] when Role::BUILTIN_WORK_PACKAGE_VIEWER - [I18n.t("work_package.permissions.view")] + [I18n.t("work_package.permissions.view_verb")] end allowed_actions.map(&:downcase) diff --git a/app/views/sharing_mailer/shared_work_package.html.erb b/app/views/sharing_mailer/shared_work_package.html.erb index b80954e2ba0..321813f41c0 100644 --- a/app/views/sharing_mailer/shared_work_package.html.erb +++ b/app/views/sharing_mailer/shared_work_package.html.erb @@ -36,9 +36,9 @@