L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22050 removing moodle/langconfig duplicates

Browse Source 
AMOS BEGIN
  MOV [backupnameformat,core],[backupnameformat,core_langconfig]
AMOS END
This commit is contained in:
Petr Skoda
2010-04-10 17:35:19 +00:00
parent 61bb07c257
commit 4248b15cf8
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/backuplib.php
+1 -1
View File
@@ -3506,7 +3506,7 @@
$backup_word = backup_get_backup_string($course);
//Calculate the date format string
$backup_date_format = str_replace(" ","_",get_string("backupnameformat"));
$backup_date_format = str_replace(" ","_",get_string("backupnameformat", 'langconfig'));
//If non-translated, use "%Y%m%d-%H%M"
if (substr($backup_date_format,0,1) == "[") {
$backup_date_format = "%%Y%%m%%d-%%H%%M";
course/lib.php
+3 -3
View File
@@ -560,7 +560,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,
$strftimedatetime = get_string("strftimedatetime");
$filename = 'logs_'.userdate(time(),get_string('backupnameformat'),99,false);
$filename = 'logs_'.userdate(time(),get_string('backupnameformat', 'langconfig'),99,false);
$filename .= '.txt';
header("Content-Type: application/download\n");
header("Content-Disposition: attachment; filename=$filename");
@@ -638,7 +638,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
$strftimedatetime = get_string("strftimedatetime");
$nroPages = ceil(count($logs)/(EXCELROWS-FIRSTUSEDEXCELROW+1));
$filename = 'logs_'.userdate(time(),get_string('backupnameformat'),99,false);
$filename = 'logs_'.userdate(time(),get_string('backupnameformat', 'langconfig'),99,false);
$filename .= '.xls';
$workbook = new MoodleExcelWorkbook('-');
@@ -749,7 +749,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname,
$strftimedatetime = get_string("strftimedatetime");
$nroPages = ceil(count($logs)/(EXCELROWS-FIRSTUSEDEXCELROW+1));
$filename = 'logs_'.userdate(time(),get_string('backupnameformat'),99,false);
$filename = 'logs_'.userdate(time(),get_string('backupnameformat', 'langconfig'),99,false);
$filename .= '.ods';
$workbook = new MoodleODSWorkbook('-');
lang/en/moodle.php
-1
View File
@@ -187,7 +187,6 @@ $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['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['backupnameformat'] = '%Y%m%d-%H%M';
$string['backupnext'] = 'Next 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.';