diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb index a6942da..5e11588 100644 --- a/app/views/devise/mailer/invitation_instructions.html.erb +++ b/app/views/devise/mailer/invitation_instructions.html.erb @@ -2,7 +2,7 @@ tool_name = Rails.configuration.branding[:application][:name] link = accept_invitation_url(@resource, :invitation_token => @token) helpdesk_email = Rails.configuration.branding[:organisation][:helpdesk_email] - contact_us_url = Rails.configuration.branding[:organisation][:contact_us_url] || contact_us_url + contact_us = (Rails.configuration.branding[:organisation][:contact_us_url] || contact_us_url) email_subject = _('Query or feedback related to %{tool_name}') %{ :tool_name => tool_name } %> <% FastGettext.with_locale FastGettext.default_locale do %> @@ -21,6 +21,6 @@ <%= _('The %{tool_name} team') %{:tool_name => tool_name} %>
- <%= _('Please do not reply to this email.') %> <%= raw(_('If you have any questions or need help, please contact us at %{helpdesk_email} or visit %{contact_us_url}') %{ :helpdesk_email => mail_to(helpdesk_email, helpdesk_email, subject: email_subject), :contact_us_url => link_to(contact_us_url, contact_us_url) }) %> + <%= _('Please do not reply to this email.') %> <%= raw(_('If you have any questions or need help, please contact us at %{helpdesk_email} or visit %{contact_us}') %{ :helpdesk_email => mail_to(helpdesk_email, helpdesk_email, subject: email_subject), :contact_us_url => link_to(contact_us, contact_us) }) %>
<% end %> \ No newline at end of file diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 8634d05..5b9c77b 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,7 +1,7 @@ <% tool_name = Rails.configuration.branding[:application][:name] helpdesk_email = Rails.configuration.branding[:organisation][:helpdesk_email] - contact_us_url = Rails.configuration.branding[:organisation][:contact_us_url] || contact_us_url + contact_us = Rails.configuration.branding[:organisation][:contact_us_url] || contact_us_url email_subject = _('Query or feedback related to %{tool_name}') %{ :tool_name => tool_name } %> <% FastGettext.with_locale FastGettext.default_locale do %> @@ -19,6 +19,6 @@ <%= _('The %{tool_name} team') %{:tool_name => tool_name} %>- <%= _('Please do not reply to this email.') %> <%= raw(_('If you have any questions or need help, please contact us at %{helpdesk_email} or visit %{contact_us_url}') %{ :helpdesk_email => mail_to(helpdesk_email, helpdesk_email, subject: email_subject), :contact_us_url => link_to(contact_us_url, contact_us_url) }) %> + <%= _('Please do not reply to this email.') %> <%= raw(_('If you have any questions or need help, please contact us at %{helpdesk_email} or visit %{contact_us}') %{ :helpdesk_email => mail_to(helpdesk_email, helpdesk_email, subject: email_subject), :contact_us_url => link_to(contact_us, contact_us) }) %>
<% end %> \ No newline at end of file