From 5089cca0b46e475323ed83713e87a2f58ea28c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Wed, 26 Jun 2013 23:45:53 +0200 Subject: [PATCH] MDL-40337 use full frankenstyle in get_string() calls --- admin/roles/admins.php | 2 +- admin/roles/assign.php | 26 ++++++++-------- admin/roles/check.php | 18 +++++------ admin/roles/classes/allow_assign_page.php | 4 +-- admin/roles/classes/allow_override_page.php | 4 +-- admin/roles/classes/allow_switch_page.php | 4 +-- .../classes/capability_table_with_risks.php | 4 +-- .../roles/classes/check_capability_table.php | 2 +- admin/roles/classes/check_users_selector.php | 4 +-- .../classes/define_role_table_advanced.php | 30 +++++++++---------- .../roles/classes/define_role_table_basic.php | 2 +- admin/roles/classes/existing_role_holders.php | 16 +++++----- .../potential_assignees_below_course.php | 4 +-- .../potential_assignees_course_and_above.php | 4 +-- .../classes/view_role_definition_table.php | 6 ++-- admin/roles/permissions.php | 8 ++--- admin/roles/usersroles.php | 12 ++++---- 17 files changed, 75 insertions(+), 75 deletions(-) diff --git a/admin/roles/admins.php b/admin/roles/admins.php index ec58e050d1f..57833b66cd9 100644 --- a/admin/roles/admins.php +++ b/admin/roles/admins.php @@ -135,7 +135,7 @@ echo $OUTPUT->header();


- +

diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 3d1a67096dc..3734815846d 100644 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -75,12 +75,12 @@ if ($roleid) { $a = new stdClass; $a->role = $assignableroles[$roleid]; $a->context = $contextname; - $title = get_string('assignrolenameincontext', 'role', $a); + $title = get_string('assignrolenameincontext', 'core_role', $a); } else { if ($isfrontpage) { $title = get_string('frontpageroles', 'admin'); } else { - $title = get_string('assignrolesin', 'role', $contextname); + $title = get_string('assignrolesin', 'core_role', $contextname); } } @@ -174,13 +174,13 @@ switch ($context->contextlevel) { echo $OUTPUT->header(); // Print heading. -echo $OUTPUT->heading_with_help($title, 'assignroles', 'role'); +echo $OUTPUT->heading_with_help($title, 'assignroles', 'core_role'); if ($roleid) { // Show UI for assigning a particular role to users. // Print a warning if we are assigning system roles. if ($context->contextlevel == CONTEXT_SYSTEM) { - echo $OUTPUT->box(get_string('globalroleswarning', 'role')); + echo $OUTPUT->box(get_string('globalroleswarning', 'core_role')); } // Print the form. @@ -192,7 +192,7 @@ if ($roleid) { @@ -230,31 +230,31 @@ if ($roleid) { echo '
'; $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null); - $select->label = get_string('assignanotherrole', 'role'); + $select->label = get_string('assignanotherrole', 'core_role'); echo $OUTPUT->render($select); $backurl = new moodle_url('/admin/roles/assign.php', array('contextid' => $contextid)); - echo '

' . get_string('backtoallroles', 'role') . '

'; + echo '

' . get_string('backtoallroles', 'core_role') . '

'; echo '
'; } else if (empty($assignableroles)) { // Print a message that there are no roles that can me assigned here. - echo $OUTPUT->heading(get_string('notabletoassignroleshere', 'role'), 3); + echo $OUTPUT->heading(get_string('notabletoassignroleshere', 'core_role'), 3); } else { // Show UI for choosing a role to assign. // Print a warning if we are assigning system roles. if ($context->contextlevel == CONTEXT_SYSTEM) { - echo $OUTPUT->box(get_string('globalroleswarning', 'role')); + echo $OUTPUT->box(get_string('globalroleswarning', 'core_role')); } // Print instruction. - echo $OUTPUT->heading(get_string('chooseroletoassign', 'role'), 3); + echo $OUTPUT->heading(get_string('chooseroletoassign', 'core_role'), 3); // Get the names of role holders for roles with between 1 and MAX_USERS_TO_LIST_PER_ROLE users, // and so determine whether to show the extra column. $roleholdernames = array(); - $strmorethanmax = get_string('morethan', 'role', MAX_USERS_TO_LIST_PER_ROLE); + $strmorethanmax = get_string('morethan', 'core_role', MAX_USERS_TO_LIST_PER_ROLE); $showroleholders = false; foreach ($assignableroles as $roleid => $notused) { $roleusers = ''; @@ -279,7 +279,7 @@ if ($roleid) { // Print overview table. $table = new html_table(); $table->id = 'assignrole'; - $table->head = array(get_string('role'), get_string('description'), get_string('userswiththisrole', 'role')); + $table->head = array(get_string('role'), get_string('description'), get_string('userswiththisrole', 'core_role')); $table->colclasses = array('leftalign role', 'leftalign', 'centeralign userrole'); $table->attributes['class'] = 'admintable generaltable'; if ($showroleholders) { diff --git a/admin/roles/check.php b/admin/roles/check.php index 47311020b84..de7eca741b3 100644 --- a/admin/roles/check.php +++ b/admin/roles/check.php @@ -47,7 +47,7 @@ if ($course) { // Security first. require_login($course, false, $cm); if (!has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage'), $context)) { - print_error('nopermissions', 'error', '', get_string('checkpermissions', 'role')); + print_error('nopermissions', 'error', '', get_string('checkpermissions', 'core_role')); } $PAGE->set_url($url); $PAGE->set_context($context); @@ -63,7 +63,7 @@ $userselector = new core_role_check_users_selector('reportuser', $options); $userselector->set_rows(20); // Work out an appropriate page title. -$title = get_string('checkpermissionsin', 'role', $contextname); +$title = get_string('checkpermissionsin', 'core_role', $contextname); $PAGE->set_pagelayout('admin'); $PAGE->set_title($title); @@ -116,7 +116,7 @@ if (!is_null($reportuser)) { echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); if (!empty($roleassignments)) { - echo $OUTPUT->heading(get_string('rolesforuser', 'role', fullname($reportuser)), 3); + echo $OUTPUT->heading(get_string('rolesforuser', 'core_role', fullname($reportuser)), 3); echo html_writer::start_tag('ul'); $systemcontext = context_system::instance(); @@ -130,20 +130,20 @@ if (!is_null($reportuser)) { array('action' => 'view', 'roleid' => $ra->roleid)), $rolename); } - echo html_writer::tag('li', get_string('roleincontext', 'role', + echo html_writer::tag('li', get_string('roleincontext', 'core_role', array('role' => $rolename, 'context' => $link))); } echo html_writer::end_tag('ul'); } - echo $OUTPUT->heading(get_string('permissionsforuser', 'role', fullname($reportuser)), 3); + echo $OUTPUT->heading(get_string('permissionsforuser', 'core_role', fullname($reportuser)), 3); $table = new core_role_check_capability_table($context, $reportuser, $contextname); $table->display(); echo $OUTPUT->box_end(); - $selectheading = get_string('selectanotheruser', 'role'); + $selectheading = get_string('selectanotheruser', 'core_role'); } else { - $selectheading = get_string('selectauser', 'role'); + $selectheading = get_string('selectauser', 'core_role'); } // Show UI for choosing a user to report on. @@ -164,14 +164,14 @@ echo $OUTPUT->heading('', $userselector->display(); // Submit button and the end of the form. -echo '

'; +echo '

'; echo ''; echo $OUTPUT->box_end(); // Appropriate back link. if ($context->contextlevel > CONTEXT_USER) { echo html_writer::start_tag('div', array('class'=>'backlink')); - echo html_writer::tag('a', get_string('backto', '', $contextname), array('href'=>get_context_url($context))); + echo html_writer::tag('a', get_string('backto', '', $contextname), array('href'=>$context->get_url())); echo html_writer::end_tag('div'); } diff --git a/admin/roles/classes/allow_assign_page.php b/admin/roles/classes/allow_assign_page.php index 2cd529e93e5..8d31cc082a0 100644 --- a/admin/roles/classes/allow_assign_page.php +++ b/admin/roles/classes/allow_assign_page.php @@ -40,10 +40,10 @@ class core_role_allow_assign_page extends core_role_allow_role_page { $a = new stdClass; $a->fromrole = $fromrole->localname; $a->targetrole = $targetrole->localname; - return get_string('allowroletoassign', 'role', $a); + return get_string('allowroletoassign', 'core_role', $a); } public function get_intro_text() { - return get_string('configallowassign', 'admin'); + return get_string('configallowassign', 'core_admin'); } } diff --git a/admin/roles/classes/allow_override_page.php b/admin/roles/classes/allow_override_page.php index 5a2e3b8c1d5..a277abb6d6d 100644 --- a/admin/roles/classes/allow_override_page.php +++ b/admin/roles/classes/allow_override_page.php @@ -40,10 +40,10 @@ class core_role_allow_override_page extends core_role_allow_role_page { $a = new stdClass; $a->fromrole = $fromrole->localname; $a->targetrole = $targetrole->localname; - return get_string('allowroletooverride', 'role', $a); + return get_string('allowroletooverride', 'core_role', $a); } public function get_intro_text() { - return get_string('configallowoverride2', 'admin'); + return get_string('configallowoverride2', 'core_admin'); } } diff --git a/admin/roles/classes/allow_switch_page.php b/admin/roles/classes/allow_switch_page.php index 3a5bfa11558..934bda365d2 100644 --- a/admin/roles/classes/allow_switch_page.php +++ b/admin/roles/classes/allow_switch_page.php @@ -52,10 +52,10 @@ class core_role_allow_switch_page extends core_role_allow_role_page { $a = new stdClass; $a->fromrole = $fromrole->localname; $a->targetrole = $targetrole->localname; - return get_string('allowroletoswitch', 'role', $a); + return get_string('allowroletoswitch', 'core_role', $a); } public function get_intro_text() { - return get_string('configallowswitch', 'admin'); + return get_string('configallowswitch', 'core_admin'); } } diff --git a/admin/roles/classes/capability_table_with_risks.php b/admin/roles/classes/capability_table_with_risks.php index b759b896b5f..ec934739613 100644 --- a/admin/roles/classes/capability_table_with_risks.php +++ b/admin/roles/classes/capability_table_with_risks.php @@ -58,7 +58,7 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit $this->strperms = array(); foreach ($this->allpermissions as $permname) { - $this->strperms[$permname] = get_string($permname, 'role'); + $this->strperms[$permname] = get_string($permname, 'core_role'); } $this->roleid = $roleid; @@ -142,7 +142,7 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit protected function add_header_cells() { global $OUTPUT; echo ''; + get_string('permission', 'core_role') . ' ' . $OUTPUT->help_icon('permission', 'core_role') . ''; echo ''; } diff --git a/admin/roles/classes/check_capability_table.php b/admin/roles/classes/check_capability_table.php index 6964819b6f3..ca390de0223 100644 --- a/admin/roles/classes/check_capability_table.php +++ b/admin/roles/classes/check_capability_table.php @@ -54,7 +54,7 @@ class core_role_check_capability_table extends core_role_capability_table_base { } protected function add_header_cells() { - echo ''; + echo ''; } protected function num_extra_columns() { diff --git a/admin/roles/classes/check_users_selector.php b/admin/roles/classes/check_users_selector.php index f30df0dbefe..5ac4c263bab 100644 --- a/admin/roles/classes/check_users_selector.php +++ b/admin/roles/classes/check_users_selector.php @@ -104,10 +104,10 @@ class core_role_check_users_selector extends user_selector_base { if ($search) { $groupname1 = get_string('enrolledusersmatching', 'enrol', $search); - $groupname2 = get_string('potusersmatching', 'role', $search); + $groupname2 = get_string('potusersmatching', 'core_role', $search); } else { $groupname1 = get_string('enrolledusers', 'enrol'); - $groupname2 = get_string('potusers', 'role'); + $groupname2 = get_string('potusers', 'core_role'); } if ($sql1) { diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php index 59d0738d73c..496df3ed57c 100644 --- a/admin/roles/classes/define_role_table_advanced.php +++ b/admin/roles/classes/define_role_table_advanced.php @@ -47,7 +47,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi $this->roleid = $roleid; parent::__construct($context, 'defineroletable', $roleid); $this->displaypermissions = $this->allpermissions; - $this->strperms[$this->allpermissions[CAP_INHERIT]] = get_string('notset', 'role'); + $this->strperms[$this->allpermissions[CAP_INHERIT]] = get_string('notset', 'core_role'); $this->allcontextlevels = array( CONTEXT_SYSTEM => get_string('coresystem'), @@ -102,11 +102,11 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi $this->role->shortname = textlib::specialtoascii($this->role->shortname); $this->role->shortname = textlib::strtolower(clean_param($this->role->shortname, PARAM_ALPHANUMEXT)); if (empty($this->role->shortname)) { - $this->errors['shortname'] = get_string('errorbadroleshortname', 'role'); + $this->errors['shortname'] = get_string('errorbadroleshortname', 'core_role'); } } if ($DB->record_exists_select('role', 'shortname = ? and id <> ?', array($this->role->shortname, $this->roleid))) { - $this->errors['shortname'] = get_string('errorexistsroleshortname', 'role'); + $this->errors['shortname'] = get_string('errorexistsroleshortname', 'core_role'); } // Role name. @@ -116,11 +116,11 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi // Hack: short names of standard roles are equal to archetypes, empty name means localised via lang packs. $archetypes = get_role_archetypes(); if (!isset($archetypes[$shortname]) and html_is_blank($this->role->name)) { - $this->errors['name'] = get_string('errorbadrolename', 'role'); + $this->errors['name'] = get_string('errorbadrolename', 'core_role'); } } if ($this->role->name !== '' and $DB->record_exists_select('role', 'name = ? and id <> ?', array($this->role->name, $this->roleid))) { - $this->errors['name'] = get_string('errorexistsrolename', 'role'); + $this->errors['name'] = get_string('errorexistsrolename', 'core_role'); } // Description. @@ -597,7 +597,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi } protected function print_show_hide_advanced_button() { - echo '

' . get_string('highlightedcellsshowdefault', 'role') . '

'; + echo '

' . get_string('highlightedcellsshowdefault', 'core_role') . '

'; echo '
'; echo ''; echo '
'; @@ -607,17 +607,17 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi global $OUTPUT; // Extra fields at the top of the page. echo '
'; - $this->print_field('shortname', get_string('roleshortname', 'role').' '.$OUTPUT->help_icon('roleshortname', 'role'), $this->get_shortname_field('shortname')); - $this->print_field('name', get_string('customrolename', 'role').' '.$OUTPUT->help_icon('customrolename', 'role'), $this->get_name_field('name')); - $this->print_field('edit-description', get_string('customroledescription', 'role').' '.$OUTPUT->help_icon('customroledescription', 'role'), + $this->print_field('shortname', get_string('roleshortname', 'core_role').' '.$OUTPUT->help_icon('roleshortname', 'core_role'), $this->get_shortname_field('shortname')); + $this->print_field('name', get_string('customrolename', 'core_role').' '.$OUTPUT->help_icon('customrolename', 'core_role'), $this->get_name_field('name')); + $this->print_field('edit-description', get_string('customroledescription', 'core_role').' '.$OUTPUT->help_icon('customroledescription', 'core_role'), $this->get_description_field('description')); - $this->print_field('menuarchetype', get_string('archetype', 'role').' '.$OUTPUT->help_icon('archetype', 'role'), $this->get_archetype_field('archetype')); - $this->print_field('', get_string('maybeassignedin', 'role'), $this->get_assignable_levels_control()); - $this->print_field('menuallowassign', get_string('allowassign', 'role'), $this->get_allow_role_control('assign')); - $this->print_field('menuallowoverride', get_string('allowoverride', 'role'), $this->get_allow_role_control('override')); - $this->print_field('menuallowswitch', get_string('allowswitch', 'role'), $this->get_allow_role_control('switch')); + $this->print_field('menuarchetype', get_string('archetype', 'core_role').' '.$OUTPUT->help_icon('archetype', 'core_role'), $this->get_archetype_field('archetype')); + $this->print_field('', get_string('maybeassignedin', 'core_role'), $this->get_assignable_levels_control()); + $this->print_field('menuallowassign', get_string('allowassign', 'core_role'), $this->get_allow_role_control('assign')); + $this->print_field('menuallowoverride', get_string('allowoverride', 'core_role'), $this->get_allow_role_control('override')); + $this->print_field('menuallowswitch', get_string('allowswitch', 'core_role'), $this->get_allow_role_control('switch')); if ($risks = $this->get_role_risks_info()) { - $this->print_field('', get_string('rolerisks', 'role'), $risks); + $this->print_field('', get_string('rolerisks', 'core_role'), $risks); } echo "
"; diff --git a/admin/roles/classes/define_role_table_basic.php b/admin/roles/classes/define_role_table_basic.php index 28c8969d7ed..14393e7ec7d 100644 --- a/admin/roles/classes/define_role_table_basic.php +++ b/admin/roles/classes/define_role_table_basic.php @@ -31,7 +31,7 @@ class core_role_define_role_table_basic extends core_role_define_role_table_adva public function __construct($context, $roleid) { parent::__construct($context, $roleid); $this->displaypermissions = array(CAP_ALLOW => $this->allpermissions[CAP_ALLOW]); - $this->stradvmessage = get_string('useshowadvancedtochange', 'role'); + $this->stradvmessage = get_string('useshowadvancedtochange', 'core_role'); $this->strallow = $this->strperms[$this->allpermissions[CAP_ALLOW]]; } diff --git a/admin/roles/classes/existing_role_holders.php b/admin/roles/classes/existing_role_holders.php index 719a4d77563..c08b2be3f6e 100644 --- a/admin/roles/classes/existing_role_holders.php +++ b/admin/roles/classes/existing_role_holders.php @@ -106,9 +106,9 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas if ($this->context->contextlevel == CONTEXT_SYSTEM) { // Special case in the System context. if ($search) { - return get_string('extusersmatching', 'role', $search); + return get_string('extusersmatching', 'core_role', $search); } else { - return get_string('extusers', 'role'); + return get_string('extusers', 'core_role'); } } $contexttype = get_contextlevel_name($this->context->contextlevel); @@ -117,15 +117,15 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas $a->search = $search; $a->contexttype = $contexttype; if ($numusers) { - return get_string('usersinthisxmatching', 'role', $a); + return get_string('usersinthisxmatching', 'core_role', $a); } else { - return get_string('noneinthisxmatching', 'role', $a); + return get_string('noneinthisxmatching', 'core_role', $a); } } else { if ($numusers) { - return get_string('usersinthisx', 'role', $contexttype); + return get_string('usersinthisx', 'core_role', $contexttype); } else { - return get_string('noneinthisx', 'role', $contexttype); + return get_string('noneinthisx', 'core_role', $contexttype); } } } @@ -137,9 +137,9 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas $a = new stdClass; $a->contextname = $contextname; $a->search = $search; - return get_string('usersfrommatching', 'role', $a); + return get_string('usersfrommatching', 'core_role', $a); } else { - return get_string('usersfrom', 'role', $contextname); + return get_string('usersfrom', 'core_role', $contextname); } } } diff --git a/admin/roles/classes/potential_assignees_below_course.php b/admin/roles/classes/potential_assignees_below_course.php index 630a054f15f..71664a19897 100644 --- a/admin/roles/classes/potential_assignees_below_course.php +++ b/admin/roles/classes/potential_assignees_below_course.php @@ -75,9 +75,9 @@ class core_role_potential_assignees_below_course extends core_role_assign_user_s } if ($search) { - $groupname = get_string('potusersmatching', 'role', $search); + $groupname = get_string('potusersmatching', 'core_role', $search); } else { - $groupname = get_string('potusers', 'role'); + $groupname = get_string('potusers', 'core_role'); } return array($groupname => $availableusers); diff --git a/admin/roles/classes/potential_assignees_course_and_above.php b/admin/roles/classes/potential_assignees_course_and_above.php index df7da23e9d6..ed3a1844621 100644 --- a/admin/roles/classes/potential_assignees_course_and_above.php +++ b/admin/roles/classes/potential_assignees_course_and_above.php @@ -66,9 +66,9 @@ class core_role_potential_assignees_course_and_above extends core_role_assign_us } if ($search) { - $groupname = get_string('potusersmatching', 'role', $search); + $groupname = get_string('potusersmatching', 'core_role', $search); } else { - $groupname = get_string('potusers', 'role'); + $groupname = get_string('potusers', 'core_role'); } return array($groupname => $availableusers); diff --git a/admin/roles/classes/view_role_definition_table.php b/admin/roles/classes/view_role_definition_table.php index 9dc2d434454..a39ff0c3563 100644 --- a/admin/roles/classes/view_role_definition_table.php +++ b/admin/roles/classes/view_role_definition_table.php @@ -51,7 +51,7 @@ class core_role_view_role_definition_table extends core_role_define_role_table_a if (empty($this->role->archetype)) { return get_string('none'); } else { - return get_string('archetype'.$this->role->archetype, 'role'); + return get_string('archetype'.$this->role->archetype, 'core_role'); } } @@ -95,7 +95,7 @@ class core_role_view_role_definition_table extends core_role_define_role_table_a } } - $risksurl = new moodle_url(get_docs_url(s(get_string('risks', 'role')))); + $risksurl = new moodle_url(get_docs_url(s(get_string('risks', 'core_role')))); foreach ($risks as $type => $risk) { $pixicon = new pix_icon('/i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin')); $risks[$type] = $OUTPUT->action_icon($risksurl, $pixicon, new popup_action('click', $risksurl)); @@ -125,7 +125,7 @@ class core_role_view_role_definition_table extends core_role_define_role_table_a $permname = $this->allpermissions[$perm]; $defaultperm = $this->allpermissions[$this->parentpermissions[$capability->name]]; if ($permname != $defaultperm) { - $default = get_string('defaultx', 'role', $this->strperms[$defaultperm]); + $default = get_string('defaultx', 'core_role', $this->strperms[$defaultperm]); } else { $default = " "; } diff --git a/admin/roles/permissions.php b/admin/roles/permissions.php index 1990ccaff50..cfff956177a 100644 --- a/admin/roles/permissions.php +++ b/admin/roles/permissions.php @@ -119,7 +119,7 @@ if ($capability && ($allowoverrides || ($allowsafeoverrides && is_safe_capabilit } else { $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'role'=>$overridableroles[$roleid], 'context'=>$contextname); - $message = get_string('confirmroleprevent', 'role', $a); + $message = get_string('confirmroleprevent', 'core_role', $a); $continueurl = new moodle_url($PAGE->url, array('contextid'=>$context->id, 'roleid'=>$roleid, 'capability'=>$capability->name, 'prevent'=>1, 'sesskey'=>sesskey(), 'confirm'=>1)); } @@ -131,7 +131,7 @@ if ($capability && ($allowoverrides || ($allowsafeoverrides && is_safe_capabilit redirect($PAGE->url); } else { $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'role'=>$overridableroles[$roleid], 'context'=>$contextname); - $message = get_string('confirmroleunprohibit', 'role', $a); + $message = get_string('confirmroleunprohibit', 'core_role', $a); $continueurl = new moodle_url($PAGE->url, array('contextid'=>$context->id, 'roleid'=>$roleid, 'capability'=>$capability->name, 'unprohibit'=>1, 'sesskey'=>sesskey(), 'confirm'=>1)); } @@ -157,7 +157,7 @@ if ($capability && ($allowoverrides || ($allowsafeoverrides && is_safe_capabilit redirect($PAGE->url); } else { $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'context'=>$contextname); - $message = get_string('roleallowinfo', 'role', $a); + $message = get_string('roleallowinfo', 'core_role', $a); } } if ($prohibit) { @@ -193,7 +193,7 @@ echo $OUTPUT->box_start('generalbox capbox'); if ($overridableroles) { $overrideurl = new moodle_url('/admin/roles/override.php', array('contextid' => $context->id)); $select = new single_select($overrideurl, 'roleid', $nameswithcounts); - $select->label = get_string('advancedoverride', 'role'); + $select->label = get_string('advancedoverride', 'core_role'); echo html_writer::tag('div', $OUTPUT->render($select), array('class'=>'advancedoverride')); } $table->display(); diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php index d7465b7b6ff..0935f6f8472 100644 --- a/admin/roles/usersroles.php +++ b/admin/roles/usersroles.php @@ -115,8 +115,8 @@ $overridableroles = get_overridable_roles($usercontext, ROLENAME_BOTH); // Print the header. $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $coursecontext)); -$straction = get_string('thisusersroles', 'role'); -$title = get_string('xroleassignments', 'role', $fullname); +$straction = get_string('thisusersroles', 'core_role'); +$title = get_string('xroleassignments', 'core_role', $fullname); // Course header. $PAGE->set_title($title); @@ -181,11 +181,11 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname, $al $a->fullname = $fullname; $a->contextlevel = $context->get_level_name(); if ($context->contextlevel == CONTEXT_SYSTEM) { - $strgoto = get_string('gotoassignsystemroles', 'role'); - $strcheck = get_string('checksystempermissionsfor', 'role', $a); + $strgoto = get_string('gotoassignsystemroles', 'core_role'); + $strcheck = get_string('checksystempermissionsfor', 'core_role', $a); } else { - $strgoto = get_string('gotoassignroles', 'role', $a); - $strcheck = get_string('checkuserspermissionshere', 'role', $a); + $strgoto = get_string('gotoassignroles', 'core_role', $a); + $strcheck = get_string('checkuserspermissionshere', 'core_role', $a); } echo ' ' . $stredit . ' ';
-

+

display() ?> 		@@ -205,7 +205,7 @@ if ($roleid) { -

+

display() ?>
' . - get_string('permission', 'role') . ' ' . $OUTPUT->help_icon('permission', 'role') . '' . get_string('risks', 'core_role') . '' . get_string('allowed', 'role') . '' . get_string('allowed', 'core_role') . '