Merge branch 'MDL-43892' of git://github.com/timhunt/moodle

This commit is contained in:
Sam Hemelryk 2014-02-04 10:57:26 +13:00
commit 1331241bf4
2 changed files with 2 additions and 1 deletions

View File

@ -35,4 +35,5 @@ $string['checkingsourcetables'] = 'Checking source table structure';
$string['importschemaexception'] = 'Current database structure does not match all install.xml files. <br /> {$a}';
$string['importversionmismatchexception'] = 'Current version {$a->currentver} does not match exported version {$a->schemaver}.';
$string['malformedxmlexception'] = 'Malformed XML found, can not continue.';
$string['tablex'] = 'Table {$a}:';
$string['unknowntableexception'] = 'Unknown table {$a} found in export file.';

View File

@ -132,7 +132,7 @@ abstract class database_exporter {
if ($this->check_schema and $errors = $this->manager->check_database_schema($this->schema)) {
$details = '';
foreach ($errors as $table=>$items) {
$details .= '<div>'.get_string('table').' '.$table.':';
$details .= '<div>'.get_string('tablex', 'dbtransfer', $table);
$details .= '<ul>';
foreach ($items as $item) {
$details .= '<li>'.$item.'</li>';