Skip to content
Browse files

MDL-26142 fix immediately spelling in strings, comments and code

  • Loading branch information...
1 parent d911c72 commit 743fff98dcd72e268c410df85f54c2a0e8d7f92a @skodak skodak committed Feb 13, 2011
View
2 admin/cli/automated_backups.php
@@ -92,7 +92,7 @@
// Run automated backups if required.
require_once($CFG->dirroot.'/backup/util/includes/backup_includes.php');
require_once($CFG->dirroot.'/backup/util/helper/backup_cron_helper.class.php');
-backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATLY);
+backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATELY);
mtrace("Automated cron backups completed correctly");
View
16 backup/util/helper/backup_cron_helper.class.php
@@ -49,8 +49,8 @@
/** Run if required by the schedule set in config. Default. **/
const RUN_ON_SCHEDULE = 0;
- /** Run immediatly. **/
- const RUN_IMMEDIATLY = 1;
+ /** Run immediately. **/
+ const RUN_IMMEDIATELY = 1;
const AUTO_BACKUP_DISABLED = 0;
const AUTO_BACKUP_ENABLED = 1;
@@ -75,7 +75,7 @@ public static function run_automated_backup($rundirective = self::RUN_ON_SCHEDUL
return $state;
} else if ($state === backup_cron_automated_helper::STATE_RUNNING) {
mtrace('RUNNING');
- if ($rundirective == self::RUN_IMMEDIATLY) {
+ if ($rundirective == self::RUN_IMMEDIATELY) {
mtrace('automated backups are already. If this script is being run by cron this constitues an error. You will need to increase the time between executions within cron.');
} else {
mtrace("automated backup are already running. Execution delayed");
@@ -130,12 +130,12 @@ public static function run_automated_backup($rundirective = self::RUN_ON_SCHEDUL
$DB->update_record('backup_courses', $backupcourse);
mtrace('Skipping unchanged course '.$course->fullname);
$skipped = true;
- } else if (($backupcourse->nextstarttime >= 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATLY) {
+ } else if (($backupcourse->nextstarttime >= 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATELY) {
mtrace('Backing up '.$course->fullname, '...');
//We have to send a email because we have included at least one backup
$emailpending = true;
-
+
//Only make the backup if laststatus isn't 2-UNFINISHED (uncontrolled error)
if ($backupcourse->laststatus != 2) {
//Set laststarttime
@@ -270,7 +270,7 @@ public static function calculate_next_automated_backup($timezone, $now) {
$config = get_config('backup');
$midnight = usergetmidnight($now, $timezone);
$date = usergetdate($now, $timezone);
-
+
//Get number of days (from today) to execute backups
$automateddays = substr($config->backup_auto_weekdays,$date['wday']) . $config->backup_auto_weekdays;
$daysfromtoday = strpos($automateddays, "1");
@@ -335,7 +335,7 @@ public static function launch_automated_backup($course, $starttime, $userid) {
$users = $bc->get_plan()->get_setting('users')->get_value();
$anonymised = $bc->get_plan()->get_setting('anonymize')->get_value();
$bc->get_plan()->get_setting('filename')->set_value(backup_plan_dbops::get_default_backup_filename($format, $type, $id, $users, $anonymised));
-
+
$bc->set_status(backup::STATUS_AWAITING);
$outcome = $bc->execute_plan();
@@ -505,7 +505,7 @@ public static function remove_excess_backups($course) {
// Clean up excess backups in the specified external directory
if (!empty($dir) && ($storage == 1 || $storage == 2)) {
// Calculate backup filename regex
-
+
$filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' .$course->id . '-';
$regex = '#^'.preg_quote($filename, '#').'(\d{8})\-(\d{4})\-[a-z]{2}\.mbz$#S';
View
2 course/view.php
@@ -131,7 +131,7 @@
echo $OUTPUT->notification('An error occurred while moving a section');
}
// Clear the navigation cache at this point so that the affects
- // are seen immediatly on the navigation.
+ // are seen immediately on the navigation.
$PAGE->navigation->clear_cache();
}
}
View
4 lang/en/admin.php
@@ -27,11 +27,11 @@
$string['accounts'] = 'Accounts';
$string['additionalhtml'] = 'Additional HTML';
$string['additionalhtml_heading'] = 'Additional HTML to be added to every page.';
-$string['additionalhtml_desc'] = 'These settings allow you to specify HTML that you want added to every page. You can set HTML that will be added within the HEAD tag for the page, immediatly after the BODY tag has been opened, or immediatly before the body tag is closed.<br />Doing this allows you add custom headers or footers on every page, or add support for services like Google Analytics very easily and independent of your chosen theme.';
+$string['additionalhtml_desc'] = 'These settings allow you to specify HTML that you want added to every page. You can set HTML that will be added within the HEAD tag for the page, immediately after the BODY tag has been opened, or immediately before the body tag is closed.<br />Doing this allows you add custom headers or footers on every page, or add support for services like Google Analytics very easily and independent of your chosen theme.';
$string['additionalhtmlhead'] = 'Within HEAD';
$string['additionalhtmlhead_desc'] = 'Content here will be added to the bottom of the HEAD tag for every page.';
$string['additionalhtmltopofbody'] = 'When BODY is opened';
-$string['additionalhtmltopofbody_desc'] = 'Content here will be added in to every page immediatly after the opening body tag.';
+$string['additionalhtmltopofbody_desc'] = 'Content here will be added in to every page immediately after the opening body tag.';
$string['additionalhtmlfooter'] = 'Before BODY is closed';
$string['additionalhtmlfooter_desc'] = 'Content here will be added in to every page right before the body tag is closed.';
$string['adminseesall'] = 'Admins see all';
View
2 lib/dml/sqlsrv_native_moodle_database.php
@@ -771,7 +771,7 @@ public function get_recordset_sql($sql, array $params = null, $limitfrom = 0, $l
* @return string sql
*/
private function limit_to_top_n($sql, $offset, $limit) {
- // If there is no limit we can return immediatly
+ // If there is no limit we can return immediately
if ($limit < 1 && $offset < 1) {
return $sql;
}

0 comments on commit 743fff9

Please sign in to comment.
Something went wrong with that request. Please try again.