From: thepurpleblob <thepurpleblob>
Date: Thu, 29 May 2008 10:53:30 +0000 (+0000)
Subject: MDL-14854
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac1dc9845ac4cf5be2a0fde299d74e172cd0e69c;p=moodle.git

MDL-14854
Changed the language strings to something more sensible as per Petr's comments.
---

diff --git a/admin/xmldb/actions/check_defaults/check_defaults.class.php b/admin/xmldb/actions/check_defaults/check_defaults.class.php
index 896021906b..8f6cde2232 100644
--- a/admin/xmldb/actions/check_defaults/check_defaults.class.php
+++ b/admin/xmldb/actions/check_defaults/check_defaults.class.php
@@ -55,8 +55,8 @@ class check_defaults extends XMLDBAction {
             'yes' => '',
             'no' => '',
             'error' => '',
-            'shouldbe' => 'xmldb',
-            'butis' => 'xmldb',
+            'expected' => 'xmldb',
+            'actual' => 'xmldb',
             'back' => 'xmldb'
 
         ));
@@ -186,8 +186,8 @@ class check_defaults extends XMLDBAction {
 
                                     // there *is* a default and it's wrong
                                     if ($physicaldefault != $xmldbdefault) {
-                                        $info = '['.$this->str['shouldbe']." '$xmldbdefault' ".$this->str['butis'].
-                                        " '$physicaldefault']";
+                                        $info = '('.$this->str['expected']." '$xmldbdefault', ".$this->str['actual'].
+                                        " '$physicaldefault')";
                                         $o.='<font color="red">' . $this->str['wrong'] . " $info</font>";
                                     /// Add the wrong field to the list
                                         $obj = new object;
@@ -236,8 +236,8 @@ class check_defaults extends XMLDBAction {
 
                     $r.= '            <li>' . $this->str['table'] . ': ' . $xmldb_table->getName() . '. ' .
                                               $this->str['field'] . ': ' . $xmldb_field->getName() . ', ' .
-                                              $this->str['shouldbe'] . ' ' . "'$xmldbdefault'" . ' ' .
-                                              $this->str['butis'] . ' ' . "'$physicaldefault'" . '</li>';
+                                              $this->str['expected'] . ' ' . "'$xmldbdefault'" . ' ' .
+                                              $this->str['actual'] . ' ' . "'$physicaldefault'" . '</li>';
                     /// Add to output if we have sentences
                     if ($sqlarr) {
                         $sqlarr = $dbman->generator->getEndedStatements($sqlarr);
diff --git a/lang/en_utf8/xmldb.php b/lang/en_utf8/xmldb.php
index e5effe268a..ea45c24544 100644
--- a/lang/en_utf8/xmldb.php
+++ b/lang/en_utf8/xmldb.php
@@ -1,12 +1,11 @@
 <?PHP // $Id$ 
       // xmldb.php - created with Moodle 1.7 beta + (2006101003)
 
-
+$string['actual'] = 'Actual';
 $string['aftertable'] = 'After Table:';
 $string['back'] = 'Back';
 $string['backtomainview'] = 'Back To Main';
 $string['binaryincorrectlength'] = 'Incorrect length for binary field';
-$string['butis'] = 'but is';
 $string['cannotuseidfield'] = 'Cannot insert the \"id\" field. It is an autonumeric column';
 $string['change'] = 'Change';
 $string['charincorrectlength'] = 'Incorrect length for char field';
@@ -61,6 +60,7 @@ $string['edit_statement'] = 'Edit Statement';
 $string['edit_table'] = 'Edit Table';
 $string['edit_xml_file'] = 'Edit XML File';
 $string['enumvaluesincorrect'] = 'Incorrect values for enum field';
+$string['expected'] = 'Expected';
 $string['field'] = 'Field';
 $string['fieldnameempty'] = 'Name field empty';
 $string['fields'] = 'Fields';
@@ -113,7 +113,6 @@ $string['selectonecommand'] = 'Please, select one Action from the list to view P
 $string['selectonefieldkeyindex'] = 'Please, select one Field/Key/Index from the list to view the PHP code';
 $string['selecttable'] = 'Select Table:';
 $string['sentences'] = 'Sentences';
-$string['shouldbe'] = 'should be';
 $string['statements'] = 'Statements';
 $string['statementtable'] = 'Statement Table:';
 $string['statementtype'] = 'Statement Type:';