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

Author: ywarnier

tests/scripts/disable_user_conditions.php

@@ -93,7 +93,7 @@
 
         $language = $disabledUser['locale'];
         $subject = get_lang('Account disabled', $language).': '.$disabledUser['complete_name'];
-        $content = get_lang('DisableUserCase1', $language);
+        $content = get_lang("Hello,<br>You haven't logged into to your account for three months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards.", $language);
 
         $userReportList[$studentId]['message'] .= $newLine.
             'Mail will be send to: '.$disabledUser['username'].' ('.$disabledUser['email'].')'.$newLine.
@@ -153,7 +153,7 @@
 
         $language = $disabledUser['locale'];
         $subject = get_lang('Account disabled', $language).': '.$disabledUser['complete_name'];
-        $content = get_lang('DisableUserCase3Student', $language);
+        $content = get_lang("Hello,<br>You haven't logged into your account for six months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards.", $language);
 
         if (!isset($userReportList[$studentId]['message'])) {
             $userReportList[$studentId]['message'] = '';
@@ -220,7 +220,7 @@
         $userReportList[$studentId]['message'] .= $newLine."User# $studentId (".$disabledUser['username'].") to be disabled. Case 2 . Last connection: $lastDate - 6 months: $date6Months ";
 
         $subject = get_lang('Account disabled', $disabledUser['locale']).': '.$disabledUser['complete_name'];
-        $content = get_lang('DisableUserCase2', $disabledUser['locale']);
+        $content = get_lang("Hello,<br>You haven't logged into your account for six months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards.", $disabledUser['locale']);
 
         $userReportList[$studentId]['message'] .= $newLine.'Mail will be send to: '.$disabledUser['username'].$newLine.'Subject: '.$subject.$newLine.'Content: '.$content.$newLine;
 
@@ -232,7 +232,7 @@
             $bossInfo = api_get_user_info($studentBoss);
             if ($bossInfo) {
                 $subjectBoss = get_lang('Account disabled', $bossInfo['locale']).': '.$disabledUser['complete_name'];
-                $contentBoss = sprintf(get_lang('DisableUserCase2StudentX', $bossInfo['locale']), $disabledUser['complete_name']);
+                $contentBoss = sprintf(get_lang("Hello,<br>%s hasn't logged into PARKUR in the last six months. His account has just been deactivated.<br><br>Sincerely.", $bossInfo['locale']), $disabledUser['complete_name']);
                 $userReportList[$studentId]['message'] .= $newLine.'Mail will be send to: '.$bossInfo['username'].$newLine.'Subject: '.$subjectBoss.$newLine.'Content: '.$contentBoss.$newLine;
             }
         }

translations/messages.en.po

@@ -30523,3 +30523,18 @@ msgstr "The learning courses are designed around the following main areas. Choos
 
 msgid "Once the areas have been selected, choose 5 themes and objectives in order of preference.<br><br>"
 msgstr "Once the areas have been selected, choose 5 themes and objectives in order of preference.<br><br>"
+
+msgid "PDF download unavailable"
+msgstr "PDF download unavailable"
+
+msgid "Registering"
+msgstr "Registering"
+
+msgid "Hello,<br>You haven't logged into to your account for three months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+msgstr "Hello,<br>You haven't logged into to your account for three months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+
+msgid "Hello,<br>You haven't logged into your account for six months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+msgstr "Hello,<br>You haven't logged into your account for six months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+
+msgid "Hello,<br>%s hasn't logged into PARKUR in the last six months. His account has just been deactivated.<br><br>Sincerely."
+msgstr "Hello,<br>%s hasn't logged into PARKUR in the last six months. His account has just been deactivated.<br><br>Sincerely."

translations/messages.pot

@@ -30488,3 +30488,18 @@ msgstr ""
 
 msgid "Once the areas have been selected, choose 5 themes and objectives in order of preference.<br><br>"
 msgstr ""
+
+msgid "PDF download unavailable"
+msgstr ""
+
+msgid "Registering"
+msgstr ""
+
+msgid "Hello,<br>You haven't logged into to your account for three months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+msgstr ""
+
+msgid "Hello,<br>You haven't logged into your account for six months. It has now been deactivated. If you would like to reactivate it, please contact us.<br><br>Best regards."
+msgstr ""
+
+msgid "Hello,<br>%s hasn't logged into PARKUR in the last six months. His account has just been deactivated.<br><br>Sincerely."
+msgstr ""