Commit 29368b46 authored by Dries's avatar Dries

- Patch #620446 by Xano: rewrite permission titles and descriptions.

parent 23acf0eb
...@@ -305,11 +305,9 @@ function aggregator_permission() { ...@@ -305,11 +305,9 @@ function aggregator_permission() {
return array( return array(
'administer news feeds' => array( 'administer news feeds' => array(
'title' => t('Administer news feeds'), 'title' => t('Administer news feeds'),
'description' => t('Add, edit or delete news feeds that are aggregated to your site.'),
), ),
'access news feeds' => array( 'access news feeds' => array(
'title' => t('Access news feeds'), 'title' => t('View news feeds'),
'description' => t('View aggregated news feed items.'),
), ),
); );
} }
......
...@@ -66,7 +66,6 @@ function block_permission() { ...@@ -66,7 +66,6 @@ function block_permission() {
return array( return array(
'administer blocks' => array( 'administer blocks' => array(
'title' => t('Administer blocks'), 'title' => t('Administer blocks'),
'description' => t('Select which blocks are displayed, and arrange them on the page.'),
), ),
); );
} }
......
...@@ -70,18 +70,15 @@ function book_permission() { ...@@ -70,18 +70,15 @@ function book_permission() {
return array( return array(
'administer book outlines' => array( 'administer book outlines' => array(
'title' => t('Administer book outlines'), 'title' => t('Administer book outlines'),
'description' => t('Manage books through the administration panel.'),
), ),
'create new books' => array( 'create new books' => array(
'title' => t('Create new books'), 'title' => t('Create new books'),
'description' => t('Add new top-level books.'),
), ),
'add content to books' => array( 'add content to books' => array(
'title' => t('Add content to books'), 'title' => t('Add content and child pages to books'),
'description' => t('Add new content and child pages to books.'),
), ),
'access printer-friendly version' => array( 'access printer-friendly version' => array(
'title' => t('Access printer-friendly version'), 'title' => t('View printer-friendly books'),
'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'), 'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'),
), ),
); );
......
...@@ -276,20 +276,16 @@ function comment_node_type_delete($info) { ...@@ -276,20 +276,16 @@ function comment_node_type_delete($info) {
function comment_permission() { function comment_permission() {
return array( return array(
'administer comments' => array( 'administer comments' => array(
'title' => t('Administer comments'), 'title' => t('Administer comments and comment settings'),
'description' => t('Manage and approve comments, and configure comment administration settings.'),
), ),
'access comments' => array( 'access comments' => array(
'title' => t('Access comments'), 'title' => t('View comments'),
'description' => t('View comments attached to content.'),
), ),
'post comments' => array( 'post comments' => array(
'title' => t('Post comments'), 'title' => t('Post comments with approval'),
'description' => t('Add comments to content (approval required).'),
), ),
'post comments without approval' => array( 'post comments without approval' => array(
'title' => t('Post comments without approval'), 'title' => t('Post comments without approval'),
'description' => t('Add comments to content (no approval required).'),
), ),
); );
} }
......
...@@ -43,16 +43,13 @@ function contact_help($path, $arg) { ...@@ -43,16 +43,13 @@ function contact_help($path, $arg) {
function contact_permission() { function contact_permission() {
return array( return array(
'administer contact forms' => array( 'administer contact forms' => array(
'title' => t('Administer contact forms'), 'title' => t('Administer contact forms and contact form settings'),
'description' => t('Manage contact forms and configure contact form administrative settings.'),
), ),
'access site-wide contact form' => array( 'access site-wide contact form' => array(
'title' => t('Access site-wide contact form'), 'title' => t('Use the site-wide contact form'),
'description' => t('Send e-mails to administrator-defined recipients using the site-wide contact form.'),
), ),
'access user contact forms' => array( 'access user contact forms' => array(
'title' => t('Access user contact forms'), 'title' => t("Use users' personal contact forms"),
'description' => t('Send e-mails to users using their contact forms.'),
), ),
); );
} }
......
...@@ -147,7 +147,7 @@ function dashboard_permission() { ...@@ -147,7 +147,7 @@ function dashboard_permission() {
return array( return array(
'access dashboard' => array( 'access dashboard' => array(
'title' => t('View the administrative dashboard'), 'title' => t('View the administrative dashboard'),
'description' => t('Access the site-wide dashboard. Modifying the dashboard requires the "Administer blocks" permission.'), 'description' => t('Note: modifying the dashboard requires the !administer_blocks permission.', array('!administer_blocks' => l(t('Administer blocks'), 'admin/config/people/permissions', array('fragment' => 'module-block')))),
), ),
); );
} }
......
...@@ -272,8 +272,8 @@ function filter_admin_format_title($format) { ...@@ -272,8 +272,8 @@ function filter_admin_format_title($format) {
*/ */
function filter_permission() { function filter_permission() {
$perms['administer filters'] = array( $perms['administer filters'] = array(
'title' => t('Administer filters'), 'title' => t('Administer and use any text formats and filters'),
'description' => t('Manage text formats and filters, and use any of them, without restriction, when entering or editing content. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
); );
// Generate permissions for each text format. Warn the administrator that any // Generate permissions for each text format. Warn the administrator that any
...@@ -285,8 +285,8 @@ function filter_permission() { ...@@ -285,8 +285,8 @@ function filter_permission() {
// viewing this will have access to that page. // viewing this will have access to that page.
$format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name)); $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name));
$perms[$permission] = array( $perms[$permission] = array(
'title' => t("Use the %text_format text format", array('%text_format' => $format->name)), 'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement,)),
'description' => t('Use !text_format in forms when entering or editing content. %warning', array('!text_format' => $format_name_replacement, '%warning' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), 'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
); );
} }
} }
......
...@@ -365,7 +365,6 @@ function forum_permission() { ...@@ -365,7 +365,6 @@ function forum_permission() {
$perms = array( $perms = array(
'administer forums' => array( 'administer forums' => array(
'title' => t('Administer forums'), 'title' => t('Administer forums'),
'description' => t('Forum administration and settings.'),
), ),
); );
return $perms; return $perms;
......
...@@ -297,11 +297,9 @@ function locale_permission() { ...@@ -297,11 +297,9 @@ function locale_permission() {
return array( return array(
'administer languages' => array( 'administer languages' => array(
'title' => t('Administer languages'), 'title' => t('Administer languages'),
'description' => t('Manage the languages in which the website content and interface text may be displayed.'),
), ),
'translate interface' => array( 'translate interface' => array(
'title' => t('Translate the interface'), 'title' => t('Translate interface texts'),
'description' => t('Translate the text of the website interface.'),
), ),
); );
} }
......
...@@ -45,8 +45,7 @@ function menu_help($path, $arg) { ...@@ -45,8 +45,7 @@ function menu_help($path, $arg) {
function menu_permission() { function menu_permission() {
return array( return array(
'administer menu' => array( 'administer menu' => array(
'title' => t('Administer menu'), 'title' => t('Administer menus and menu items'),
'description' => t('Manage menus and menu items.'),
), ),
); );
} }
......
...@@ -1401,39 +1401,32 @@ function node_permission() { ...@@ -1401,39 +1401,32 @@ function node_permission() {
$perms = array( $perms = array(
'administer content types' => array( 'administer content types' => array(
'title' => t('Administer content types'), 'title' => t('Administer content types'),
'description' => t('Manage content types and content type administration settings.'),
), ),
'administer nodes' => array( 'administer nodes' => array(
'title' => t('Administer nodes'), 'title' => t('Administer content'),
'description' => t('Manage all information associated with site content, such as author, publication date and current revision. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
'access content' => array( 'access content' => array(
'title' => t('Access content'), 'title' => t('View published content'),
'description' => t('View published content.'),
), ),
'access content overview' => array( 'access content overview' => array(
'title' => t('Access content overview'), 'title' => t('Access the content overview page'),
'description' => t('Access the content overview page.'),
), ),
'bypass node access' => array( 'bypass node access' => array(
'title' => t('Bypass node access'), 'title' => t('Bypass content access control'),
'description' => t('View, edit and delete all site content. Users with this permission will bypass any content-related access control. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => t('View, edit and delete all content regardless of permission restrictions. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
'view revisions' => array( 'view revisions' => array(
'title' => t('View revisions'), 'title' => t('View content revisions'),
'description' => t('View content revisions.'),
), ),
'revert revisions' => array( 'revert revisions' => array(
'title' => t('Revert revisions'), 'title' => t('Revert content revisions'),
'description' => t('Replace content with an older revision.'),
), ),
'delete revisions' => array( 'delete revisions' => array(
'title' => t('Delete revisions'), 'title' => t('Delete content revisions'),
'description' => t('Delete content revisions.'),
), ),
'view own unpublished content' => array( 'view own unpublished content' => array(
'title' => t('View own unpublished content'), 'title' => t('View own unpublished content'),
'description' => t('View unpublished content created by the user'),
), ),
); );
...@@ -2529,24 +2522,19 @@ function node_list_permissions($type) { ...@@ -2529,24 +2522,19 @@ function node_list_permissions($type) {
// Build standard list of node permissions for this type. // Build standard list of node permissions for this type.
$perms = array( $perms = array(
"create $type content" => array( "create $type content" => array(
'title' => t('Create %type_name content', array('%type_name' => $info->name)), 'title' => t('Create new %type_name content', array('%type_name' => $info->name)),
'description' => t('Create new %type_name content.', array('%type_name' => $info->name)),
), ),
"edit own $type content" => array( "edit own $type content" => array(
'title' => t('Edit own %type_name content', array('%type_name' => $info->name)), 'title' => t('Edit own %type_name content', array('%type_name' => $info->name)),
'description' => t('Edit %type_name content created by the user.', array('%type_name' => $info->name)),
), ),
"edit any $type content" => array( "edit any $type content" => array(
'title' => t('Edit any %type_name content', array('%type_name' => $info->name)), 'title' => t('Edit any %type_name content', array('%type_name' => $info->name)),
'description' => t('Edit any %type_name content, regardless of its author.', array('%type_name' => $info->name)),
), ),
"delete own $type content" => array( "delete own $type content" => array(
'title' => t('Delete own %type_name content', array('%type_name' => $info->name)), 'title' => t('Delete own %type_name content', array('%type_name' => $info->name)),
'description' => t('Delete %type_name content created by the user.', array('%type_name' => $info->name)),
), ),
"delete any $type content" => array( "delete any $type content" => array(
'title' => t('Delete any %type_name content', array('%type_name' => $info->name)), 'title' => t('Delete any %type_name content', array('%type_name' => $info->name)),
'description' => t('Delete any %type_name content, regardless of its author.', array('%type_name' => $info->name)),
), ),
); );
......
...@@ -42,11 +42,9 @@ function path_permission() { ...@@ -42,11 +42,9 @@ function path_permission() {
return array( return array(
'administer url aliases' => array( 'administer url aliases' => array(
'title' => t('Administer URL aliases'), 'title' => t('Administer URL aliases'),
'description' => t('Manage URL aliases across the entire website.'),
), ),
'create url aliases' => array( 'create url aliases' => array(
'title' => t('Create URL aliases'), 'title' => t('Create and edit URL aliases'),
'description' => t('Manage URL aliases on content.'),
), ),
); );
} }
......
...@@ -27,7 +27,7 @@ function php_permission() { ...@@ -27,7 +27,7 @@ function php_permission() {
return array( return array(
'use PHP for settings' => array( 'use PHP for settings' => array(
'title' => t('Use PHP for settings'), 'title' => t('Use PHP for settings'),
'description' => t('Enter PHP in settings fields where PHP is allowed. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
); );
} }
......
...@@ -64,15 +64,12 @@ function poll_permission() { ...@@ -64,15 +64,12 @@ function poll_permission() {
$perms = array( $perms = array(
'vote on polls' => array( 'vote on polls' => array(
'title' => t('Vote on polls'), 'title' => t('Vote on polls'),
'description' => t('Cast votes on polls.'),
), ),
'cancel own vote' => array( 'cancel own vote' => array(
'title' => t('Cancel own vote'), 'title' => t('Cancel and change own votes'),
'description' => t('Retract and optionally change own votes.'),
), ),
'inspect all votes' => array( 'inspect all votes' => array(
'title' => t('Inspect all votes'), 'title' => t('View voting results'),
'description' => t('View voting results.'),
), ),
); );
......
...@@ -144,15 +144,12 @@ function search_permission() { ...@@ -144,15 +144,12 @@ function search_permission() {
return array( return array(
'administer search' => array( 'administer search' => array(
'title' => t('Administer search'), 'title' => t('Administer search'),
'description' => t('Configure search administration settings.'),
), ),
'search content' => array( 'search content' => array(
'title' => t('Search content'), 'title' => t('Use search'),
'description' => t('Search website content.'),
), ),
'use advanced search' => array( 'use advanced search' => array(
'title' => t('Use advanced search'), 'title' => t('Use advanced search'),
'description' => t('Limit search results with additional criteria, such as specific content types. Could have performance implications.'),
), ),
); );
} }
......
...@@ -21,15 +21,12 @@ function shortcut_permission() { ...@@ -21,15 +21,12 @@ function shortcut_permission() {
return array( return array(
'administer shortcuts' => array( 'administer shortcuts' => array(
'title' => t('Administer shortcuts'), 'title' => t('Administer shortcuts'),
'description' => t('Manage all shortcut and shortcut sets.'),
), ),
'customize shortcut links' => array( 'customize shortcut links' => array(
'title' => t('Customize shortcut links'), 'title' => t('Customize own shortcuts'),
'description' => t("Edit, add and delete the links in shortcut set the user is using."),
), ),
'switch shortcut sets' => array( 'switch shortcut sets' => array(
'title' => t('Choose a different shortcut set'), 'title' => t('Select own shortcut set'),
'description' => t('Choose which set of shortcuts are displayed for the user.')
), ),
); );
} }
......
...@@ -63,8 +63,8 @@ function simpletest_menu() { ...@@ -63,8 +63,8 @@ function simpletest_menu() {
function simpletest_permission() { function simpletest_permission() {
return array( return array(
'administer unit tests' => array( 'administer unit tests' => array(
'title' => t('Administer unit tests'), 'title' => t('Administer tests'),
'description' => t('Manage and run automated testing. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
); );
} }
......
...@@ -91,17 +91,14 @@ function statistics_exit() { ...@@ -91,17 +91,14 @@ function statistics_exit() {
*/ */
function statistics_permission() { function statistics_permission() {
return array( return array(
'access statistics' => array(
'title' => t('Access statistics'),
'description' => t('View content access statistics.'),
),
'administer statistics' => array( 'administer statistics' => array(
'title' => t('Administer statistics'), 'title' => t('Administer statistics'),
'description' => t('Configure statistics settings.'), ),
'access statistics' => array(
'title' => t('View content access statistics'),
), ),
'view post access counter' => array( 'view post access counter' => array(
'title' => t('View post access counter'), 'title' => t('View content hits'),
'description' => t('View the total number of times a piece of content has been accessed.'),
), ),
); );
} }
......
...@@ -198,39 +198,31 @@ function system_permission() { ...@@ -198,39 +198,31 @@ function system_permission() {
return array( return array(
'administer site configuration' => array( 'administer site configuration' => array(
'title' => t('Administer site configuration'), 'title' => t('Administer site configuration'),
'description' => t('Configure site-wide settings such as module or theme administration settings.'),
), ),
'administer software updates' => array( 'administer software updates' => array(
'title' => t('Administer software updates'), 'title' => t('Run software updates'),
'description' => t('Run the update.php script.'),
), ),
'administer actions' => array( 'administer actions' => array(
'title' => t('Administer actions'), 'title' => t('Administer actions'),
'description' => t('Manage the actions defined for your site.'),
), ),
'administer files' => array( 'administer files' => array(
'title' => t('Administer files'), 'title' => t('Administer user-uploaded files'),
'description' => t('Manage user-uploaded files.'),
), ),
'access administration pages' => array( 'access administration pages' => array(
'title' => t('Access administration pages'), 'title' => t('Use the administration pages and help'),
'description' => t('View the administration panel and browse the help system.'),
), ),
'access contextual links' => array( 'access contextual links' => array(
'title' => t('Access contextual links'), 'title' => t('Use contextual links'),
'description' => t('Use contextual links to perform actions related to elements on a page.'), 'description' => t('Use contextual links to perform actions related to elements on a page.'),
), ),
'access site in maintenance mode' => array( 'access site in maintenance mode' => array(
'title' => t('Access site in maintenance mode'), 'title' => t('Use the site in maintenance mode'),
'description' => t('Log in when the site is in maintenance mode.'),
), ),
'access site reports' => array( 'access site reports' => array(
'title' => t('Access site reports'), 'title' => t('View site reports'),
'description' => t('View reports from system logs and other status information.'),
), ),
'block IP addresses' => array( 'block IP addresses' => array(
'title' => t('Block IP addresses'), 'title' => t('Block IP addresses'),
'description' => t('Block IP addresses from accessing your site.'),
), ),
); );
} }
......
...@@ -12,21 +12,18 @@ ...@@ -12,21 +12,18 @@
function taxonomy_permission() { function taxonomy_permission() {
$permissions = array( $permissions = array(
'administer taxonomy' => array( 'administer taxonomy' => array(
'title' => t('Administer taxonomy'), 'title' => t('Administer vocabularies and terms'),
'description' => t('Manage taxonomy vocabularies and terms.'),
), ),
); );
foreach (taxonomy_get_vocabularies() as $vocabulary) { foreach (taxonomy_get_vocabularies() as $vocabulary) {
$permissions += array( $permissions += array(
'edit terms in ' . $vocabulary->vid => array( 'edit terms in ' . $vocabulary->vid => array(
'title' => t('Edit terms in %vocabulary', array('%vocabulary' => $vocabulary->name)), 'title' => t('Edit terms in %vocabulary', array('%vocabulary' => $vocabulary->name)),
'description' => t('Edit terms in the %vocabulary vocabulary.', array('%vocabulary' => $vocabulary->name)),
), ),
); );
$permissions += array( $permissions += array(
'delete terms in ' . $vocabulary->vid => array( 'delete terms in ' . $vocabulary->vid => array(
'title' => t('Delete terms in %vocabulary', array('%vocabulary' => $vocabulary->name)), 'title' => t('Delete terms from %vocabulary', array('%vocabulary' => $vocabulary->name)),
'description' => t('Delete terms in the %vocabulary vocabulary.', array('%vocabulary' => $vocabulary->name)),
), ),
); );
} }
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
function toolbar_permission() { function toolbar_permission() {
return array( return array(
'access toolbar' => array( 'access toolbar' => array(
'title' => t('Access administration toolbar'), 'title' => t('Use the administration toolbar'),
'description' => t('Access the persistent administration toolbar displayed on all pages.'),
), ),
); );
} }
......
...@@ -89,7 +89,6 @@ function translation_permission() { ...@@ -89,7 +89,6 @@ function translation_permission() {
return array( return array(
'translate content' => array( 'translate content' => array(
'title' => t('Translate content'), 'title' => t('Translate content'),
'description' => t('Translate website content.'),
), ),
); );
} }
......
...@@ -45,12 +45,10 @@ function upload_theme() { ...@@ -45,12 +45,10 @@ function upload_theme() {
function upload_permission() { function upload_permission() {
return array( return array(
'upload files' => array( 'upload files' => array(
'title' => t('Upload files'), 'title' => t('Upload files for content'),
'description' => t('Attach images and other files to content.'),
), ),
'view uploaded files' => array( 'view uploaded files' => array(
'title' => t('View uploaded files'), 'title' => t('View and download uploaded files'),
'description' => t('View and download files attached to content.'),
), ),
); );
} }
......
...@@ -726,27 +726,25 @@ function user_permission() { ...@@ -726,27 +726,25 @@ function user_permission() {
return array( return array(
'administer permissions' => array( 'administer permissions' => array(
'title' => t('Administer permissions'), 'title' => t('Administer permissions'),
'description' => t('Manage the permissions assigned to user roles. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
'administer users' => array( 'administer users' => array(
'title' => t('Administer users'), 'title' => t('Administer users'),
'description' => t('Manage or block users, and manage their role assignments. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
'access user profiles' => array( 'access user profiles' => array(
'title' => t('Access user profiles'), 'title' => t('View user profiles'),
'description' => t('View profiles of users on the site, which may contain personal information.'),
), ),
'change own username' => array( 'change own username' => array(
'title' => t('Change own username'), 'title' => t('Change own username'),
'description' => t('Select a different username.'),
), ),
'cancel account' => array( 'cancel account' => array(
'title' => t('Cancel account'), 'title' => t('Cancel own user account'),
'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured <a href="@user-settings-url">user settings</a>.', array('@user-settings-url' => url('admin/config/people/accounts'))), 'description' => t('Note: content may be kept, unpublished, deleted or transfered to the %anonymous-name user depending on the configured <a href="@user-settings-url">user settings</a>.', array('%anonymous-name' => variable_get('anonymous', t('Anonymous')), '@user-settings-url' => url('admin/config/people/accounts'))),
), ),
'select account cancellation method' => array( 'select account cancellation method' => array(
'title' => t('Select method for cancelling own account'), 'title' => t('Select method for cancelling own account'),
'description' => t('Select the method for cancelling own user account. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
), ),
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment