scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2026-01-08 05:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update from_email in the name to fix the syntax error (#6900)

Browse Source
This commit is contained in:
Tejaswini Chile
2023-04-13 23:12:38 +05:30
committed by GitHub
parent 9ca21df9fd
commit 2b736f4698
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/mailers/conversation_reply_mailer.rb
View File

@@ -116,7 +116,8 @@ class ConversationReplyMailer < ApplicationMailer
def channel_email_with_name
if @conversation.assignee.present?
I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, inbox_name: @inbox.name)
I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, inbox_name: @inbox.name,
from_email: @channel.email)
else
I18n.t('conversations.reply.channel_email.header.reply_with_inbox_name', inbox_name: @inbox.name, from_email: @channel.email)
end

2
config/locales/en.yml
View File

@@ -154,7 +154,7 @@ en:
reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
channel_email:
header:
reply_with_name: "%{assignee_name} from %{inbox_name}"
reply_with_name: "%{assignee_name} from %{inbox_name} <%{from_email}>"
reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
email_subject: "New messages on this conversation"
transcript_subject: "Conversation Transcript"

2
spec/mailers/conversation_reply_mailer_spec.rb
View File

@@ -171,7 +171,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
it 'renders assignee name in the from address' do
mail = described_class.email_reply(message)
expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name}"
expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
end
it 'renders inbox name in the from address' do