MDL-8522 better label for role reset button and confirmation text; merged from MOODLE...

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 18f5f3e460bf66042498378116e510bd6e167cec..60ace42e1d90c4c80404b8c7e62d1c8725a7bc02 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -125,7 +125,7 @@ if (!empty($role->legacytype)) {
 foreach ($capabilities as $capability) {
 
     //legacy caps have their own selector
-    if (strpos($capability->name, 'moodle/legacy:') === 0 ) {
+    if (islegacy($capability->name)) {
         continue;
     }
 

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 20896cce80937f2a3d42a4c9f720c2cd49929045..bf20749d875bce0f098ce6949c4d2c154c8c89e0 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -440,12 +440,17 @@
 
             echo '<div class="buttons">';
 
+            $legacytype = get_legacy_type($roleid); 
             $options = array();
             $options['roleid'] = $roleid;
             $options['action'] = 'edit';
             print_single_button('manage.php', $options, get_string('edit'));
             $options['action'] = 'reset';
-            print_single_button('manage.php', $options, get_string('reset'));
+            if (empty($legacytype)) {
+                print_single_button('manage.php', $options, get_string('resetrolenolegacy', 'role'));
+            } else {
+                print_single_button('manage.php', $options, get_string('resetrole', 'role'));
+            }
             $options['action'] = 'duplicate';
             print_single_button('manage.php', $options, get_string('duplicaterole', 'role'));
             print_single_button('manage.php', null, get_string('listallroles', 'role'));

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 75172632ab0adbab1556284677a35739fa7c77b9..639fff39160633c9ac858218466b7dec25b1cc6a 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -81,8 +81,10 @@ $string['question:export'] = 'Export questions';
 $string['question:import'] = 'Import questions';
 $string['question:manage'] = 'Manage questions';
 $string['question:managecategory'] = 'Manage question category';
+$string['resetrole'] = 'Reset to defaults';
+$string['resetrolenolegacy'] = 'Clear permissions';
 $string['resetrolesure'] = 'Are you sure that you want to reset role \"$a->name ($a->shortname)\" to defaults?<p></p>The defaults are taken from the selected legacy capability ($a->legacytype).';
-$string['resetrolesurenolegacy'] = 'Are you sure that you want to removed all permissions defined in this role \"$a->name ($a->shortname)\"?';
+$string['resetrolesurenolegacy'] = 'Are you sure that you want to clear all permissions defined in this role \"$a->name ($a->shortname)\"?';
 $string['risks'] = 'Risks';
 $string['role:assign'] = 'Assign roles to users';
 $string['role:manage'] = 'Create and manage roles';