From: Eloy Lafuente <stronk7@moodle.org>
Date: Mon, 7 Dec 2009 11:42:18 +0000 (+0000)
Subject: MDL-20961 customize notices showed when user information is not included in backup... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b72db8b3484b297da443a171cf902ef800d6e251;p=moodle.git

MDL-20961 customize notices showed when user information is not included in backup ; merged from 19_STABLE
---

diff --git a/backup/backup_check.html b/backup/backup_check.html
index 86350b6bc6..d235e60e22 100644
--- a/backup/backup_check.html
+++ b/backup/backup_check.html
@@ -133,7 +133,12 @@
         $backupprefs->backup_blogs = 0;
         $backupprefs->backuproleassignments = array();
 
-        echo $OUTPUT->box(get_string("backupnoneusersinfo"), "noticebox");
+        if ($backupuserinfo) { // Based on perms, decide the msg to show
+            $nousersmsgtoshow = 'backupnoneusersinfo';
+        } else {
+            $nousersmsgtoshow = 'backupmissinguserinfoperms';
+        }
+        echo $OUTPUT->box(get_string($nousersmsgtoshow), "noticebox");
         echo "<hr />";
     }
 
diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 063bc3c261..61c4a7b99d 100644
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -165,7 +165,8 @@ $string['backuploglaststatus'] = 'Last execution log';
 $string['backuplogshelp'] = 'If enabled, then course logs will be included in automated backups';
 $string['backupmetacoursehelp'] = 'If enabled, then metacourse info (inherited enrolments) will be included in automated backups';
 $string['backupnameformat'] = '%%Y%%m%%d-%%H%%M';
-$string['backupnoneusersinfo'] = 'Notice: You have selected to backup no users (\"none\"), so all the modules backup have been switched to \"without user data\" mode. Please note that the \"exercise\" and \"workshop\" modules aren\'t compatible with this type of backup, so they have been deactivated completely.';
+$string['backupmissinguserinfoperms'] = 'Note: This backup contains no user data. Exercise and Workshop activities will not be included in the backup, since these modules are not compatible with this type of backup.';
+$string['backupnoneusersinfo'] = 'Note: This backup contains no users and so all activities have been switched to \"without user data\" mode. Exercise and Workshop activities will not be included in the backup, since these modules are not compatible with this type of backup.';
 $string['backupnonisowarning'] = 'Warning: this backup is from a non-Unicode version of Moodle (pre 1.6).  If this backup contains any non-ISO-8859-1 texts then they may be CORRUPTED if you try to restore them to this Unicode version of Moodle.  See the <a href=\"http://docs.moodle.org/en/Backup_FAQ\">Backup FAQ</a> for more information about how to recover this backup correctly.';
 $string['backupnext'] = 'Next backup';
 $string['backuporiginalname'] = 'Backup Name';