MDL-22050 removing moodle/langconfig duplicates

AMOS BEGIN
  MOV [backupnameformat,core],[backupnameformat,core_langconfig]
AMOS END

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 775bfed..f438375 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -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";

diff --git a/course/lib.php b/course/lib.php
index 7c0e0a7..13e91f3 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -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('-');

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 0496944..dcbb5c8 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -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.';