Rename lang file as per Martin's request.

diff --git a/admin/report/simpletest/ex_reporter.php b/admin/report/simpletest/ex_reporter.php
index 22603d36745e68b6bced9bcbb218b26b7dc58967..0a705f61f916b569402403998119f0374bb1d6d1 100644 (file)
--- a/admin/report/simpletest/ex_reporter.php
+++ b/admin/report/simpletest/ex_reporter.php
@@ -205,7 +205,7 @@ class ExHtmlReporter extends HtmlReporter {
      * Look up a lang string in the appropriate file.
      */
     function get_string($identifier, $a = NULL) {
-        return get_string($identifier, 'unittest', $a);
+        return get_string($identifier, 'simpletest', $a);
     }
 }
 ?>
\ No newline at end of file

diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index 0fdde58cc6407873143432f25a4bcc877afc5bf8..a2b289210f8f38ae84287500a4c02b74bc6d8fba 100644 (file)
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -18,6 +18,7 @@ require_once('ex_reporter.php');
 /* The UNITTEST constant can be checked elsewhere if you need to know
  * when your code is being run as part of a unit test. */
 define('UNITTEST', true);
+$langfile = 'simpletest';
 
 require_login();
 if (!isadmin()) {
@@ -42,7 +43,7 @@ $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
 $reporter = new ExHtmlReporter($showpasses);
 
 // Print the header.
-$strtitle = get_string('unittests', 'unittest');
+$strtitle = get_string('unittests', $langfile);
 $stradmin = get_string('administration');
 print_header("$SITE->shortname: $strtitle", $SITE->fullname,
         '<a href="../../index.php">' . get_string('administration') . '</a> -> ' .
@@ -69,16 +70,16 @@ if (is_file($path)) {
 } else if (is_dir($path)){
     $test->findTestFiles($path);
 } else {
-    print_simple_box(get_string('pathdoesnotexist', 'unittest', $path), '', '', '', '', 'errorbox');
+    print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
     $ok = false;
 }
 
 // If we have something to test, do it.
 if ($ok) {
     if ($path == $CFG->dirroot) {
-        $title = get_string('moodleunittests', 'unittest', get_string('all', 'unittest'));
+        $title = get_string('moodleunittests', $langfile, get_string('all', $langfile));
     } else {
-        $title = get_string('moodleunittests', 'unittest', $displaypath);
+        $title = get_string('moodleunittests', $langfile, $displaypath);
     }
     print_heading($title);
     $test->run($reporter);
@@ -87,15 +88,15 @@ if ($ok) {
 // Print the form for adjusting options.
 print_simple_box_start('center', '70%');
 echo '<form method="GET" action="index.php">';
-print_heading(get_string('retest', 'unittest'));
-echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', 'unittest')); echo '</p>';
-echo '<p>'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', 'unittest')); echo '</p>';
-echo '<p>'; print_checkbox('thorough', 1, $thorough, get_string('thorough', 'unittest')); echo '</p>';
+print_heading(get_string('retest', $langfile));
+echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '</p>';
+echo '<p>'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', $langfile)); echo '</p>';
+echo '<p>'; print_checkbox('thorough', 1, $thorough, get_string('thorough', $langfile)); echo '</p>';
 echo '<p>';
-    echo '<label for="path">', get_string('onlytest', 'unittest'), '</label> ';
+    echo '<label for="path">', get_string('onlytest', $langfile), '</label> ';
     echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="60" />';
 echo '</p>';
-echo '<input type="submit" value="' . get_string('runtests', 'unittest') . '" />';
+echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
 echo '</form>';
 print_simple_box_end();
 

diff --git a/admin/report/simpletest/mod.php b/admin/report/simpletest/mod.php
index eed76a5cf4201c6dffb1f277ae5618146ecd0681..d53d9a716b03e2e5cb108d103cefe6cbedf4ba60 100644 (file)
--- a/admin/report/simpletest/mod.php
+++ b/admin/report/simpletest/mod.php
@@ -13,8 +13,9 @@
 if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.'); //  It must be included from a Moodle page
 }
+$langfile = 'simpletest';
 
-print_heading(get_string('unittests', 'unittest'));
+print_heading(get_string('unittests', $langfile));
 print_heading('<a href="'.$CFG->wwwroot.'/admin/report/simpletest/index.php">' . 
-        get_string('rununittests', 'unittest') . '</a>', '', 3);
+        get_string('rununittests', $langfile) . '</a>', '', 3);
 ?>
\ No newline at end of file

diff --git a/lang/en_utf8/unittest.php b/lang/en_utf8/simpletest.php
similarity index 100%
rename from lang/en_utf8/unittest.php
rename to lang/en_utf8/simpletest.php