mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Merged MDL-12801 from MOODLE_18_STABLE (improve roles terminology for system)

Browse Source
This commit is contained in:
moodler 2008-01-09 06:50:42 +00:00
parent 6a8fd52898
commit 8871caf0ac
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/en_utf8/help/assignroles.html
View File

@ -11,8 +11,10 @@ in that role, for the current context and all
Contexts:
</p>
<ol>
<li>Site/System</li>
<li>System (the entire installation)</li>
<li>Front page (the "site course")</li>
<li>Course Categories</li>
<li>Course Sub-categories</li>
<li>Courses</li>
<li>Blocks and Activities</li>
</ol>

3
lang/en_utf8/help/contexts.html
View File

@ -7,7 +7,8 @@
inherited from "higher" to "lower" contexts.</p>
<ol>
<li>Site (System)</li>
<li>System (the entire installation)</li>
<li>Front page (the "site course")</li>
<li>Course Categories</li>
<li>Course Sub-categories</li>
<li>Courses</li>

8
lang/en_utf8/help/permissions.html
View File

@ -18,7 +18,7 @@ to one of four values:
gets assigned to someone (eg in a course) that has this permission for
a capability, then the actual permission they'll have will just be
the same as they already had at higher-level contexts (eg categories
or site level). Ultimately, if permission is never allowed at any
or system level). Ultimately, if permission is never allowed at any
level, then the user will have no permission for that capability.
</dd>
@ -42,9 +42,9 @@ to one of four values:
deny permissions to a role in a way that can NOT be overridden at
any lower context. A good example of when you might need this is
when an admin wants to prohibit one person from starting new
discussions in any forum on the whole site. In this case they
discussions in any forum on the whole system. In this case they
can create a role with that capability set to "Prohibit" and then
assign it to that user in the site context.
assign it to that user in the system context.
</dd>
</dl>
@ -64,7 +64,7 @@ to one of four values:
<p> For example, a student has two roles in a course, one that allows
them to start new discussions, one that prevents them. In this case,
we check the categories and the site contexts, looking for another
we check the categories and the system contexts, looking for another
defined permission to help us decide. If we don't find one, then
permission is PREVENT by default (because the two settings cancelled
each other out, and thus you have no permission).

2
lang/en_utf8/help/roles.html
View File

@ -1,7 +1,7 @@
<h1>Roles</h1>
<p>
A role is a collection of permissions defined for the whole site
A role is a collection of permissions defined for the whole system
that you can assign to specific users in specific contexts.
</p>

2
lang/en_utf8/moodle.php
View File

@ -249,7 +249,7 @@ $string['copyingsitefiles'] = 'Copying site files used in course';
$string['copyinguserfiles'] = 'Copying user files';
$string['copyingzipfile'] = 'Copying zip file';
$string['copyrightnotice'] = 'Copyright notice';
$string['coresystem'] = 'Core system';
$string['coresystem'] = 'System';
$string['cost'] = 'Cost';
$string['costdefault'] = 'Default cost';
$string['counteditems'] = '$a->count $a->items';

6
lang/en_utf8/role.php
View File

@ -8,7 +8,7 @@ $string['allowassign'] = 'Allow role assignments';
$string['allowoverride'] = 'Allow role overrides';
$string['assignroles'] = 'Assign roles';
$string['assignrolesin'] = 'Assign roles in $a';
$string['assignglobalroles'] = 'Assign global roles';
$string['assignglobalroles'] = 'Assign system roles';
$string['blog:create'] = 'Create new blog entries';
$string['blog:manageentries'] = 'Edit and manage entries';
$string['blog:manageofficialtags'] = 'Manage official tags';
@ -74,8 +74,12 @@ $string['errorbadroleshortname'] = 'Incorrect role name';
$string['errorexistsrolename'] = 'Role name already exists';
$string['errorexistsroleshortname'] = 'Role name already exists';
$string['existingusers'] = '$a existing users';
<<<<<<< role.php
$string['globalrole'] = 'Global role';
$string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire site, including the front page and all the courses.';
=======
$string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire system, including the front page and all the courses.';
>>>>>>> 1.23.2.11
$string['inherit'] = 'Inherit';
$string['legacy:admin'] = 'LEGACY ROLE: Administrator';
$string['legacy:coursecreator'] = 'LEGACY ROLE: Course Creator';