Merge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle

BenKelada · Nov 11, 2015 · 84f7633 · 84f7633
2 parents fdca1a1 + 3a72303
commit 84f7633
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/install/stringnames.txt b/install/stringnames.txt
@@ -43,6 +43,7 @@ langdownloaderror,install
 language,moodle
 memorylimithelp,install
 missingrequiredfield,error
+moodlelogo,moodle
 next,moodle
 parentlanguage,langconfig
 pathserrcreatedataroot,install

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -1171,6 +1171,7 @@
 $string['missingurl'] = 'Missing URL';
 $string['missingusername'] = 'Missing username';
 $string['moddoesnotsupporttype'] = 'Module {$a->modname} does not support uploads of type {$a->type}';
+$string['moodlelogo'] = 'Moodle logo';
 $string['month'] = 'Month';
 $string['months'] = 'Months';
 $string['modified'] = 'Modified';

diff --git a/lib/installlib.php b/lib/installlib.php
@@ -406,7 +406,7 @@ function install_print_footer($config, $reload=false) {
 
     $homelink  = '<div class="sitelink">'.
        '<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.
-       '<img src="pix/moodlelogo.png" alt="moodlelogo" /></a></div>';
+       '<img src="pix/moodlelogo.png" alt="'.get_string('moodlelogo').'" /></a></div>';
 
     echo '</form></div>';
     echo '<div id="page-footer">'.$homelink.'</div>';

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -830,13 +830,13 @@ public function home_link() {
             // Special case for site home page - please do not remove
             return '<div class="sitelink">' .
                    '<a title="Moodle" href="http://moodle.org/">' .
-                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
+                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
 
         } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) {
             // Special case for during install/upgrade.
             return '<div class="sitelink">'.
                    '<a title="Moodle" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">' .
-                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
+                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
 
         } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) {
             return '<div class="homelink"><a href="' . $CFG->wwwroot . '/">' .