diff --git a/core/includes/menu.inc b/core/includes/menu.inc index a03a70c..095513e 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -655,7 +655,7 @@ function _menu_check_access(&$item, $map) { * If an item's callback is check_plain(), $item['options']['html'] becomes * TRUE. * $item['description'] is computed using $item['description_callback'] if - * specified, otherwise it is translated using t(). + * specified; otherwise it is translated using t(). * When doing link translation and the $item['options']['attributes']['title'] * (link title attribute) matches the description, it is translated as well. */ diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 55d27f6..a6f7dd3 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -693,9 +693,9 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) { * - "title arguments": Arguments to send to t() or your custom callback, * with path component substitution as described above. * - "description": The untranslated description of the menu item. - * - "description callback": Function to generate the description; defaults to + * - description callback: Function to generate the description; defaults to * t(). If you require only the raw string to be output, set this to FALSE. - * - "description arguments": Arguments to send to t() or your custom callback, + * - description arguments: Arguments to send to t() or your custom callback, * with path component substitution as described above. * - "page callback": The function to call to display a web page when the user * visits the path. If omitted, the parent menu item's callback will be used diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module index 356a0f7..8f24a4f 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.module +++ b/core/modules/system/tests/modules/menu_test/menu_test.module @@ -24,7 +24,7 @@ function menu_test_menu() { ); // This item uses system_admin_menu_block_page() to list child items. $items['menu_callback_description'] = array( - 'title' => 'Menu Item Title', + 'title' => 'Menu item title', 'page callback' => 'system_admin_menu_block_page', 'description' => 'Menu item description parent', 'access arguments' => array('access content'), @@ -32,13 +32,13 @@ function menu_test_menu() { 'file path' => drupal_get_path('module', 'system'), ); $items['menu_callback_description/description-plain'] = array( - 'title' => 'Menu Item with a regular description', + 'title' => 'Menu item with a regular description', 'page callback' => 'menu_test_callback', 'description' => 'Menu item description text', 'access arguments' => array('access content'), ); $items['menu_callback_description/description-callback'] = array( - 'title' => 'Menu Item with a description set with a callback', + 'title' => 'Menu item with a description set with a callback', 'page callback' => 'menu_test_callback', 'description callback' => 'check_plain', 'description arguments' => array('Menu item description arguments'),