MDL-11341 - allow users with language editing perms to access language

editing
merged from MOODLE_19_STABLE

diff --git a/admin/settings/language.php b/admin/settings/language.php
index 8c4055a2caaf35523153c71301e73009dc61dc56..8d0b7f8c07531af0383571353c5c52b18a6cb094 100644 (file)
--- a/admin/settings/language.php
+++ b/admin/settings/language.php
@@ -2,7 +2,9 @@
 
 // This file defines settingpages and externalpages under the "appearance" category
 
-if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+if ($hassiteconfig 
+    or has_capability('moodle/site:langeditmaster', $systemcontext)
+    or has_capability('moodle/site:langeditmaster', $systemcontext)) { // speedup for non-admins, add all caps used on this page
 
     // "languageandlocation" settingpage
     $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
@@ -19,7 +21,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $ADMIN->add('language', $temp);
 
-    $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php"));
+    $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php", array('moodle/site:langeditmaster', 'moodle/site:langeditlocal') ));
     $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
 
 } // end of speedup