From 05592b05c431a550a77992f831e2536965b76226 Mon Sep 17 00:00:00 2001 From: Sergey Zheleznov Date: Mon, 1 Apr 2013 18:47:57 +0300 Subject: [PATCH] Email notifications: grammatically and stylistically revised English version --- .../notify/english/notify.blog_invite_new.tpl | 10 ++++++---- .../synio/notify/english/notify.comment_new.tpl | 15 +++++++++------ .../synio/notify/english/notify.comment_reply.tpl | 12 ++++++++---- .../skin/synio/notify/english/notify.invite.tpl | 10 ++++++---- .../synio/notify/english/notify.reactivation.tpl | 8 +++++--- .../synio/notify/english/notify.registration.tpl | 8 +++++--- .../english/notify.registration_activate.tpl | 10 ++++++---- .../synio/notify/english/notify.reminder_code.tpl | 6 ++++-- .../notify/english/notify.reminder_password.tpl | 4 +++- .../notify/english/notify.talk_comment_new.tpl | 10 ++++++---- .../skin/synio/notify/english/notify.talk_new.tpl | 8 ++++---- .../synio/notify/english/notify.topic_new.tpl | 6 ++++-- .../english/notify.user_changemail_from.tpl | 6 ++++-- .../notify/english/notify.user_changemail_to.tpl | 7 ++++--- .../notify/english/notify.user_friend_new.tpl | 8 +++++--- .../skin/synio/notify/english/notify.wall.new.tpl | 8 +++++--- .../synio/notify/english/notify.wall.reply.tpl | 10 ++++++---- 17 files changed, 90 insertions(+), 56 deletions(-) diff --git a/templates/skin/synio/notify/english/notify.blog_invite_new.tpl b/templates/skin/synio/notify/english/notify.blog_invite_new.tpl index 734a5ac0..758c7521 100644 --- a/templates/skin/synio/notify/english/notify.blog_invite_new.tpl +++ b/templates/skin/synio/notify/english/notify.blog_invite_new.tpl @@ -1,5 +1,7 @@ -The user «{$oUserFrom->getLogin()}» invites you to join the blog "{$oBlog->getTitle()|escape:'html'}". +{$oUserFrom->getLogin()} invites you to join the blog "{$oBlog->getTitle()|escape:'html'}".

-Have a look at the invitation (Don't forget to register before!) -
-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Have a look at the invitation +

+Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.comment_new.tpl b/templates/skin/synio/notify/english/notify.comment_new.tpl index eb6f22d1..fc56e9a7 100644 --- a/templates/skin/synio/notify/english/notify.comment_new.tpl +++ b/templates/skin/synio/notify/english/notify.comment_new.tpl @@ -1,12 +1,15 @@ -The user {$oUserComment->getLogin()} left a new comment to topic «{$oTopic->getTitle()|escape:'html'}», you can read it by clicking on this link
+{$oUserComment->getLogin()} has left a new comment on the topic «{$oTopic->getTitle()|escape:'html'}». +

{if $oConfig->GetValue('sys.mail.include_comment')} - Message: {$oComment->getText()} -{/if} - +Their comment reads as follows: {$oComment->getText()} +{/if}

+To view the comment and reply to it, follow this link {if $sSubscribeKey}

- Unsubscribe from new comments to this topic + Unsubscribe from new comments on this topic {/if}

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.comment_reply.tpl b/templates/skin/synio/notify/english/notify.comment_reply.tpl index 2d36b849..171b224d 100644 --- a/templates/skin/synio/notify/english/notify.comment_reply.tpl +++ b/templates/skin/synio/notify/english/notify.comment_reply.tpl @@ -1,6 +1,10 @@ -The user {$oUserComment->getLogin()} replied your comment in the topic «{$oTopic->getTitle()|escape:'html'}», you can read it by clicking on this link
+{$oUserComment->getLogin()} has replied to your comment on the topic «{$oTopic->getTitle()|escape:'html'}». +

{if $oConfig->GetValue('sys.mail.include_comment')} - Message: {$oComment->getText()} -{/if} +Their reply reads as follows: {$oComment->getText()} +{/if}

+To view the comment and reply to it, follow this link

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.invite.tpl b/templates/skin/synio/notify/english/notify.invite.tpl index 41484ada..fe9e2b83 100644 --- a/templates/skin/synio/notify/english/notify.invite.tpl +++ b/templates/skin/synio/notify/english/notify.invite.tpl @@ -1,6 +1,8 @@ -The user {$oUserFrom->getLogin()} invited you to register on the site {cfg name='view.name'}
-The invitation code: {$oInvite->getCode()}
-To register you need to enter the invitation code on the main page +{$oUserFrom->getLogin()} has invited you to register at {cfg name='view.name'}
+Your invitation code: {$oInvite->getCode()}
+To register, you need to enter the invitation code into the corresponding field on the main page. Please note, the invitation code is to be entered just once. After you have registered, use your login and password to access the website.

-Best regards, site administration {cfg name='view.name'} +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.reactivation.tpl b/templates/skin/synio/notify/english/notify.reactivation.tpl index 23e32bc4..419ce653 100644 --- a/templates/skin/synio/notify/english/notify.reactivation.tpl +++ b/templates/skin/synio/notify/english/notify.reactivation.tpl @@ -1,7 +1,9 @@ -You have requested re-activation on the site {cfg name='view.name'}
+You have requested re-activation of your account at {cfg name='view.name'}.

-Link to the account activation: +Here is the link, which will activate your account: {router page='registration'}activate/{$oUser->getActivateKey()}/

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.registration.tpl b/templates/skin/synio/notify/english/notify.registration.tpl index cf610d9a..d35cb730 100644 --- a/templates/skin/synio/notify/english/notify.registration.tpl +++ b/templates/skin/synio/notify/english/notify.registration.tpl @@ -1,6 +1,8 @@ -You have been registered on the site {cfg name='view.name'}
-Your credentials:
+You have been successfully registered at {cfg name='view.name'}.

+Your access details are:
br>    login: {$oUser->getLogin()}
   password: {$sPassword}


-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.registration_activate.tpl b/templates/skin/synio/notify/english/notify.registration_activate.tpl index b575240f..28335e9e 100644 --- a/templates/skin/synio/notify/english/notify.registration_activate.tpl +++ b/templates/skin/synio/notify/english/notify.registration_activate.tpl @@ -1,10 +1,12 @@ -You have been registered on the site {cfg name='view.name'}
-Your credentials:
+Thank you for registering at {cfg name='view.name'}!

+Your access details are:
   login: {$oUser->getLogin()}
   password: {$sPassword}

-To complete registration you need to activate your account by clicking this link: +To complete registration, you need to activate your account by clicking the below link: {router page='registration'}activate/{$oUser->getActivateKey()}/

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.reminder_code.tpl b/templates/skin/synio/notify/english/notify.reminder_code.tpl index bd8d3150..95031210 100644 --- a/templates/skin/synio/notify/english/notify.reminder_code.tpl +++ b/templates/skin/synio/notify/english/notify.reminder_code.tpl @@ -1,5 +1,7 @@ -If you want to change your password on the site, {cfg name='view.name'}, then click on the link below: +If you would like to change your password at {cfg name='view.name'}, click on the link below: {router page='login'}reminder/{$oReminder->getCode()}/

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.reminder_password.tpl b/templates/skin/synio/notify/english/notify.reminder_password.tpl index 8e02f8c3..af646338 100644 --- a/templates/skin/synio/notify/english/notify.reminder_password.tpl +++ b/templates/skin/synio/notify/english/notify.reminder_password.tpl @@ -1,4 +1,6 @@ You have a new password: {$sNewPassword}

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.talk_comment_new.tpl b/templates/skin/synio/notify/english/notify.talk_comment_new.tpl index 4442b2bd..2be4a8de 100644 --- a/templates/skin/synio/notify/english/notify.talk_comment_new.tpl +++ b/templates/skin/synio/notify/english/notify.talk_comment_new.tpl @@ -1,8 +1,10 @@ -The user {$oUserFrom->getLogin()} left a new comment to the letter «{$oTalk->getTitle()|escape:'html'}», you can read it by clicking on this link
+{$oUserFrom->getLogin()} has left a new comment to the message«{$oTalk->getTitle()|escape:'html'}».

{if $oConfig->GetValue('sys.mail.include_talk')} - Message: {$oTalkComment->getText()}
+Their comment reads as follows: {$oTalkComment->getText()}
{/if}
-Do not forget to register before! + To view the comment and reply to it, follow this link

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.talk_new.tpl b/templates/skin/synio/notify/english/notify.talk_new.tpl index 902346ea..8fcba132 100644 --- a/templates/skin/synio/notify/english/notify.talk_new.tpl +++ b/templates/skin/synio/notify/english/notify.talk_new.tpl @@ -1,9 +1,9 @@ -You have a new incoming letter from the user {$oUserFrom->getLogin()}, you can read and answer it by clicking on this link
+You have a new incoming message from {$oUserFrom->getLogin()}. You can read and answer it by clicking on this link
Letter topic: {$oTalk->getTitle()|escape:'html'}
{if $oConfig->GetValue('sys.mail.include_talk')} Message: {$oTalk->getText()}
{/if} -
-Don't forget to register before!

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.topic_new.tpl b/templates/skin/synio/notify/english/notify.topic_new.tpl index 7e3c519a..11168640 100644 --- a/templates/skin/synio/notify/english/notify.topic_new.tpl +++ b/templates/skin/synio/notify/english/notify.topic_new.tpl @@ -1,4 +1,6 @@ -The user {$oUserTopic->getLogin()} posted a new topic - {$oTopic->getTitle()|escape:'html'}
in a blog «{$oBlog->getTitle()|escape:'html'}» +The user {$oUserTopic->getLogin()} has posted a new topic - {$oTopic->getTitle()|escape:'html'}
in the blog «{$oBlog->getTitle()|escape:'html'}»

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.user_changemail_from.tpl b/templates/skin/synio/notify/english/notify.user_changemail_from.tpl index e1828415..e36be692 100644 --- a/templates/skin/synio/notify/english/notify.user_changemail_from.tpl +++ b/templates/skin/synio/notify/english/notify.user_changemail_from.tpl @@ -1,4 +1,4 @@ -You have sent a request to change user email {$oUser->getLogin()} on site {cfg name='view.name'}.
+You have sent a request to change user email {$oUser->getLogin()} at {cfg name='view.name'}.

Old email: {$oChangemail->getMailFrom()}
New email: {$oChangemail->getMailTo()}
@@ -8,4 +8,6 @@ To confirm the email change, please click here: {router page='profile'}changemail/confirm-from/{$oChangemail->getCodeFrom()}/

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.user_changemail_to.tpl b/templates/skin/synio/notify/english/notify.user_changemail_to.tpl index a27b8d32..a1536932 100644 --- a/templates/skin/synio/notify/english/notify.user_changemail_to.tpl +++ b/templates/skin/synio/notify/english/notify.user_changemail_to.tpl @@ -1,11 +1,12 @@ -You have sent a request to change user email {$oUser->getLogin()} on site {cfg name='view.name'}.
+You have sent a request to change user email {$oUser->getLogin()} at {cfg name='view.name'}.
Old email: {$oChangemail->getMailFrom()}
New email: {$oChangemail->getMailTo()}
-
To confirm the email change, please click here: {router page='profile'}changemail/confirm-to/{$oChangemail->getCodeTo()}/

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.user_friend_new.tpl b/templates/skin/synio/notify/english/notify.user_friend_new.tpl index 9fb27d2b..d22ed6cf 100644 --- a/templates/skin/synio/notify/english/notify.user_friend_new.tpl +++ b/templates/skin/synio/notify/english/notify.user_friend_new.tpl @@ -1,6 +1,8 @@ The user «{$oUserFrom->getLogin()}» wants to add you to Friends.

{$sText} -See application (Dont forget to register before!) -
-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Reply to the friend request +

+Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.wall.new.tpl b/templates/skin/synio/notify/english/notify.wall.new.tpl index fcf641f2..d3e4bda5 100644 --- a/templates/skin/synio/notify/english/notify.wall.new.tpl +++ b/templates/skin/synio/notify/english/notify.wall.new.tpl @@ -1,6 +1,8 @@ -The user {$oUser->getLogin()} post on your wall
+The user {$oUser->getLogin()} has posted on your wall
-Post: {$oWall->getText()} +Their post reads as follows: {$oWall->getText()}

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/synio/notify/english/notify.wall.reply.tpl b/templates/skin/synio/notify/english/notify.wall.reply.tpl index 63f11d8c..12769ab2 100644 --- a/templates/skin/synio/notify/english/notify.wall.reply.tpl +++ b/templates/skin/synio/notify/english/notify.wall.reply.tpl @@ -1,7 +1,9 @@ -The user {$oUser->getLogin()} replied your post on wall
+The user {$oUser->getLogin()} has replied to your post on the wall
-Your post: {$oWallParent->getText()}

-Reply post: {$oWall->getText()} +Your post was: {$oWallParent->getText()}

+Their reply reads as follows: {$oWall->getText()}

-Best regards, site administration {cfg name='view.name'} \ No newline at end of file +Best regards, +
+{cfg name='view.name'} \ No newline at end of file