MDL-19352 maintenance mode reimplemented - now using$CFG + cli script

diff --git a/admin/cli/maintenance.php b/admin/cli/maintenance.php
index 0d499afd7b763afb387407a8a958afb4d697959f..6f2e2280f0f125976d149bb11df00abba8a20a5c 100644 (file)
--- a/admin/cli/maintenance.php
+++ b/admin/cli/maintenance.php
@@ -61,6 +61,7 @@ Example: \$sudo -u wwwrun /usr/bin/php admin/cli/maintenance.php
 }
 
 cli_heading(get_string('sitemaintenancemode', 'admin')." ($CFG->wwwroot)");
+
 if ($options['enable']) {
     set_config('maintenance_enabled', 1);
     echo get_string('sitemaintenanceon', 'admin')."\n";
@@ -72,7 +73,7 @@ if ($options['enable']) {
 }
 
 if (!empty($CFG->maintenance_enabled)) {
-    echo "Status: enabled\n"; // TODO: localize
+    echo get_string('clistatusenabled', 'admin')."\n";
 } else {
-    echo "Status: disabled\n"; // TODO: localize
+    echo get_string('clistatusdisabled', 'admin')."\n";
 }

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 0fde5d380746b5325a076d7caec71925142fa2aa..7df5ec6fe80022b3c4f7f2d898bd217ff2c35eb9 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -62,6 +62,8 @@ $string['cliincorrectvalueerror'] = 'Error, incorrect value \"$a->value\" for \"
 $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 'y';
 $string['cliincorrectvalueretry'] = 'Incorrect value, please retry';
+$string['clistatusdisabled'] = 'Status: disabled';
+$string['clistatusenabled'] = 'Status: enabled';
 $string['clitypevalue'] = 'type value';
 $string['clitypevaluedefault'] = 'type value, press Enter to use default value ($a)';
 $string['cliupgradefinished'] = 'Command line upgrade completed successfully.';