Merge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle

ragusa87 · Jul 16, 2013 · 55fcd93 · 55fcd93
2 parents e28ae96 + cb9c703
commit 55fcd93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/admin/tool/behat/lang/en/tool_behat.php b/admin/tool/behat/lang/en/tool_behat.php
@@ -22,8 +22,10 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically.';
 $string['allavailablesteps'] = 'All the available steps definitions';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
+$string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
 $string['moreinfoin'] = 'More info in {$a}';
 $string['newstepsinfo'] = 'Read {$a} for info about how to add new steps definitions';

diff --git a/admin/tool/behat/renderer.php b/admin/tool/behat/renderer.php
@@ -64,9 +64,10 @@ public function render_stepsdefinitions($stepsdefinitions, $form) {
             get_string('newstepsinfo', 'tool_behat', $writestepslink)
         );
 
-        // List of steps
+        // List of steps.
         $html .= $this->output->box_start();
-        $html .= html_writer::tag('h1', 'Info');
+        $html .= html_writer::tag('h1', get_string('infoheading', 'tool_behat'));
+        $html .= html_writer::tag('div', get_string('aim', 'tool_behat'));
         $html .= html_writer::empty_tag('div');
         $html .= html_writer::empty_tag('ul');
         $html .= html_writer::empty_tag('li');

diff --git a/lib/behat/classes/behat_command.php b/lib/behat/classes/behat_command.php
@@ -207,6 +207,8 @@ public static function are_behat_dependencies_installed() {
     protected static function output_msg($msg) {
 
         if (!CLI_SCRIPT) {
+            // General info about the tool purpose.
+            $msg = get_string('aim', 'tool_behat') . '<br /><br />' . $msg;
             notice($msg);
         } else {
             echo $msg;