Browse Source

Improve lang vars to registration confirmation - refs BT#13479

Angel Fernando Quiroz Campos 7 years ago
parent
commit
fff58a008a
3 changed files with 7 additions and 8 deletions
  1. 1 1
      main/auth/inscription.php
  2. 3 3
      main/inc/lib/template.lib.php
  3. 3 4
      main/inc/lib/usermanager.lib.php

+ 1 - 1
main/auth/inscription.php

@@ -804,7 +804,7 @@ if ($form->validate()) {
                 unset($user_id);
 
                 Display::display_header(get_lang('ConfirmationForNewAccount', null, $values['language']));
-                echo Display::page_header(get_lang('YouNeedToConfirmYourAccountViaMailToAccessPlatform', null, $values['language']));
+                echo Display::page_header(get_lang('YouNeedToConfirmYourAccountViaEmailToAccessPlatform', null, $values['language']));
                 echo $content;
                 Display::display_footer();
                 exit;

+ 3 - 3
main/inc/lib/template.lib.php

@@ -1403,9 +1403,9 @@ class Template
                     $message = get_lang('AccountInactive');
 
                     if (api_get_setting('allow_registration') === 'confirmation') {
-                        $message = sprintf(
-                            get_lang('YourAccountIsInactiveBecauseYouDoesntConfirmItCheckYourEmailAndFollowTheInstructionsOrClickTheFollowingLinkXToReSendTheEmail'),
-                            Display::url(get_lang('ReSendConfirmationMail'), api_get_path(WEB_PATH) . 'main/auth/resend_confirmation_mail.php'));
+                        $message = get_lang('AccountNotConfirmed')
+                            .PHP_EOL
+                            .Display::url(get_lang('ReSendConfirmationMail'), api_get_path(WEB_PATH) . 'main/auth/resend_confirmation_mail.php');
                     }
                     break;
                 case 'user_password_incorrect':

+ 3 - 4
main/inc/lib/usermanager.lib.php

@@ -5738,10 +5738,9 @@ SQL;
 
         $url = api_get_path(WEB_CODE_PATH).'auth/user_mail_confirmation.php?token='.$uniqueId;
         $mailSubject = get_lang('RegistrationConfirmation');
-        $mailBody = sprintf(
-            get_lang('ToCompleteYourPlatformRegistrationYouNeedToConfirmYourAccountByClickingTheFollowingLinkX'),
-            $url
-        );
+        $mailBody = get_lang('RegistrationConfirmationEmailMessage')
+            .PHP_EOL
+            .Display::url($url, $url);
 
         api_mail_html(
             $user->getCompleteName(),