Merge branch 'ofaj' of github.com:chamilo/chamilo-lms into ofaj

main/auth/inscription.php

@@ -1009,12 +1009,11 @@ if ($form->validate()) {
     // last user login date is now
     $user_last_login_datetime = 0; // used as a unix timestamp it will correspond to : 1 1 1970
     Session::write('user_last_login_datetime', $user_last_login_datetime);
-    $recipient_name = api_get_person_name($values['firstname'], $values['lastname']);
     $text_after_registration =
         '<p>'.
         get_lang('Dear', null, $_user['language']).' '.
-        stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
+        stripslashes(Security::remove_XSS($values['firstname'])).',<br /><br />'.
+        get_lang('PersonalSettings',null,$_user['language'])."</p>";
 
     $form_data = array(
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -1038,9 +1037,9 @@ if ($form->validate()) {
         }
     } else {
         if (!empty($values['email'])) {
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
+            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'</p>';
             $diagnosticPath = '<a href="'.api_get_path(WEB_PATH).'search.php">'.get_lang('Diagnostic').'</a>';
-            $text_after_registration.= '<p>'.sprintf(get_lang('WelcomePleaseGoToDiagnosticAtX', null, $_user['language']), $diagnosticPath).'.</p>';
+            $text_after_registration.= '<p>'.sprintf(get_lang('WelcomePleaseGoToDiagnosticAtX', null, $_user['language']), $diagnosticPath).'</p>';
         }
 
         if ($is_allowedCreateCourse) {

main/template/rainbow/mail/content_registration_platform.tpl

@@ -3,7 +3,6 @@
 <p>{{ 'YouRegisteredWithTheFollowingSettings'|get_lang }}</p>
 <p>{{ 'Username'|get_lang }} : {{ login_name }}<br>
     {{ 'Pass'|get_lang }} : {{ original_password }}</p>
-<p>{{ 'ThanksForRegisteringToSite'|get_lang|format(_s.site_name) }}</p>
 <p>{{ 'ForMoreDetailsVisitX' | get_lang | format(search_link) }}</p>
 <p>{{ 'Problem'|get_lang }}</p>
 <p>{{ 'SignatureFormula'|get_lang }}</p>

main/template/rainbow/mail/footer.tpl

@@ -1,7 +1,7 @@
 <table border="0" cellpadding="10" cellspacing="0" width="100%">
     <tr>
         <td style="color: #FFF; background-color: #162A83; border-bottom: 1px solid #162A83; box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.1);">
-            {{ _s.site_name }}
+            PARKUR
         </td>
     </tr>
 </table>