diff --git a/application/classes/Controller/Subscription.php b/application/classes/Controller/Subscription.php index d948b3a..37ce6e7 100644 --- a/application/classes/Controller/Subscription.php +++ b/application/classes/Controller/Subscription.php @@ -99,9 +99,9 @@ class Controller_Subscription extends Controller_Layout { $instant = ORM::factory('Instant'); $instant->subscription_id = $id; $instant->subject = __('You were subscribed to ').$subscription->title; - $instant->text = $subscription->welcome; - $instant->create(); - $instant->send($model->email); + $instant->text = __('From now on you will receive letters from this subscription.'); + $instant->send($model->email, $model->token); + // instant is not saved because it's just a welcome email } else { diff --git a/application/classes/Model/Subscription.php b/application/classes/Model/Subscription.php index da35b1c..7c6da57 100644 --- a/application/classes/Model/Subscription.php +++ b/application/classes/Model/Subscription.php @@ -47,7 +47,6 @@ class Model_Subscription extends ORM { protected $_labels = array( 'title' => 'Title', 'price' => 'Subscription price', - 'welcome' => 'Welcome message', 'description' => 'Description (for the clients)' ); diff --git a/application/i18n/ru.php b/application/i18n/ru.php index e48ecb6..ec6a201 100644 --- a/application/i18n/ru.php +++ b/application/i18n/ru.php @@ -65,5 +65,7 @@ return array( 'First letter' => 'Первое письмо', 'Subject' => 'Тема', 'Message body' => 'Тело письма', - 'Subscription code' => 'Код подписки' + 'Subscription code' => 'Код подписки', + 'You were subscribed to ' => 'Вы были подписаны на', + 'From now on you will receive letters from this subscription.' => 'Теперь вы будете получать письма из этой рассылки.' );