From fd8ba7cead9d49fc971a63dd4c6474156e425b3e Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Fri, 4 Jun 2010 19:25:54 +0000 Subject: [PATCH] =?UTF-8?q?fix=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20+=20=D0=B0=D0=BD=D0=B3=D0=BB=D0=B8=D0=B9?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skin/new/notify/english/notify.blog_invite_new.tpl | 5 +++++ .../skin/new/notify/english/notify.comment_new.tpl | 6 ++++++ .../skin/new/notify/english/notify.comment_reply.tpl | 6 ++++++ templates/skin/new/notify/english/notify.invite.tpl | 6 ++++++ .../skin/new/notify/english/notify.registration.tpl | 6 ++++++ .../notify/english/notify.registration_activate.tpl | 10 ++++++++++ .../skin/new/notify/english/notify.reminder_code.tpl | 5 +++++ .../new/notify/english/notify.reminder_password.tpl | 4 ++++ .../new/notify/english/notify.talk_comment_new.tpl | 7 +++++++ templates/skin/new/notify/english/notify.talk_new.tpl | 8 ++++++++ templates/skin/new/notify/english/notify.topic_new.tpl | 4 ++++ .../skin/new/notify/english/notify.user_friend_new.tpl | 6 ++++++ .../skin/new/notify/russian/notify.blog_invite_new.tpl | 2 +- templates/skin/new/notify/russian/notify.invite.tpl | 2 +- .../notify/russian/notify.registration_activate.tpl | 2 +- .../skin/new/notify/russian/notify.user_friend_new.tpl | 2 +- 16 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 templates/skin/new/notify/english/notify.blog_invite_new.tpl create mode 100644 templates/skin/new/notify/english/notify.comment_new.tpl create mode 100644 templates/skin/new/notify/english/notify.comment_reply.tpl create mode 100644 templates/skin/new/notify/english/notify.invite.tpl create mode 100644 templates/skin/new/notify/english/notify.registration.tpl create mode 100644 templates/skin/new/notify/english/notify.registration_activate.tpl create mode 100644 templates/skin/new/notify/english/notify.reminder_code.tpl create mode 100644 templates/skin/new/notify/english/notify.reminder_password.tpl create mode 100644 templates/skin/new/notify/english/notify.talk_comment_new.tpl create mode 100644 templates/skin/new/notify/english/notify.talk_new.tpl create mode 100644 templates/skin/new/notify/english/notify.topic_new.tpl create mode 100644 templates/skin/new/notify/english/notify.user_friend_new.tpl diff --git a/templates/skin/new/notify/english/notify.blog_invite_new.tpl b/templates/skin/new/notify/english/notify.blog_invite_new.tpl new file mode 100644 index 00000000..6896f38c --- /dev/null +++ b/templates/skin/new/notify/english/notify.blog_invite_new.tpl @@ -0,0 +1,5 @@ +The user «{$oUserFrom->getLogin()}» invites you to join the blog "{$oBlog->getTitle()}". +

+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 diff --git a/templates/skin/new/notify/english/notify.comment_new.tpl b/templates/skin/new/notify/english/notify.comment_new.tpl new file mode 100644 index 00000000..260bb6e8 --- /dev/null +++ b/templates/skin/new/notify/english/notify.comment_new.tpl @@ -0,0 +1,6 @@ +The user {$oUserComment->getLogin()} left a new comment to your topic «{$oTopic->getTitle()|escape:'html'}», you can read it by clicking on this link
+{if $oConfig->GetValue('sys.mail.include_comment')} + Message: {$oComment->getText()} +{/if} +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.comment_reply.tpl b/templates/skin/new/notify/english/notify.comment_reply.tpl new file mode 100644 index 00000000..950c3a18 --- /dev/null +++ b/templates/skin/new/notify/english/notify.comment_reply.tpl @@ -0,0 +1,6 @@ +The user {$oUserComment->getLogin()} replied your comment in the topic «{$oTopic->getTitle()|escape:'html'}», you can read it by clicking on this link
+{if $oConfig->GetValue('sys.mail.include_comment')} + Message: {$oComment->getText()} +{/if} +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.invite.tpl b/templates/skin/new/notify/english/notify.invite.tpl new file mode 100644 index 00000000..41484ada --- /dev/null +++ b/templates/skin/new/notify/english/notify.invite.tpl @@ -0,0 +1,6 @@ +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 +

+Best regards, site administration {cfg name='view.name'} + \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.registration.tpl b/templates/skin/new/notify/english/notify.registration.tpl new file mode 100644 index 00000000..cf610d9a --- /dev/null +++ b/templates/skin/new/notify/english/notify.registration.tpl @@ -0,0 +1,6 @@ +You have been registered on the site {cfg name='view.name'}
+Your credentials:
+   login: {$oUser->getLogin()}
+   password: {$sPassword}
+

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.registration_activate.tpl b/templates/skin/new/notify/english/notify.registration_activate.tpl new file mode 100644 index 00000000..b575240f --- /dev/null +++ b/templates/skin/new/notify/english/notify.registration_activate.tpl @@ -0,0 +1,10 @@ +You have been registered on the site {cfg name='view.name'}
+Your credentials:
+   login: {$oUser->getLogin()}
+   password: {$sPassword}
+
+To complete registration you need to activate your account by clicking this link: +{router page='registration'}activate/{$oUser->getActivateKey()}/ + +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.reminder_code.tpl b/templates/skin/new/notify/english/notify.reminder_code.tpl new file mode 100644 index 00000000..bd8d3150 --- /dev/null +++ b/templates/skin/new/notify/english/notify.reminder_code.tpl @@ -0,0 +1,5 @@ +If you want to change your password on the site, {cfg name='view.name'}, then 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 diff --git a/templates/skin/new/notify/english/notify.reminder_password.tpl b/templates/skin/new/notify/english/notify.reminder_password.tpl new file mode 100644 index 00000000..8e02f8c3 --- /dev/null +++ b/templates/skin/new/notify/english/notify.reminder_password.tpl @@ -0,0 +1,4 @@ +You have a new password: {$sNewPassword} + +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.talk_comment_new.tpl b/templates/skin/new/notify/english/notify.talk_comment_new.tpl new file mode 100644 index 00000000..989d9bdf --- /dev/null +++ b/templates/skin/new/notify/english/notify.talk_comment_new.tpl @@ -0,0 +1,7 @@ +The user {$oUserFrom->getLogin()} left a new comment to the letter «{$oTalk->getTitle()|escape:'html'}», you can read it by clicking on this link
+{if $oConfig->GetValue('sys.mail.include_talk')} + Message: {$oTalkComment->getText()}
+{/if} +Do not forget to register before! +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.talk_new.tpl b/templates/skin/new/notify/english/notify.talk_new.tpl new file mode 100644 index 00000000..c1cf9516 --- /dev/null +++ b/templates/skin/new/notify/english/notify.talk_new.tpl @@ -0,0 +1,8 @@ +You have a new incoming letter from the user {$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 diff --git a/templates/skin/new/notify/english/notify.topic_new.tpl b/templates/skin/new/notify/english/notify.topic_new.tpl new file mode 100644 index 00000000..829f2153 --- /dev/null +++ b/templates/skin/new/notify/english/notify.topic_new.tpl @@ -0,0 +1,4 @@ +The user {$oUserTopic->getLogin()} posted a new topic - {$oTopic->getTitle()|escape:'html'}
in a blog «{$oBlog->getTitle()|escape:'html'}» + +

+Best regards, site administration {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/english/notify.user_friend_new.tpl b/templates/skin/new/notify/english/notify.user_friend_new.tpl new file mode 100644 index 00000000..9fb27d2b --- /dev/null +++ b/templates/skin/new/notify/english/notify.user_friend_new.tpl @@ -0,0 +1,6 @@ +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 diff --git a/templates/skin/new/notify/russian/notify.blog_invite_new.tpl b/templates/skin/new/notify/russian/notify.blog_invite_new.tpl index 6030f276..8a2174d0 100644 --- a/templates/skin/new/notify/russian/notify.blog_invite_new.tpl +++ b/templates/skin/new/notify/russian/notify.blog_invite_new.tpl @@ -1,4 +1,4 @@ -Пользователь «{$oUserFrom->getLogin()}» приглашает вас вступить в блог "{$oBlog->getTitle()}". +Пользователь «{$oUserFrom->getLogin()}» приглашает вас вступить в блог "{$oBlog->getTitle()}".

Посмотреть приглашение (Не забудьте предварительно авторизоваться!)
diff --git a/templates/skin/new/notify/russian/notify.invite.tpl b/templates/skin/new/notify/russian/notify.invite.tpl index f3d3860f..88591d77 100644 --- a/templates/skin/new/notify/russian/notify.invite.tpl +++ b/templates/skin/new/notify/russian/notify.invite.tpl @@ -1,4 +1,4 @@ -Пользователь {$oUserFrom->getLogin()} пригласил вас зарегистрироваться на сайте {cfg name='view.name'}
+Пользователь {$oUserFrom->getLogin()} пригласил вас зарегистрироваться на сайте {cfg name='view.name'}
Код приглашения: {$oInvite->getCode()}
Для регистрации вам будет необходимо ввести код приглашения на странице входа

diff --git a/templates/skin/new/notify/russian/notify.registration_activate.tpl b/templates/skin/new/notify/russian/notify.registration_activate.tpl index 86f145f8..d06ad3fc 100644 --- a/templates/skin/new/notify/russian/notify.registration_activate.tpl +++ b/templates/skin/new/notify/russian/notify.registration_activate.tpl @@ -4,7 +4,7 @@    пароль: {$sPassword}

Для завершения регистрации вам необходимо активировать аккаунт пройдя по ссылке: -{cfg name='path.root.web'}/registration/activate/{$oUser->getActivateKey()}/ +{router page='registration'}activate/{$oUser->getActivateKey()}/

С уважением, администрация сайта {cfg name='view.name'} \ No newline at end of file diff --git a/templates/skin/new/notify/russian/notify.user_friend_new.tpl b/templates/skin/new/notify/russian/notify.user_friend_new.tpl index a63f1bfc..7a839cfd 100644 --- a/templates/skin/new/notify/russian/notify.user_friend_new.tpl +++ b/templates/skin/new/notify/russian/notify.user_friend_new.tpl @@ -1,4 +1,4 @@ -Пользователь «{$oUserFrom->getLogin()}» хочет добавить вас в друзья. +Пользователь «{$oUserFrom->getLogin()}» хочет добавить вас в друзья.

{$sText} Посмотреть заявку (Не забудьте предварительно авторизоваться!)