From c56ff19a64b1f8aa01c9f8b90f3756dddfe97db0 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Sun, 26 Apr 2009 16:44:42 +0000 Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20=D1=83=D0=B2=D0=B5=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE=D0=B3=D0=BE=20=D1=8F=D0=B7?= =?UTF-8?q?=D1=8B=D0=BA=D0=B0=20=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B5?= =?UTF-8?q?,=20=D0=BD=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80,=20/notify?= =?UTF-8?q?/russian/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/modules/notify/Notify.class.php | 44 +++++++++---------- templates/language/russian.php | 15 +++++++ .../russian}/notify.comment_new.tpl | 0 .../russian}/notify.comment_reply.tpl | 0 .../{ => notify/russian}/notify.invite.tpl | 0 .../russian}/notify.registration.tpl | 0 .../russian}/notify.registration_activate.tpl | 0 .../russian}/notify.reminder_code.tpl | 0 .../russian}/notify.reminder_password.tpl | 0 .../russian}/notify.talk_comment_new.tpl | 0 .../{ => notify/russian}/notify.talk_new.tpl | 0 .../{ => notify/russian}/notify.topic_new.tpl | 0 .../russian}/notify.user_friend_new.tpl | 0 13 files changed, 37 insertions(+), 22 deletions(-) rename templates/skin/new/{ => notify/russian}/notify.comment_new.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.comment_reply.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.invite.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.registration.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.registration_activate.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.reminder_code.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.reminder_password.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.talk_comment_new.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.talk_new.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.topic_new.tpl (100%) rename templates/skin/new/{ => notify/russian}/notify.user_friend_new.tpl (100%) diff --git a/classes/modules/notify/Notify.class.php b/classes/modules/notify/Notify.class.php index 9f18e3d0..5404091d 100644 --- a/classes/modules/notify/Notify.class.php +++ b/classes/modules/notify/Notify.class.php @@ -61,12 +61,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.comment_new.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.comment_new.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('К вашему топику оставили новый комментарий'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_comment_new')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -97,12 +97,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.comment_reply.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.comment_reply.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('Вам ответили на ваш комментарий'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_comment_reply')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -133,12 +133,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.topic_new.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.topic_new.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('Новый топик в блоге «'.htmlspecialchars($oBlog->getTitle()).'»'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_topic_new').' «'.htmlspecialchars($oBlog->getTitle()).'»'); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -159,12 +159,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.registration_activate.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.registration_activate.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUser->getMail(),$oUser->getLogin()); - $this->Mail_SetSubject('Регистрация'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_registration_activate')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -185,12 +185,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.registration.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.registration.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUser->getMail(),$oUser->getLogin()); - $this->Mail_SetSubject('Регистрация'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_registration')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -213,12 +213,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.invite.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.invite.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($sMailTo); - $this->Mail_SetSubject('Приглашение на регистрацию'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_invite')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -247,12 +247,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.talk_new.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.talk_new.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('У вас новое письмо'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_talk_new')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -275,12 +275,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.talk_comment_new.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.talk_comment_new.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('У вас новый комментарий к письму'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_talk_comment_new')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -301,12 +301,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.user_friend_new.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.user_friend_new.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUserTo->getMail(),$oUserTo->getLogin()); - $this->Mail_SetSubject('Вас добавили в друзья'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_user_friend_new')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -326,12 +326,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.reminder_code.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.reminder_code.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUser->getMail(),$oUser->getLogin()); - $this->Mail_SetSubject('Восстановление пароля'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_reminder_code')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); @@ -351,12 +351,12 @@ class LsNotify extends Module { /** * Формируем шаблон */ - $sBody=$this->oViewerLocal->Fetch("notify.reminder_password.tpl"); + $sBody=$this->oViewerLocal->Fetch('notify/'.$this->Lang_GetLang()."/notify.reminder_password.tpl"); /** * Отправляем мыло */ $this->Mail_SetAdress($oUser->getMail(),$oUser->getLogin()); - $this->Mail_SetSubject('Новый пароль'); + $this->Mail_SetSubject($this->Lang_Get('notify_subject_reminder_password')); $this->Mail_SetBody($sBody); $this->Mail_setHTML(); $this->Mail_Send(); diff --git a/templates/language/russian.php b/templates/language/russian.php index e1550b95..f94a743c 100644 --- a/templates/language/russian.php +++ b/templates/language/russian.php @@ -623,6 +623,21 @@ return array( 'uploadimg_cancel' => 'Отмена_$$', 'uploadimg_title' => 'Описание_$$', + /** + * Уведомления + */ + 'notify_subject_comment_new' => 'К вашему топику оставили новый комментарий_$$', + 'notify_subject_comment_reply' => 'Вам ответили на ваш комментарий_$$', + 'notify_subject_topic_new' => 'Новый топик в блоге_$$', + 'notify_subject_registration_activate' => 'Регистрация_$$', + 'notify_subject_registration' => 'Регистрация_$$', + 'notify_subject_invite' => 'Приглашение на регистрацию_$$', + 'notify_subject_talk_new' => 'У вас новое письмо_$$', + 'notify_subject_talk_comment_new' => 'У вас новый комментарий к письму_$$', + 'notify_subject_user_friend_new' => 'Вас добавили в друзья_$$', + 'notify_subject_reminder_code' => 'Восстановление пароля_$$', + 'notify_subject_reminder_password' => 'Новый пароль_$$', + 'system_error_event_args' => 'Некорректное число аргументов при добавлении евента_$$', 'system_error_event_method' => 'Добавляемый метод евента не найден_$$', diff --git a/templates/skin/new/notify.comment_new.tpl b/templates/skin/new/notify/russian/notify.comment_new.tpl similarity index 100% rename from templates/skin/new/notify.comment_new.tpl rename to templates/skin/new/notify/russian/notify.comment_new.tpl diff --git a/templates/skin/new/notify.comment_reply.tpl b/templates/skin/new/notify/russian/notify.comment_reply.tpl similarity index 100% rename from templates/skin/new/notify.comment_reply.tpl rename to templates/skin/new/notify/russian/notify.comment_reply.tpl diff --git a/templates/skin/new/notify.invite.tpl b/templates/skin/new/notify/russian/notify.invite.tpl similarity index 100% rename from templates/skin/new/notify.invite.tpl rename to templates/skin/new/notify/russian/notify.invite.tpl diff --git a/templates/skin/new/notify.registration.tpl b/templates/skin/new/notify/russian/notify.registration.tpl similarity index 100% rename from templates/skin/new/notify.registration.tpl rename to templates/skin/new/notify/russian/notify.registration.tpl diff --git a/templates/skin/new/notify.registration_activate.tpl b/templates/skin/new/notify/russian/notify.registration_activate.tpl similarity index 100% rename from templates/skin/new/notify.registration_activate.tpl rename to templates/skin/new/notify/russian/notify.registration_activate.tpl diff --git a/templates/skin/new/notify.reminder_code.tpl b/templates/skin/new/notify/russian/notify.reminder_code.tpl similarity index 100% rename from templates/skin/new/notify.reminder_code.tpl rename to templates/skin/new/notify/russian/notify.reminder_code.tpl diff --git a/templates/skin/new/notify.reminder_password.tpl b/templates/skin/new/notify/russian/notify.reminder_password.tpl similarity index 100% rename from templates/skin/new/notify.reminder_password.tpl rename to templates/skin/new/notify/russian/notify.reminder_password.tpl diff --git a/templates/skin/new/notify.talk_comment_new.tpl b/templates/skin/new/notify/russian/notify.talk_comment_new.tpl similarity index 100% rename from templates/skin/new/notify.talk_comment_new.tpl rename to templates/skin/new/notify/russian/notify.talk_comment_new.tpl diff --git a/templates/skin/new/notify.talk_new.tpl b/templates/skin/new/notify/russian/notify.talk_new.tpl similarity index 100% rename from templates/skin/new/notify.talk_new.tpl rename to templates/skin/new/notify/russian/notify.talk_new.tpl diff --git a/templates/skin/new/notify.topic_new.tpl b/templates/skin/new/notify/russian/notify.topic_new.tpl similarity index 100% rename from templates/skin/new/notify.topic_new.tpl rename to templates/skin/new/notify/russian/notify.topic_new.tpl diff --git a/templates/skin/new/notify.user_friend_new.tpl b/templates/skin/new/notify/russian/notify.user_friend_new.tpl similarity index 100% rename from templates/skin/new/notify.user_friend_new.tpl rename to templates/skin/new/notify/russian/notify.user_friend_new.tpl