Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle

This commit is contained in:
Aparup Banerjee 2012-05-29 16:43:39 +08:00
commit 5eb80ab73d
3 changed files with 5 additions and 2 deletions

View File

@ -425,7 +425,8 @@ if (isset($maturity)) {
exit(1);
}
} else {
cli_error(get_string('maturitycorewarning', 'admin'));
cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
cli_error(get_string('maturityallowunstable', 'admin'));
}
}
}

View File

@ -132,7 +132,8 @@ if (isset($maturity)) {
echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
cli_separator();
} else {
cli_error(get_string('maturitycorewarning', 'admin', $maturitylevel));
cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
cli_error(get_string('maturityallowunstable', 'admin'));
}
}
}

View File

@ -636,6 +636,7 @@ $string['maturity50'] = 'Alpha';
$string['maturity100'] = 'Beta';
$string['maturity150'] = 'Release candidate';
$string['maturity200'] = 'Stable version';
$string['maturityallowunstable'] = 'Hint: You may want to run this script with --allow-unstable option';
$string['maturitycoreinfo'] = 'Your site is currently running unstable "{$a}" development code.';
$string['maturitycorewarning'] = 'The version of Moodle that you are about to install or upgrade to contains
unstable "{$a}" development code that is not suitable for use on most production