From 6010ecd34e3e95cd109dd2f09f8346a402ede6b2 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 5 Aug 2015 15:50:51 -0500 Subject: [PATCH 1/6] Minor - Code conventions - refs BT#9896 #TMI --- main/inc/lib/sessionmanager.lib.php | 68 ++++++++++--------- main/inc/lib/usermanager.lib.php | 18 ++--- .../mail/content_registration_platform.tpl | 22 +++--- ...t_subscription_to_session_confirmation.tpl | 19 +++--- .../mail/subject_registration_platform.tpl | 2 +- ...t_subscription_to_session_confirmation.tpl | 2 +- 6 files changed, 64 insertions(+), 67 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index baf3424298..ea5e63d132 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1568,40 +1568,42 @@ class SessionManager // Sending emails only if (is_array($user_list) && count($user_list) > 0) { foreach ($user_list as $user_id) { - if (!in_array($user_id, $existingUsers)) { - $tplSubject = new Template(null, false, false, false, false, false); - $tplSubject->assign('mailSiteName', api_get_setting('siteName')); - $layoutSubject = $tplSubject->get_template('mail/subject_subscription_to_session_confirmation.tpl'); - $subject = $tplSubject->fetch($layoutSubject); - - $user_info = api_get_user_info($user_id); - - $tplContent = new Template(null, false, false, false, false, false); - // Variables for default template - $tplContent->assign('mailCompleteName', stripslashes($user_info['complete_name'])); - $tplContent->assign('mailSessionName', $session_name); - $tplContent->assign('mailSiteName', api_get_setting('siteName')); - $tplContent->assign('mailWebPath', api_get_path(WEB_PATH)); - $tplContent->assign('mailAdministratorName', api_get_setting('administratorName')); - $tplContent->assign('mailAdministratorSurname', api_get_setting('administratorSurname')); - $tplContent->assign('mailAdministratorTelephone', api_get_setting('administratorTelephone')); - $tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator')); - $layoutContent = $tplContent->get_template('mail/content_subscription_to_session_confirmation.tpl'); - $content = $tplContent->fetch($layoutContent); - - MessageManager::send_message( - $user_id, - $subject, - $content, - array(), - array(), - null, - null, - null, - null, - null - ); + if (in_array($user_id, $existingUsers)) { + continue; } + + $tplSubject = new Template(null, false, false, false, false, false); + $layoutSubject = $tplSubject->get_template( + 'mail/subject_subscription_to_session_confirmation.tpl' + ); + $subject = $tplSubject->fetch($layoutSubject); + + $user_info = api_get_user_info($user_id); + + $tplContent = new Template(null, false, false, false, false, false); + // Variables for default template + $tplContent->assign( + 'complete_name', + stripslashes($user_info['complete_name']) + ); + $tplContent->assign('session_name', $session_name); + $layoutContent = $tplContent->get_template( + 'mail/content_subscription_to_session_confirmation.tpl' + ); + $content = $tplContent->fetch($layoutContent); + + MessageManager::send_message( + $user_id, + $subject, + $content, + array(), + array(), + null, + null, + null, + null, + null + ); } } } diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 629f4c51eb..178b3882e3 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -364,8 +364,9 @@ class UserManager if (!empty($email) && $send_mail) { $recipient_name = api_get_person_name($firstName, $lastName, null, PERSON_NAME_EMAIL_ADDRESS); $tplSubject = new Template(null, false, false, false, false, false); - $tplSubject->assign('mailSiteName', api_get_setting('siteName')); - $layoutSubject = $tplSubject->get_template('mail/subject_registration_platform.tpl'); + $layoutSubject = $tplSubject->get_template( + 'mail/subject_registration_platform.tpl' + ); $emailSubject = $tplSubject->fetch($layoutSubject); $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); $email_admin = api_get_setting('emailAdministrator'); @@ -380,17 +381,10 @@ class UserManager } $tplContent = new Template(null, false, false, false, false, false); // variables for the default template - $tplContent->assign('mailCompleteName', stripslashes(api_get_person_name($firstName, $lastName))); - $tplContent->assign('mailSiteName', api_get_setting('siteName')); - $tplContent->assign('mailLoginName', $loginName); - $tplContent->assign('mailOriginalPassword', stripslashes($original_password)); + $tplContent->assign('complete_name', stripslashes(api_get_person_name($firstName, $lastName))); + $tplContent->assign('login_name', $loginName); + $tplContent->assign('original_password', stripslashes($original_password)); $tplContent->assign('mailWebPath', $url); - $tplContent->assign('mailAdministratorName', api_get_setting('administratorName')); - $tplContent->assign('mailAdministratorSurname', api_get_setting('administratorSurname')); - $tplContent->assign('mailAdministratorTelephone', api_get_setting('administratorTelephone')); - $tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator')); - // variables for others templates - $tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator')); $layoutContent = $tplContent->get_template('mail/content_registration_platform.tpl'); $emailBody = $tplContent->fetch($layoutContent); diff --git a/main/template/default/mail/content_registration_platform.tpl b/main/template/default/mail/content_registration_platform.tpl index 41424b5538..23ecfab7bb 100644 --- a/main/template/default/mail/content_registration_platform.tpl +++ b/main/template/default/mail/content_registration_platform.tpl @@ -1,14 +1,14 @@ -{{ 'Dear' | get_lang}} {{ mailCompleteName }}, +{{ 'Dear'|get_lang }} {{ complete_name }},
-{{ 'YouAreReg' | get_lang }} {{ mailSiteName }} {{ 'WithTheFollowingSettings' | get_lang }}
-{{ 'Username' | get_lang }} : {{ mailLoginName }} -{{ 'Pass' | get_lang }} : {{ mailOriginalPassword }} +{{ 'YouAreReg'|get_lang }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|get_lang }}
+{{ 'Username'|get_lang }} : {{ login_name }} +{{ 'Pass'|get_lang }} : {{ original_password }}

-{{ 'Address' | get_lang}} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}
-{{ 'Problem' | get_lang}}
-{{ 'SignatureFormula' | get_lang }}
-{{ mailAdministratorName }}, {{ mailAdministratorSurname }} -{{ 'Manager' | get_lang }} {{ mailSiteName }} -T. {{ mailAdministratorTelephone}} +{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ mailWebPath }}
+{{ 'Problem'|get_lang }}
+{{ 'SignatureFormula'|get_lang }}
+{{ _admin.name }}, {{ _admin.surname }} +{{ 'Manager'|get_lang }} {{ _s.site_name }} +T. {{ _admin.telephone}}
-{{ 'Email' | get_lang }} : {{ emailAdministrator }} \ No newline at end of file +{{ 'Email'|get_lang }} : {{ _admin.email }} diff --git a/main/template/default/mail/content_subscription_to_session_confirmation.tpl b/main/template/default/mail/content_subscription_to_session_confirmation.tpl index 7726b1e1b2..069480b2d2 100644 --- a/main/template/default/mail/content_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/content_subscription_to_session_confirmation.tpl @@ -1,12 +1,13 @@ -{{ 'Dear' | get_lang}} {{ mailCompleteName }}, +{{ 'Dear'|get_lang }} {{ complete_name }},
-{{ 'YouAreRegisterToSessionX' | get_lang | format(mailSessionName)}} +{{ 'YouAreRegisterToSessionX'|get_lang|format(session_name) }}
-{{ 'Address' | get_lang }} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}
-{{ 'Problem' | get_lang}}
-{{ 'SignatureFormula' | get_lang }}
-{{ mailAdministratorName }} {{ mailAdministratorSurname }} -{{ 'Manager' | get_lang }} {{ mailSiteName }} -T. {{ mailAdministratorTelephone}} +{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}
-{{ 'Email' | get_lang }} : {{ emailAdministrator }} \ No newline at end of file +{{ 'Problem'|get_lang}}
+{{ 'SignatureFormula'|get_lang }}
+{{ _admin.name }} {{ _admin.surname }} +{{ 'Manager'|get_lang }} {{ _s.site_name }} +T. {{ _admin.telephone }} +
+{{ 'Email'|get_lang }} : {{ _admin.email }} diff --git a/main/template/default/mail/subject_registration_platform.tpl b/main/template/default/mail/subject_registration_platform.tpl index 46a6fc426c..6cb4d82c62 100644 --- a/main/template/default/mail/subject_registration_platform.tpl +++ b/main/template/default/mail/subject_registration_platform.tpl @@ -1 +1 @@ -{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}} \ No newline at end of file +{{ _s.site_name ~ 'YourReg'|get_lang ~ _s.site_name }} diff --git a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl index 46a6fc426c..74e691c734 100644 --- a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl @@ -1 +1 @@ -{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}} \ No newline at end of file +{{ _s.site_name ~ 'YoureReg'|get_lang ~ _s.site_name }} From 5f231873215312eaf430caa980f1aaeb2d6a58bb Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 5 Aug 2015 16:58:16 -0500 Subject: [PATCH 2/6] Add option to send email when a user being subscribed - refs BT#9896 #TMI --- .../Schema/V110/Version20150805161000.php | 41 +++++++++++++++++++ main/inc/lib/sessionmanager.lib.php | 24 +++++++++-- main/session/session_add.php | 5 ++- main/session/session_edit.php | 6 ++- src/Chamilo/CoreBundle/Entity/Session.php | 6 +++ 5 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 app/Migrations/Schema/V110/Version20150805161000.php diff --git a/app/Migrations/Schema/V110/Version20150805161000.php b/app/Migrations/Schema/V110/Version20150805161000.php new file mode 100644 index 0000000000..840a6f427a --- /dev/null +++ b/app/Migrations/Schema/V110/Version20150805161000.php @@ -0,0 +1,41 @@ +getTable('session'); + + $sessionTable->addColumn( + 'send_subscription_notification', + \Doctrine\DBAL\Types\Type::BOOLEAN, + ['default' => false] + ); + } + + /** + * @param Schema $schema + */ + public function down(Schema $schema) + { + $sessionTable = $schema->getTable('session'); + $sessionTable->dropColumn('send_subscription_notification'); + } + +} diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index ea5e63d132..acad80ff3e 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -63,6 +63,8 @@ class SessionManager * @param int $showDescription Optional. Whether show the session description * @param array $extraFields * @param int $sessionAdminId Optional. If this sessions was created by a session admin, assign it to him + * @param boolean $sendSubscritionNotification Optional. + * Whether send a mail notification to users being subscribed * @todo use an array to replace all this parameters or use the model.lib.php ... * @return mixed Session ID on success, error message otherwise * */ @@ -82,7 +84,8 @@ class SessionManager $description = null, $showDescription = 0, $extraFields = array(), - $sessionAdminId = 0 + $sessionAdminId = 0, + $sendSubscritionNotification = false ) { global $_configuration; @@ -154,7 +157,8 @@ class SessionManager 'session_admin_id' => $sessionAdminId, 'visibility' => $visibility, 'description' => $description, - 'show_description' => intval($showDescription) + 'show_description' => intval($showDescription), + 'send_subscription_notification' => $sendSubscritionNotification ); if (!empty($startDate)) { @@ -1312,6 +1316,8 @@ class SessionManager * @param int $duration * @param array $extraFields * @param int $sessionAdminId + * @param boolean $sendSubscritionNotification Optional. + * Whether send a mail notification to users being subscribed * @return mixed */ public static function edit_session( @@ -1330,7 +1336,8 @@ class SessionManager $showDescription = 0, $duration = null, $extraFields = array(), - $sessionAdminId = 0 + $sessionAdminId = 0, + $sendSubscritionNotification = false ) { $name = trim(stripslashes($name)); $coachId = intval($coachId); @@ -1373,7 +1380,8 @@ class SessionManager 'id_coach' => $coachId, 'description'=> $description, 'show_description' => intval($showDescription), - 'visibility' => $visibility + 'visibility' => $visibility, + 'send_subscription_notification' => $sendSubscritionNotification ]; if (!empty($sessionAdminId)) { @@ -6582,6 +6590,14 @@ class SessionManager $form->addElement('html', ''); + $form->addCheckBox( + 'send_subscription_notification', + [ + get_lang('SendSubscriptionNotification'), + get_lang('SendAnEmailWhenAUserBeingSubscribed') + ] + ); + // Extra fields $extra_field = new ExtraField('session'); $extra = $extra_field->addElements($form, $sessionId); diff --git a/main/session/session_add.php b/main/session/session_add.php index 3a9694b9dd..00fc2fd8fe 100644 --- a/main/session/session_add.php +++ b/main/session/session_add.php @@ -173,6 +173,7 @@ if ($form->validate()) { $duration = isset($params['duration']) ? $params['duration'] : null; $description = $params['description']; $showDescription = isset($params['show_description']) ? 1: 0; + $sendSubscritionNotification = isset($params['send_subscription_notification']); $extraFields = array(); foreach ($params as $key => $value) { @@ -196,7 +197,9 @@ if ($form->validate()) { $duration, $description, $showDescription, - $extraFields + $extraFields, + null, + $sendSubscritionNotification ); if ($return == strval(intval($return))) { diff --git a/main/session/session_edit.php b/main/session/session_edit.php index 3cbeeb6b88..90adbd0cc6 100644 --- a/main/session/session_edit.php +++ b/main/session/session_edit.php @@ -98,7 +98,6 @@ $(function() { $form->addButtonUpdate(get_lang('ModifyThisSession')); - $formDefaults = $sessionInfo; $formDefaults['coach_username'] = $sessionInfo['id_coach']; @@ -129,6 +128,7 @@ if ($form->validate()) { $duration = isset($params['duration']) ? $params['duration'] : null; $description = $params['description']; $showDescription = isset($params['show_description']) ? 1: 0; + $sendSubscritionNotification = isset($params['send_subscription_notification']); $extraFields = array(); foreach ($params as $key => $value) { @@ -152,7 +152,9 @@ if ($form->validate()) { $description, $showDescription, $duration, - $extraFields + $extraFields, + null, + $sendSubscritionNotification ); if ($return == strval(intval($return))) { diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php index 6f6a672475..fab1760de8 100644 --- a/src/Chamilo/CoreBundle/Entity/Session.php +++ b/src/Chamilo/CoreBundle/Entity/Session.php @@ -196,6 +196,12 @@ class Session **/ protected $currentCourse; + /** + * @var boolean + * @ORM\Column(name="send_subscription_notification", type="boolean", nullable=false, options={"default":false}) + */ + private $sendSubscriptionNotification; + /** * Constructor */ From 726638cb2fefdff25b15eaae9bf91740d484432c Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 5 Aug 2015 17:22:53 -0500 Subject: [PATCH 3/6] Add session coach to tpl variable for mail when user is subscribed - refs BT#9896 #TMI --- main/inc/lib/sessionmanager.lib.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index acad80ff3e..35a495636b 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1,3 +1,4 @@ + find('ChamiloCoreBundle:Session', $id_session); // from function parameter if (empty($session_visibility)) { - $session_visibility = $session_info['visibility']; //loaded from DB + $session_visibility = $session->getVisibility(); //default status loaded if empty if (empty($session_visibility)) $session_visibility = SESSION_VISIBLE_READ_ONLY; // by default readonly 1 @@ -1594,7 +1595,11 @@ class SessionManager 'complete_name', stripslashes($user_info['complete_name']) ); - $tplContent->assign('session_name', $session_name); + $tplContent->assign('session_name', $session->getName()); + $tplContent->assign( + 'session_coach', + $session->getGeneralCoach()->getCompleteName() + ); $layoutContent = $tplContent->get_template( 'mail/content_subscription_to_session_confirmation.tpl' ); From 2bedf1af14261f92d805cea218281b4297743218 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Thu, 6 Aug 2015 09:18:40 -0500 Subject: [PATCH 4/6] Send email when user has been subscribed - refs BT#9896 #TMI --- main/inc/lib/sessionmanager.lib.php | 89 +++++++++++------------ main/session/session_user_import.php | 5 +- main/webservices/registration.soap.php | 1 - src/Chamilo/CoreBundle/Entity/Session.php | 22 ++++++ 4 files changed, 67 insertions(+), 50 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 35a495636b..310bb7e6bc 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1517,15 +1517,13 @@ class SessionManager * @param array $user_list * @param int $session_visibility * @param bool $empty_users - * @param bool $send_email * @return bool */ public static function suscribe_users_to_session( $id_session, $user_list, $session_visibility = SESSION_VISIBLE_READ_ONLY, - $empty_users = true, - $send_email = false + $empty_users = true ) { if ($id_session != strval(intval($id_session))) { return false; @@ -1573,51 +1571,52 @@ class SessionManager $course_list[] = $row['c_id']; } - if ($send_email) { + if ( + $session->getSendSubscriptionNotification() && + is_array($user_list) + ) { // Sending emails only - if (is_array($user_list) && count($user_list) > 0) { - foreach ($user_list as $user_id) { - if (in_array($user_id, $existingUsers)) { - continue; - } + foreach ($user_list as $user_id) { + if (in_array($user_id, $existingUsers)) { + continue; + } - $tplSubject = new Template(null, false, false, false, false, false); - $layoutSubject = $tplSubject->get_template( - 'mail/subject_subscription_to_session_confirmation.tpl' - ); - $subject = $tplSubject->fetch($layoutSubject); + $tplSubject = new Template(null, false, false, false, false, false); + $layoutSubject = $tplSubject->get_template( + 'mail/subject_subscription_to_session_confirmation.tpl' + ); + $subject = $tplSubject->fetch($layoutSubject); - $user_info = api_get_user_info($user_id); + $user_info = api_get_user_info($user_id); - $tplContent = new Template(null, false, false, false, false, false); - // Variables for default template - $tplContent->assign( - 'complete_name', - stripslashes($user_info['complete_name']) - ); - $tplContent->assign('session_name', $session->getName()); - $tplContent->assign( - 'session_coach', - $session->getGeneralCoach()->getCompleteName() - ); - $layoutContent = $tplContent->get_template( - 'mail/content_subscription_to_session_confirmation.tpl' - ); - $content = $tplContent->fetch($layoutContent); - - MessageManager::send_message( - $user_id, - $subject, - $content, - array(), - array(), - null, - null, - null, - null, - null - ); - } + $tplContent = new Template(null, false, false, false, false, false); + // Variables for default template + $tplContent->assign( + 'complete_name', + stripslashes($user_info['complete_name']) + ); + $tplContent->assign('session_name', $session->getName()); + $tplContent->assign( + 'session_coach', + $session->getGeneralCoach()->getCompleteName() + ); + $layoutContent = $tplContent->get_template( + 'mail/content_subscription_to_session_confirmation.tpl' + ); + $content = $tplContent->fetch($layoutContent); + + MessageManager::send_message( + $user_id, + $subject, + $content, + array(), + array(), + null, + null, + null, + null, + null + ); } } @@ -3689,7 +3688,7 @@ class SessionManager } $users = null; //Subscribing in read only mode - self::suscribe_users_to_session($sid, $short_users, SESSION_VISIBLE_READ_ONLY, true, false); + self::suscribe_users_to_session($sid, $short_users, SESSION_VISIBLE_READ_ONLY, true); $short_users = null; } return $sid; diff --git a/main/session/session_user_import.php b/main/session/session_user_import.php index d8bbf56b49..cb628e8954 100644 --- a/main/session/session_user_import.php +++ b/main/session/session_user_import.php @@ -31,7 +31,6 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { !empty($_FILES['import_file']['tmp_name']) ) { $form_sent = $_POST['formSent']; - $send_mail = $_POST['sendMail'] ? 1 : 0; // CSV $users = Import::csvToArray($_FILES['import_file']['tmp_name']); @@ -49,8 +48,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { $session_id, $user_list, null, - false, - $send_mail + false ); foreach ($user_list as & $user_id) { $user_info = api_get_user_info($user_id); @@ -85,7 +83,6 @@ $form = new FormValidator( ); $form->addElement('hidden', 'formSent', 1); $form->addElement('file', 'import_file', get_lang('ImportCSVFileLocation')); -$form->addElement('checkbox', 'sendMail', null, get_lang('SendMailToUsers')); $form->addButtonImport(get_lang('Import')); $form->display(); diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index d4741b7559..3c2be8daaa 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -4915,7 +4915,6 @@ function WSSubscribeUserToSessionSimple($params) { $session_id, array($user_id), SESSION_VISIBLE_READ_ONLY, - false, false ); if ($debug) error_log('User registered to the course: '.$session_id); diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php index fab1760de8..70e74019dd 100644 --- a/src/Chamilo/CoreBundle/Entity/Session.php +++ b/src/Chamilo/CoreBundle/Entity/Session.php @@ -965,4 +965,26 @@ class Session } return $this; } + + /** + * Set $sendSubscriptionNotification + * @param boolean $sendNotification + * @return \Chamilo\CoreBundle\Entity\Session + */ + public function setSendSubscriptionNotification($sendNotification) + { + $this->sendSubscriptionNotification = $sendNotification; + + return $this; + } + + /** + * Get $sendSubscriptionNotification + * @return boolean + */ + public function getSendSubscriptionNotification() + { + return $this->sendSubscriptionNotification; + } + } From 8715093869550209fb6e6fc15986cba6ea9b90df Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Thu, 6 Aug 2015 09:29:06 -0500 Subject: [PATCH 5/6] Fix mail tpl - refs BT#9896 #TMI --- .../default/mail/content_registration_platform.tpl | 5 ++--- .../mail/content_subscription_to_session_confirmation.tpl | 7 +++---- .../default/mail/subject_registration_platform.tpl | 2 +- .../mail/subject_subscription_to_session_confirmation.tpl | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/main/template/default/mail/content_registration_platform.tpl b/main/template/default/mail/content_registration_platform.tpl index 23ecfab7bb..6fed51e59f 100644 --- a/main/template/default/mail/content_registration_platform.tpl +++ b/main/template/default/mail/content_registration_platform.tpl @@ -9,6 +9,5 @@ {{ 'SignatureFormula'|get_lang }}
{{ _admin.name }}, {{ _admin.surname }} {{ 'Manager'|get_lang }} {{ _s.site_name }} -T. {{ _admin.telephone}} -
-{{ 'Email'|get_lang }} : {{ _admin.email }} +{{ _admin.telephone ? 'T. ' ~ _admin.telephone ~ '
' }} +{{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }} diff --git a/main/template/default/mail/content_subscription_to_session_confirmation.tpl b/main/template/default/mail/content_subscription_to_session_confirmation.tpl index 069480b2d2..8a5f12e8a9 100644 --- a/main/template/default/mail/content_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/content_subscription_to_session_confirmation.tpl @@ -4,10 +4,9 @@
{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}
-{{ 'Problem'|get_lang}}
+{{ 'Problem'|get_lang }}
{{ 'SignatureFormula'|get_lang }}
{{ _admin.name }} {{ _admin.surname }} {{ 'Manager'|get_lang }} {{ _s.site_name }} -T. {{ _admin.telephone }} -
-{{ 'Email'|get_lang }} : {{ _admin.email }} +{{ _admin.telephone ? 'T. ' ~ _admin.telephone ~ '
' }} +{{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }} diff --git a/main/template/default/mail/subject_registration_platform.tpl b/main/template/default/mail/subject_registration_platform.tpl index 6cb4d82c62..954962fdb1 100644 --- a/main/template/default/mail/subject_registration_platform.tpl +++ b/main/template/default/mail/subject_registration_platform.tpl @@ -1 +1 @@ -{{ _s.site_name ~ 'YourReg'|get_lang ~ _s.site_name }} +{{ '[' ~ _s.site_name ~ '] ' ~ 'YourReg'|get_lang ~ ' ' ~ _s.site_name }} diff --git a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl index 74e691c734..954962fdb1 100644 --- a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl @@ -1 +1 @@ -{{ _s.site_name ~ 'YoureReg'|get_lang ~ _s.site_name }} +{{ '[' ~ _s.site_name ~ '] ' ~ 'YourReg'|get_lang ~ ' ' ~ _s.site_name }} From 094badc4bba1d4b352e5b188dca183788ca744e2 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Thu, 6 Aug 2015 12:03:22 -0500 Subject: [PATCH 6/6] Minor - Update language files - refs BT#9896 #TMI --- main/lang/english/trad4all.inc.php | 4 ++++ main/lang/spanish/trad4all.inc.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index 8e81daa70d..f9462d5aea 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -7463,4 +7463,8 @@ You can check your performance over the course in the My Progress section. Best Regards, %s Team"; +$GenerateDefaultContent = "Generate default content"; +$ThanksForYourSubscription = "Thanks for your subscription"; +$XTeam = "%s team."; +$YouCanStartSubscribingToCoursesEnteringToXUrl = "You can start subscribing to courses entering to %s"; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index b891129707..cbe457aa2e 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -7483,4 +7483,8 @@ Puedes ver tu rendimiento a lo largo del curso en la sección Mi Avance. Saludos cordiales, El equipo de %s"; +$GenerateDefaultContent = "Generar contenido por defecto"; +$ThanksForYourSubscription = "¡Gracias por su suscripción!"; +$XTeam = "El equipo de %s"; +$YouCanStartSubscribingToCoursesEnteringToXUrl = "Puede empezar a suscribirse a los cursos ingresando a %s"; ?> \ No newline at end of file