From 169386a941c2225de8bf523d0371a80228c08037 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Tue, 22 Mar 2016 14:54:31 +0100 Subject: [PATCH] changed content of en mails --- app/views/mailer/password_change/en.html.erb | 2 +- app/views/mailer/password_reset/en.html.erb | 2 +- app/views/mailer/signup/en.html.erb | 2 +- app/views/mailer/test_ticket/en.html.erb | 2 +- app/views/mailer/ticket_create/en.html.erb | 2 +- app/views/mailer/ticket_escalation/en.html.erb | 2 +- app/views/mailer/ticket_escalation_warning/en.html.erb | 2 +- app/views/mailer/user_device/en.html.erb | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/mailer/password_change/en.html.erb b/app/views/mailer/password_change/en.html.erb index f48793398..81eb723b5 100644 --- a/app/views/mailer/password_change/en.html.erb +++ b/app/views/mailer/password_change/en.html.erb @@ -2,7 +2,7 @@ Your <%= c 'product_name' %> password has been changed

Hi <%= d 'user.firstname' %>,


-

the password for your <%= c 'product_name' %> account <%= d 'user.login' %> has been changed recently.

+

The password for your <%= c 'product_name' %> account <%= d 'user.login' %> has been changed recently.


This activity is not known to you? If not, contact your system administrator.


diff --git a/app/views/mailer/password_reset/en.html.erb b/app/views/mailer/password_reset/en.html.erb index 33dbecf6b..92513020d 100644 --- a/app/views/mailer/password_reset/en.html.erb +++ b/app/views/mailer/password_reset/en.html.erb @@ -10,6 +10,6 @@ Reset your <%= c 'product_name' %> password

This link takes you to a page where you can change your password.


-

If you don't want to reset your password, please ignore this message. Your password will not be reset.

+

If you don't want to reset your password, please ignore this message. Your password will not be reseted.


Your <%= c 'product_name' %> Team

diff --git a/app/views/mailer/signup/en.html.erb b/app/views/mailer/signup/en.html.erb index f0818eb3a..9d0ee059e 100644 --- a/app/views/mailer/signup/en.html.erb +++ b/app/views/mailer/signup/en.html.erb @@ -2,7 +2,7 @@ Confirm your <%= c 'product_name' %> account, <%= d 'user.firstname' %> <%= d 'u

Hi <%= d 'user.firstname' %>,


-

confirm your email address to complete your <%= c 'product_name' %> account. It's easy, just click the link below.

+

Confirm your email address to complete your <%= c 'product_name' %> account. It's easy, just click the link below.


<%= c 'http_type' %>://<%= c 'fqdn' %>/#email_verify/<%= d 'token.name' %>


diff --git a/app/views/mailer/test_ticket/en.html.erb b/app/views/mailer/test_ticket/en.html.erb index b3443445d..4b6db281e 100644 --- a/app/views/mailer/test_ticket/en.html.erb +++ b/app/views/mailer/test_ticket/en.html.erb @@ -2,7 +2,7 @@ Test Ticket!

Dear <%= d 'agent.firstname' %>,


-

this is a Test Ticket. I'm a customer and I need some help! :)

+

This is a test ticket. I'm a customer and I need some help! :)


<%= d 'customer.fullname' %>


diff --git a/app/views/mailer/ticket_create/en.html.erb b/app/views/mailer/ticket_create/en.html.erb index 76f663000..06cb4bb28 100644 --- a/app/views/mailer/ticket_create/en.html.erb +++ b/app/views/mailer/ticket_create/en.html.erb @@ -2,7 +2,7 @@ New Ticket (<%= d 'ticket.title' %>)

Hi <%= d 'recipient.firstname' %>,


-

a new Ticket (<%= d 'ticket.title' %>) has been created by "<%= d 'ticket.updated_by.longname' %>".

+

A new ticket (<%= d 'ticket.title' %>) has been created by "<%= d 'ticket.updated_by.longname' %>".


<%= t 'Group' %>: <%= d 'ticket.group.name' %>
diff --git a/app/views/mailer/ticket_escalation/en.html.erb b/app/views/mailer/ticket_escalation/en.html.erb index ac382fdf7..017472a7e 100644 --- a/app/views/mailer/ticket_escalation/en.html.erb +++ b/app/views/mailer/ticket_escalation/en.html.erb @@ -2,7 +2,7 @@ Ticket is escalated (<%= d 'ticket.title' %>)

Hi <%= d 'recipient.firstname' %>,


-

Ticket (<%= d 'ticket.title' %>) from "<%= d 'ticket.customer.longname' %>" is escalated since "<%= d 'ticket.escalation_time' %>"!

+

A ticket (<%= d 'ticket.title' %>) from "<%= d 'ticket.customer.longname' %>" is escalated since "<%= d 'ticket.escalation_time' %>"!


<% if @objects[:article] %>

diff --git a/app/views/mailer/ticket_escalation_warning/en.html.erb b/app/views/mailer/ticket_escalation_warning/en.html.erb index 7914b6fa1..d376e0c20 100644 --- a/app/views/mailer/ticket_escalation_warning/en.html.erb +++ b/app/views/mailer/ticket_escalation_warning/en.html.erb @@ -2,7 +2,7 @@ Ticket will escalated (<%= d 'ticket.title' %>)

Hi <%= d 'recipient.firstname' %>,


-

Ticket (<%= d 'ticket.title' %>) from "<%= d 'ticket.customer.longname' %>" will escalated at "<%= d 'ticket.escalation_time' %>"!

+

a ticket (<%= d 'ticket.title' %>) from "<%= d 'ticket.customer.longname' %>" will escalate at "<%= d 'ticket.escalation_time' %>"!


<% if @objects[:article] %>

diff --git a/app/views/mailer/user_device/en.html.erb b/app/views/mailer/user_device/en.html.erb index 57a33213b..6733edf7a 100644 --- a/app/views/mailer/user_device/en.html.erb +++ b/app/views/mailer/user_device/en.html.erb @@ -2,10 +2,10 @@

Hi <%= d 'user.firstname' %>,


-

it looks like you signed into your <%= c 'product_name' %> account using a new device on "<%= d 'user_device.created_at' %>":

+

It looks like you signed into your <%= c 'product_name' %> account using a new device on "<%= d 'user_device.created_at' %>":


-Your Location: <%= d 'user_device.location' %>
+Your location: <%= d 'user_device.location' %>
Your IP: <%= d 'user_device.ip' %>