diff options
28 files changed, 340 insertions, 299 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 266a814c6..c2ec2eb81 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -349,7 +349,8 @@ function menu_execute_active_handler() { } /** - * Handles dynamic path translation and menu access control. + * Handles dynamic path translation, title and description translation and + * menu access control. * * When a user arrives on a page such as node/5, this function determines * what "5" corresponds to, by inspecting the page's menu path definition, @@ -360,6 +361,10 @@ function menu_execute_active_handler() { * contain these dynamic arguments, translating node/%node to node/5. * This operation is called MENU_RENDER_LINK. * + * Translation of menu item titles and descriptions are done here to + * allow for storage of English strings in the database, and be able to + * generate menus in the language required to generate the current page. + * * @param $item * A menu item object * @param $map @@ -434,6 +439,35 @@ function _menu_translate(&$item, $map, $operation = MENU_HANDLE_REQUEST) { } } $item->alias = TRUE; + + // Translate the title to allow storage of English title strings + // in the database, yet be able to display them in the language + // required to generate the page in. + $callback = $item->title_callback; + // t() is a special case. Since it is used very close to all the time, + // we handle it directly instead of using indirect, slower methods. + if ($callback == 't') { + if (empty($item->title_arguments)) { + $item->title = t($item->title); + } + else { + $item->title = t($item->title, unserialize($item->title_arguments)); + } + } + else { + if (empty($item->title_arguments)) { + $item->title = $callback($item->title); + } + else { + $item->title = call_user_func_array($callback, unserialize($item->title_arguments)); + } + } + + // Translate description, see the motivation above. + if (!empty($item->description)) { + $item->description = t($item->description); + } + return $map; } @@ -816,6 +850,8 @@ function menu_rebuild() { '_mleft' => 0, '_mright' => 0, 'block callback' => '', + 'title arguments' => array(), + 'title callback' => 't', 'description' => '', 'position' => '', 'attributes' => '', @@ -826,6 +862,8 @@ function menu_rebuild() { ); $link_path = $item['to_arg_functions'] ? $path : drupal_get_path_alias($path); + $item['title arguments'] = empty($item['title arguments']) ? '' : serialize($item['title arguments']); + if ($item['attributes']) { $item['attributes'] = serialize($item['attributes']); } @@ -845,17 +883,19 @@ function menu_rebuild() { } db_query("INSERT INTO {menu} ( mid, pid, path, load_functions, to_arg_functions, - access_callback, access_arguments, page_callback, page_arguments, fit, - number_parts, visible, parents, depth, has_children, tab, title, parent, + access_callback, access_arguments, page_callback, page_arguments, + title_callback, title_arguments, fit, number_parts, visible, + parents, depth, has_children, tab, title, parent, type, mleft, mright, block_callback, description, position, link_path, attributes, query, fragment, absolute, html) - VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, - '%s', %d, %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', - '%s', '%s', '%s', '%s', %d, %d)", + VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', + %d, %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', + '%s', '%s', '%s', '%s', '%s', %d, %d)", $item['_mid'], $item['_pid'], $path, $item['load_functions'], $item['to_arg_functions'], $item['access callback'], serialize($item['access arguments']), $item['page callback'], - serialize($item['page arguments']), $item['_fit'], + serialize($item['page arguments']), $item['title callback'], + $item['title arguments'], $item['_fit'], $item['_number_parts'], $item['_visible'], $item['_parents'], $item['_depth'], $has_children, $item['_tab'], $item['title'], $item['parent'], $item['type'], $item['_mleft'], @@ -866,8 +906,6 @@ function menu_rebuild() { } } - - function menu_renumber(&$tree) { foreach ($tree as $key => $element) { if (!isset($tree[$key]['_mleft'])) { diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index a544a286e..10b69c1b5 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -53,13 +53,13 @@ function aggregator_theme() { */ function aggregator_menu() { $items['admin/content/aggregator'] = array( - 'title' => t('News aggregator'), - 'description' => t("Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized."), + 'title' => 'News aggregator', + 'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.", 'page callback' => 'aggregator_admin_overview', 'access arguments' => array('administer news feeds'), ); $items['admin/content/aggregator/add/feed'] = array( - 'title' => t('Add feed'), + 'title' => 'Add feed', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_feed'), 'access arguments' => array('administer news feeds'), @@ -67,7 +67,7 @@ function aggregator_menu() { 'parent' => 'admin/content/aggregator', ); $items['admin/content/aggregator/add/category'] = array( - 'title' => t('Add category'), + 'title' => 'Add category', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_category'), 'access arguments' => array('administer news feeds'), @@ -75,26 +75,26 @@ function aggregator_menu() { 'parent' => 'admin/content/aggregator', ); $items['admin/content/aggregator/remove/%aggregator_feed'] = array( - 'title' => t('Remove items'), + 'title' => 'Remove items', 'page callback' => 'aggregator_admin_remove_feed', 'page arguments' => array(4), 'access arguments' => array('administer news feeds'), 'type' => MENU_CALLBACK, ); $items['admin/content/aggregator/update/%aggregator_feed'] = array( - 'title' => t('Update items'), + 'title' => 'Update items', 'page callback' => 'aggregator_admin_refresh_feed', 'page arguments' => array(4), 'access arguments' => array('administer news feeds'), 'type' => MENU_CALLBACK, ); $items['admin/content/aggregator/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/aggregator/settings'] = array( - 'title' => t('Settings'), + 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_admin_settings'), 'type' => MENU_LOCAL_TASK, @@ -102,28 +102,28 @@ function aggregator_menu() { 'access arguments' => array('administer news feeds'), ); $items['aggregator'] = array( - 'title' => t('News aggregator'), + 'title' => 'News aggregator', 'page callback' => 'aggregator_page_last', 'access arguments' => array('access news feeds'), 'weight' => 5, ); $items['aggregator/sources'] = array( - 'title' => t('Sources'), + 'title' => 'Sources', 'page callback' => 'aggregator_page_sources', 'access arguments' => array('access news feeds')); $items['aggregator/categories'] = array( - 'title' => t('Categories'), + 'title' => 'Categories', 'page callback' => 'aggregator_page_categories', 'access callback' => '_aggregator_has_categories', ); $items['aggregator/rss'] = array( - 'title' => t('RSS feed'), + 'title' => 'RSS feed', 'page callback' => 'aggregator_page_rss', 'access arguments' => array('access news feeds'), 'type' => MENU_CALLBACK, ); $items['aggregator/opml'] = array( - 'title' => t('OPML feed'), + 'title' => 'OPML feed', 'page callback' => 'aggregator_page_opml', 'access arguments' => array('access news feeds'), 'type' => MENU_CALLBACK, @@ -138,19 +138,19 @@ function aggregator_menu() { 'access arguments' => array('access news feeds'), ); $items[$path .'/view'] = array( - 'title' => t('View'), + 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[$path .'/categorize'] = array( - 'title' => t('Categorize'), + 'title' => 'Categorize', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_page_category'), 'access arguments' => array('administer news feeds', 2), 'type' => MENU_LOCAL_TASK, ); $items[$path .'/configure'] = array( - 'title' => t('Configure'), + 'title' => 'Configure', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_category', 2), 'access arguments' => array('administer news feeds', 2), @@ -163,19 +163,19 @@ function aggregator_menu() { 'type' => MENU_CALLBACK, ); $items['aggregator/sources/%aggregator_feed/view'] = array( - 'title' => t('View'), + 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['aggregator/sources/%aggregator_feed/categorize'] = array( - 'title' => t('Categorize'), + 'title' => 'Categorize', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_page_source'), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, ); $items['aggregator/sources/%aggregator_feed/configure'] = array( - 'title' => t('Configure'), + 'title' => 'Configure', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_feed', 2), 'access arguments' => array('administer news feeds'), @@ -183,14 +183,14 @@ function aggregator_menu() { 'weight' => 1, ); $items['admin/content/aggregator/edit/feed/%aggregator_feed'] = array( - 'title' => t('Edit feed'), + 'title' => 'Edit feed', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_feed', 5), 'access arguments' => array('administer news feeds'), 'type' => MENU_CALLBACK, ); $items['admin/content/aggregator/edit/category/%aggregator_category'] = array( - 'title' => t('Edit category'), + 'title' => 'Edit category', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_category', 5), 'access arguments' => array('administer news feeds'), diff --git a/modules/block/block.module b/modules/block/block.module index 958f66199..04b2d2e24 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -71,36 +71,37 @@ function block_perm() { */ function block_menu() { $items['admin/build/block'] = array( - 'title' => t('Blocks'), - 'description' => t('Configure what block content appears in your site\'s sidebars and other regions.'), + 'title' => 'Blocks', + 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_admin_display'), 'access arguments' => array('administer blocks'), ); $items['admin/build/block/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/build/block/configure'] = array( - 'title' => t('Configure block'), + 'title' => 'Configure block', 'page arguments' => array('block_admin_configure'), 'type' => MENU_CALLBACK, ); $items['admin/build/block/delete'] = array( - 'title' => t('Delete block'), + 'title' => 'Delete block', 'page arguments' => array('block_box_delete'), 'type' => MENU_CALLBACK, ); $items['admin/build/block/add'] = array( - 'title' => t('Add block'), + 'title' => 'Add block', 'page arguments' => array('block_add_block_form'), 'type' => MENU_LOCAL_TASK, ); $default = variable_get('theme_default', 'garland'); foreach (list_themes() as $key => $theme) { $items['admin/build/block/list/'. $key] = array( - 'title' => t('!key settings', array('!key' => $theme->info['name'])), + 'title' => '!key settings', + 'title arguments' => array('!key' => $theme->info['name']), 'page arguments' => array('block_admin_display', $key), 'type' => $key == $default ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, 'weight' => $key == $default ? -10 : 0, diff --git a/modules/blog/blog.module b/modules/blog/blog.module index ca6ffb0d3..639c3db20 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -253,13 +253,13 @@ function blog_link($type, $node = NULL, $teaser = FALSE) { */ function blog_menu() { $items['blog'] = array( - 'title' => t('Blogs'), + 'title' => 'Blogs', 'page callback' => 'blog_page', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['blog/%user_current'] = array( - 'title' => t('My blog'), + 'title' => 'My blog', 'page arguments' => array(1), 'access arguments' => array('edit own blog'), ); diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index d003ff421..7b8ace852 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -553,14 +553,14 @@ function blogapi_admin_settings() { function blogapi_menu() { $items['blogapi/rsd'] = array( - 'title' => t('RSD'), + 'title' => 'RSD', 'page callback' => 'blogapi_rsd', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); $items['admin/settings/blogapi'] = array( - 'title' => t('Blog APIs'), - 'description' => t('Configure which content types and engines external blog clients can use.'), + 'title' => 'Blog APIs', + 'description' => 'Configure which content types and engines external blog clients can use.', 'page callback' => 'drupal_get_form', 'page arguments' => array('blogapi_admin_settings'), 'access arguments' => array('administer site configuration'), diff --git a/modules/book/book.module b/modules/book/book.module index 5c1c2e0bd..7c0399c95 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -104,24 +104,24 @@ function book_link($type, $node = NULL, $teaser = FALSE) { */ function book_menu() { $items['admin/content/book'] = array( - 'title' => t('Books'), - 'description' => t("Manage site's books and orphaned book pages."), + 'title' => 'Books', + 'description' => "Manage site's books and orphaned book pages.", 'page callback' => 'book_admin', 'access arguments' => array('administer nodes'), ); $items['admin/content/book/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/content/book/orphan'] = array( - 'title' => t('Orphan pages'), + 'title' => 'Orphan pages', 'page callback' => 'drupal_get_form', 'page arguments' => array('book_admin_orphan'), 'type' => MENU_LOCAL_TASK, 'weight' => 8, ); $items['book'] = array( - 'title' => t('Books'), + 'title' => 'Books', 'page callback' => 'book_render', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, @@ -132,7 +132,7 @@ function book_menu() { 'type' => MENU_CALLBACK, ); $items['node/%node/outline'] = array( - 'title' => t('Outline'), + 'title' => 'Outline', 'page callback' => 'drupal_get_form', 'page arguments' => array('book_outline', 1), 'access callback' => '_book_outline_access', diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 1357a3462..df097ac19 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -197,33 +197,33 @@ function _comment_view_access($node, $cid) { */ function comment_menu() { $items['admin/content/comment'] = array( - 'title' => t('Comments'), - 'description' => t('List and edit site comments and the comment moderation queue.'), + 'title' => 'Comments', + 'description' => 'List and edit site comments and the comment moderation queue.', 'page callback' => 'comment_admin', 'access arguments' => array('administer comments'), ); // Tabs: $items['admin/content/comment/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); // Subtabs: $items['admin/content/comment/list/new'] = array( - 'title' => t('Published comments'), + 'title' => 'Published comments', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/comment/list/approval'] = array( - 'title' => t('Approval queue'), + 'title' => 'Approval queue', 'page arguments' => array('approval'), 'type' => MENU_LOCAL_TASK, ); $items['admin/content/comment/settings'] = array( - 'title' => t('Settings'), + 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('comment_admin_settings'), 'weight' => 10, @@ -231,20 +231,20 @@ function comment_menu() { ); $items['comment/delete'] = array( - 'title' => t('Delete comment'), + 'title' => 'Delete comment', 'page callback' => 'comment_delete', 'access arguments' => array('administer comments'), 'type' => MENU_CALLBACK, ); $items['comment/edit'] = array( - 'title' => t('Edit comment'), + 'title' => 'Edit comment', 'page callback' => 'comment_edit', 'access arguments' => array('post comments'), 'type' => MENU_CALLBACK, ); $items['comment/reply/%node'] = array( - 'title' => t('Reply to comment'), + 'title' => 'Reply to comment', 'page callback' => 'comment_reply', 'page arguments' => array(2), 'access callback' => 'node_access', @@ -252,7 +252,7 @@ function comment_menu() { 'type' => MENU_CALLBACK, ); $items['node/%node/%'] = array( - 'title' => t('View'), + 'title' => 'View', 'page callback' => 'node_page_view', 'page arguments' => array(1, 2), 'access callback' => '_comment_view_access', diff --git a/modules/contact/contact.module b/modules/contact/contact.module index e22bd1a55..e8cb12851 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -42,50 +42,50 @@ function contact_perm() { */ function contact_menu() { $items['admin/build/contact'] = array( - 'title' => t('Contact form'), - 'description' => t('Create a system contact form and set up categories for the form to use.'), + 'title' => 'Contact form', + 'description' => 'Create a system contact form and set up categories for the form to use.', 'page callback' => 'contact_admin_categories', 'access arguments' => array('administer site configuration'), ); $items['admin/build/contact/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'page callback' => 'contact_admin_categories', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/build/contact/add'] = array( - 'title' => t('Add category'), + 'title' => 'Add category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit'), 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); $items['admin/build/contact/edit'] = array( - 'title' => t('Edit contact category'), + 'title' => 'Edit contact category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit'), 'type' => MENU_CALLBACK, ); $items['admin/build/contact/delete'] = array( - 'title' => t('Delete contact'), + 'title' => 'Delete contact', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_delete'), 'type' => MENU_CALLBACK, ); $items['admin/build/contact/settings'] = array( - 'title' => t('Settings'), + 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_settings'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); $items['contact'] = array( - 'title' => t('Contact'), + 'title' => 'Contact', 'page callback' => 'contact_site_page', 'access arguments' => array('access site-wide contact form'), 'type' => MENU_SUGGESTED_ITEM, ); $items['user/%user/contact'] = array( - 'title' => t('Contact'), + 'title' => 'Contact', 'page callback' => 'contact_user_page', 'page arguments' => array(1), 'type' => MENU_LOCAL_TASK, diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index 08bc9c0e2..120752464 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -43,32 +43,32 @@ function dblog_theme() { */ function dblog_menu() { $items['admin/settings/logging/dblog'] = array( - 'title' => t('Database logging'), - 'description' => t('Settings for logging to the Drupal database logs. This is the most common method for small to medium sites on shared hosting. The logs are viewable from the admin pages.'), + 'title' => 'Database logging', + 'description' => 'Settings for logging to the Drupal database logs. This is the most common method for small to medium sites on shared hosting. The logs are viewable from the admin pages.', 'page callback' => 'drupal_get_form', 'page arguments' => array('dblog_admin_settings'), ); $items['admin/logs/dblog'] = array( - 'title' => t('Recent log entries'), - 'description' => t('View events that have recently been logged.'), + 'title' => 'Recent log entries', + 'description' => 'View events that have recently been logged.', 'page callback' => 'dblog_overview', 'weight' => -1, ); $items['admin/logs/page-not-found'] = array( - 'title' => t("Top 'page not found' errors"), - 'description' => t("View 'page not found' errors (404s)."), + 'title' => "Top 'page not found' errors", + 'description' => "View 'page not found' errors (404s).", 'page callback' => 'dblog_top', 'page arguments' => array('page not found'), ); $items['admin/logs/access-denied'] = array( - 'title' => t("Top 'access denied' errors"), - 'description' => t("View 'access denied' errors (403s)."), + 'title' => "Top 'access denied' errors", + 'description' => "View 'access denied' errors (403s).", 'page callback' => 'dblog_top', 'page arguments' => array('access denied'), ); $items['admin/logs/event/%'] = array( - 'title' => t('Details'), + 'title' => 'Details', 'page callback' => 'dblog_event', 'page arguments' => array(3), 'type' => MENU_CALLBACK, diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index a75b48478..67d526d5e 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -349,22 +349,22 @@ function drupal_auth($username, $password, $server = FALSE) { */ function drupal_menu() { $items['admin/settings/sites-registry'] = array( - 'title' => t('Sites registry'), - 'description' => t('Register with another Drupal site (drupal.org by default) for statistics sharing, or set up your server to be a central server for registrations.'), + 'title' => 'Sites registry', + 'description' => 'Register with another Drupal site (drupal.org by default) for statistics sharing, or set up your server to be a central server for registrations.', 'page callback' => 'drupal_get_form', 'page arguments' => array('drupal_sites_registry_settings'), 'access arguments' => array('administer site configuration'), ); $items['admin/settings/distributed-authentication'] = array( - 'title' => t('Distributed authentication'), - 'description' => t('Allow your site to accept logins from other Drupal sites such as drupal.org.'), + 'title' => 'Distributed authentication', + 'description' => 'Allow your site to accept logins from other Drupal sites such as drupal.org.', 'page callback' => 'drupal_get_form', 'page arguments' => array('drupal_distributed_authentication_settings'), 'access arguments' => array('administer site configuration'), ); if (variable_get('drupal_authentication_service', 0)) { $items['drupal'] = array( - 'title' => t('Drupal'), + 'title' => 'Drupal', 'page callback' => 'drupal_page_help', 'access callback' => TRUE, 'type' => MENU_SUGGESTED_ITEM, diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 3b12f6371..3c0a82117 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -72,31 +72,31 @@ function filter_theme() { */ function filter_menu() { $items['admin/settings/filters'] = array( - 'title' => t('Input formats'), - 'description' => t('Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.'), + 'title' => 'Input formats', + 'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_overview'), 'access arguments' => array('administer filters'), ); $items['admin/settings/filters/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/settings/filters/add'] = array( - 'title' => t('Add input format'), + 'title' => 'Add input format', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_format_form'), 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); $items['admin/settings/filters/delete'] = array( - 'title' => t('Delete input format'), + 'title' => 'Delete input format', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_delete'), 'type' => MENU_CALLBACK, ); $items['filter/tips'] = array( - 'title' => t('Compose tips'), + 'title' => 'Compose tips', 'page callback' => 'filter_tips_long', 'access callback' => TRUE, 'type' => MENU_SUGGESTED_ITEM, @@ -108,19 +108,19 @@ function filter_menu() { ); $items['admin/settings/filters/%filter_format/list'] = array( - 'title' => t('View'), + 'title' => 'View', 'page arguments' => array('filter_admin_format_form', 3), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 0, ); $items['admin/settings/filters/%filter_format/configure'] = array( - 'title' => t('Configure'), + 'title' => 'Configure', 'page arguments' => array('filter_admin_configure', 3), 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); $items['admin/settings/filters/%filter_format/order'] = array( - 'title' => t('Rearrange'), + 'title' => 'Rearrange', 'page arguments' => array('filter_admin_order', 3), 'type' => MENU_LOCAL_TASK, 'weight' => 2, diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 8cc65f98b..cce09b291 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -56,42 +56,42 @@ function forum_theme() { */ function forum_menu() { $items['node/add/forum'] = array( - 'title' => t('Forum topic'), + 'title' => 'Forum topic', 'access arguments' => array('create forum topics'), ); $items['forum'] = array( - 'title' => t('Forums'), + 'title' => 'Forums', 'page callback' => 'forum_page', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['admin/content/forum'] = array( - 'title' => t('Forums'), - 'description' => t('Control forums and their hierarchy and change forum settings.'), + 'title' => 'Forums', + 'description' => 'Control forums and their hierarchy and change forum settings.', 'page callback' => 'forum_overview', 'access arguments' => array('administer forums'), ); $items['admin/content/forum/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/forum/add/container'] = array( - 'title' => t('Add container'), + 'title' => 'Add container', 'page callback' => 'forum_form_main', 'page arguments' => array('container'), 'type' => MENU_LOCAL_TASK, 'parent' => 'admin/content/forum', ); $items['admin/content/forum/add/forum'] = array( - 'title' => t('Add forum'), + 'title' => 'Add forum', 'page callback' => 'forum_form_main', 'page arguments' => array('forum'), 'type' => MENU_LOCAL_TASK, 'parent' => 'admin/content/forum', ); $items['admin/content/forum/settings'] = array( - 'title' => t('Settings'), + 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('forum_admin_settings'), 'weight' => 5, @@ -103,13 +103,13 @@ function forum_menu() { 'type' => MENU_CALLBACK, ); $items['admin/content/forum/edit/container/%forum_term'] = array( - 'title' => t('Edit container'), + 'title' => 'Edit container', 'page callback' => 'forum_form_main', 'page arguments' => array('container', 5), 'type' => MENU_CALLBACK, ); $items['admin/content/forum/edit/forum/%forum_term'] = array( - 'title' => t('Edit forum'), + 'title' => 'Edit forum', 'page callback' => 'forum_form_main', 'page arguments' => array('forum', 5), 'type' => MENU_CALLBACK, diff --git a/modules/help/help.module b/modules/help/help.module index 86cb40245..1333a7e89 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -11,7 +11,7 @@ */ function help_menu() { $items['admin/help'] = array( - 'title' => t('Help'), + 'title' => 'Help', 'page callback' => 'help_main', 'access arguments' => array('access administration pages'), 'weight' => 9, @@ -19,7 +19,7 @@ function help_menu() { foreach (module_implements('help', TRUE) as $module) { $items['admin/help/'. $module] = array( - 'title' => t($module), + 'title' => $module, 'page callback' => 'help_page', 'type' => MENU_CALLBACK, ); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index a419af94a..bca48fb3c 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -48,20 +48,20 @@ function locale_help($section) { function locale_menu() { // Main admin menu item $items['admin/build/locale'] = array( - 'title' => t('Languages'), - 'description' => t('Configure languages and user interface translation.'), + 'title' => 'Languages', + 'description' => 'Configure languages and user interface translation.', 'page callback' => 'locale_admin_manage', 'access arguments' => array('administer locales'), ); // Top level tabs $items['admin/build/locale/language'] = array( - 'title' => t('Manage languages'), + 'title' => 'Manage languages', 'weight' => -10, 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/build/locale/string'] = array( - 'title' => t('Manage interface strings'), + 'title' => 'Manage interface strings', 'page callback' => 'locale_string_search', 'weight' => 10, 'type' => MENU_LOCAL_TASK, @@ -70,24 +70,24 @@ function locale_menu() { // Manage languages subtabs $items['admin/build/locale/language/overview'] = array( - 'title' => t('List'), + 'title' => 'List', 'weight' => 0, 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/build/locale/language/add'] = array( - 'title' => t('Add language'), + 'title' => 'Add language', 'page callback' => 'locale_admin_manage_add', 'weight' => 5, 'type' => MENU_LOCAL_TASK, ); $items['admin/build/locale/language/configure'] = array( - 'title' => t('Configure'), + 'title' => 'Configure', 'page callback' => 'locale_admin_manage_configure', 'weight' => 10, 'type' => MENU_LOCAL_TASK, ); $items['admin/build/locale/language/edit/%'] = array( - 'title' => t('Edit language'), + 'title' => 'Edit language', 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_admin_manage_edit', 5), 'type' => MENU_CALLBACK, @@ -95,18 +95,18 @@ function locale_menu() { // Manage interface translations subtabs $items['admin/build/locale/string/search'] = array( - 'title' => t('Search'), + 'title' => 'Search', 'weight' => 0, 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/build/locale/string/import'] = array( - 'title' => t('Import'), + 'title' => 'Import', 'page callback' => 'locale_admin_import', 'weight' => 10, 'type' => MENU_LOCAL_TASK, ); $items['admin/build/locale/string/export'] = array( - 'title' => t('Export'), + 'title' => 'Export', 'page callback' => 'locale_admin_export', 'weight' => 20, 'type' => MENU_LOCAL_TASK, @@ -114,20 +114,20 @@ function locale_menu() { // Language related callbacks $items['admin/build/locale/language/delete'] = array( - 'title' => t('Confirm'), + 'title' => 'Confirm', 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_admin_manage_delete_form'), 'type' => MENU_CALLBACK, ); // String related callbacks $items['admin/build/locale/string/edit/%'] = array( - 'title' => t('Edit string'), + 'title' => 'Edit string', 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_admin_string_edit', 5), 'type' => MENU_CALLBACK, ); $items['admin/build/locale/string/delete/%'] = array( - 'title' => t('Delete string'), + 'title' => 'Delete string', 'page callback' => 'locale_admin_string_delete', 'page arguments' => array(5), 'type' => MENU_CALLBACK, diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 0f97771ee..a24f717c9 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -43,47 +43,47 @@ function menu_perm() { */ function menu_menu() { $items['admin/build/menu'] = array( - 'title' => t('Menus'), - 'description' => t("Control your site's navigation menu, primary links and secondary links. as well as rename and reorganize menu items."), + 'title' => 'Menus', + 'description' => "Control your site's navigation menu, primary links and secondary links. as well as rename and reorganize menu items.", 'page callback' => 'menu_overview', 'access callback' => 'user_access', 'access arguments' => array('administer menu'), ); $items['admin/build/menu/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/build/menu/item/disable'] = array( - 'title' => t('Disable menu item'), + 'title' => 'Disable menu item', 'page callback' => 'menu_flip_item', 'page arguments' => array('0'), 'type' => MENU_CALLBACK, ); $items['admin/build/menu/item/enable'] = array( - 'title' => t('Enable menu item'), + 'title' => 'Enable menu item', 'page callback' => 'menu_flip_item', 'page arguments' => array('1'), 'type' => MENU_CALLBACK, ); $items['admin/build/menu/item/add'] = array( - 'title' => t('Add menu item'), + 'title' => 'Add menu item', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_edit_item_form', 'add'), 'parent' => 'admin/build/menu', 'type' => MENU_LOCAL_TASK); $items['admin/build/menu/item/edit'] = array( - 'title' => t('Edit menu item'), + 'title' => 'Edit menu item', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_edit_item_form', 'edit'), 'type' => MENU_CALLBACK); $items['admin/build/menu/item/reset'] = array( - 'title' => t('Reset menu item'), + 'title' => 'Reset menu item', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_reset_item'), 'type' => MENU_CALLBACK); $items['admin/build/menu/item/delete'] = array( - 'title' => t('Delete menu item'), + 'title' => 'Delete menu item', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_item_delete_form'), 'type' => MENU_CALLBACK); @@ -97,26 +97,26 @@ function menu_menu() { return $items; /* $items[] = array('path' => 'admin/build/menu/menu/add', - 'title' => t('Add menu'), + 'title' => 'Add menu', 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_edit_menu_form', 'add'), 'access' => user_access('administer menu'), 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/build/menu/menu/edit', - 'title' => t('Edit menu'), + 'title' => 'Edit menu', 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_edit_menu_form', 'edit'), 'access' => user_access('administer menu'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/build/menu/menu/delete', - 'title' => t('Delete menu'), + 'title' => 'Delete menu', 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_item_delete_form'), 'access' => user_access('administer menu'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/build/menu/settings', - 'title' => t('Settings'), + 'title' => 'Settings', 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_configure'), 'type' => MENU_LOCAL_TASK, diff --git a/modules/node/node.module b/modules/node/node.module index 4b5acd975..2fd272645 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1122,8 +1122,8 @@ function _node_revision_access($node) { */ function node_menu() { $items['admin/content'] = array( - 'title' => t('Content management'), - 'description' => t("Manage your site's content."), + 'title' => 'Content management', + 'description' => "Manage your site's content.", 'position' => 'left', 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', @@ -1131,71 +1131,71 @@ function node_menu() { ); $items['admin/content/node'] = array( - 'title' => t('Content'), - 'description' => t("View, edit, and delete your site's content."), + 'title' => 'Content', + 'description' => "View, edit, and delete your site's content.", 'page callback' => 'node_admin_content', 'access arguments' => array('administer nodes'), ); $items['admin/content/node/overview'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); if (module_exists('search')) { $items['admin/content/search'] = array( - 'title' => t('Search content'), - 'description' => t('Search content by keyword.'), + 'title' => 'Search content', + 'description' => 'Search content by keyword.', 'page callback' => 'node_admin_search', 'access arguments' => array('administer nodes'), ); } $items['admin/content/node-settings'] = array( - 'title' => t('Post settings'), - 'description' => t('Control posting behavior, such as teaser length, requiring previews before posting, and the number of posts on the front page.'), + 'title' => 'Post settings', + 'description' => 'Control posting behavior, such as teaser length, requiring previews before posting, and the number of posts on the front page.', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_configure'), 'access arguments' => array('administer nodes'), ); $items['admin/content/node-settings/rebuild'] = array( - 'title' => t('rebuild permissions'), + 'title' => 'Rebuild permissions', 'page arguments' => array('node_configure_rebuild_confirm'), 'type' => MENU_CALLBACK, ); $items['admin/content/types'] = array( - 'title' => t('Content types'), - 'description' => t('Manage posts by content type, including default status, front page promotion, etc.'), + 'title' => 'Content types', + 'description' => 'Manage posts by content type, including default status, front page promotion, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), ); $items['admin/content/types/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/types/add'] = array( - 'title' => t('Add content type'), + 'title' => 'Add content type', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form'), 'type' => MENU_LOCAL_TASK, ); $items['node'] = array( - 'title' => t('Content'), + 'title' => 'Content', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), 'type' => MENU_MODIFIABLE_BY_ADMIN, ); $items['node/add'] = array( - 'title' => t('Create content'), + 'title' => 'Create content', 'page callback' => 'system_admin_menu_block_page', 'access callback' => '_node_add_access', 'weight' => 1, ); $items['rss.xml'] = array( - 'title' => t('RSS feed'), + 'title' => 'RSS feed', 'page callback' => 'node_feed', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, @@ -1213,13 +1213,13 @@ function node_menu() { 'description' => $type->description, ); $items['admin/content/types/'. $type_url_str] = array( - 'title' => t($type->name), + 'title' => $type->name, 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form', $type), 'type' => MENU_CALLBACK, ); $items['admin/content/types/'. $type_url_str .'/delete'] = array( - 'title' => t('Delete'), + 'title' => 'Delete', 'page arguments' => array('node_type_delete_confirm', $type), 'type' => MENU_CALLBACK, ); @@ -1227,32 +1227,32 @@ function node_menu() { } } $items['node/%node'] = array( - 'title' => t('View'), + 'title' => 'View', 'page callback' => 'node_page_view', 'page arguments' => array(1), 'access callback' => 'node_access', 'access arguments' => array('view', 1), 'type' => MENU_CALLBACK); $items['node/%node/view'] = array( - 'title' => t('View'), + 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items['node/%node/edit'] = array( - 'title' => t('Edit'), + 'title' => 'Edit', 'page callback' => 'node_page_edit', 'page arguments' => array(1), 'access arguments' => array('update', 1), 'weight' => 1, 'type' => MENU_LOCAL_TASK); $items['node/%node/delete'] = array( - 'title' => t('Delete'), + 'title' => 'Delete', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_delete_confirm', 1), 'access arguments' => array('delete', 1), 'weight' => 1, 'type' => MENU_CALLBACK); $items['node/%node/revisions'] = array( - 'title' => t('Revisions'), + 'title' => 'Revisions', 'page callback' => 'node_revisions', 'access callback' => '_node_revision_access', 'access arguments' => array(1), diff --git a/modules/path/path.module b/modules/path/path.module index 5baa45a82..1fa588f69 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -38,30 +38,30 @@ function path_help($section) { */ function path_menu() { $items['admin/build/path'] = array( - 'title' => t('URL aliases'), - 'description' => t('Change your site\'s URL paths by aliasing them.'), + 'title' => 'URL aliases', + 'description' => "Change your site's URL paths by aliasing them.", 'page callback' => 'path_admin', 'access arguments' => array('administer url aliases'), ); $items['admin/build/path/edit'] = array( - 'title' => t('Edit alias'), + 'title' => 'Edit alias', 'page callback' => 'drupal_get_form', 'page arguments' => array('path_admin_edit'), 'type' => MENU_CALLBACK, ); $items['admin/build/path/delete'] = array( - 'title' => t('Delete alias'), + 'title' => 'Delete alias', 'page callback' => 'drupal_get_form', 'page arguments' => array('path_admin_delete_confirm'), 'type' => MENU_CALLBACK, ); $items['admin/build/path/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/build/path/add'] = array( - 'title' => t('Add alias'), + 'title' => 'Add alias', 'page callback' => 'drupal_get_form', 'page arguments' => array('path_admin_edit'), 'access arguments' => array('administer url aliases'), diff --git a/modules/poll/poll.module b/modules/poll/poll.module index f1e457c4c..afe3c59fd 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -250,21 +250,21 @@ function _poll_menu_access($node, $perm, $inspect_allowvotes) { */ function poll_menu() { $items['poll'] = array( - 'title' => t('Polls'), + 'title' => 'Polls', 'page callback' => 'poll_page', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['poll/cancel/%node'] = array( - 'title' => t('Cancel'), + 'title' => 'Cancel', 'page callback' => 'poll_cancel', 'page arguments' => array(2), 'access arguments' => array('cancel own vote'), 'type' => MENU_CALLBACK, ); $items['node/%node/votes'] = array( - 'title' => t('Votes'), + 'title' => 'Votes', 'page callback' => 'poll_votes', 'access callback' => '_poll_menu_access', 'access arguments' => array(1, 'inspect all votes', FALSE), @@ -272,7 +272,7 @@ function poll_menu() { 'type' => MENU_LOCAL_TASK, ); $items['node/%node/results'] = array( - 'title' => t('Results'), + 'title' => 'Results', 'page callback' => 'poll_results', 'access callback' => '_poll_menu_access', 'access arguments' => array(1, 'access content', TRUE), diff --git a/modules/profile/profile.module b/modules/profile/profile.module index e023962ff..93fccc078 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -69,41 +69,41 @@ function profile_theme() { */ function profile_menu() { $items['profile'] = array( - 'title' => t('User list'), + 'title' => 'User list', 'page callback' => 'profile_browse', 'access arguments' => array('access user profiles'), 'type' => MENU_SUGGESTED_ITEM, ); $items['admin/user/profile'] = array( - 'title' => t('Profiles'), - 'description' => t('Create customizable fields for your users.'), + 'title' => 'Profiles', + 'description' => 'Create customizable fields for your users.', 'page callback' => 'profile_admin_overview', ); $items['admin/user/profile/add'] = array( - 'title' => t('Add field'), + 'title' => 'Add field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK, ); $items['admin/user/profile/autocomplete'] = array( - 'title' => t('Profile category autocomplete'), + 'title' => 'Profile category autocomplete', 'page callback' => 'profile_admin_settings_autocomplete', 'type' => MENU_CALLBACK, ); $items['admin/user/profile/edit'] = array( - 'title' => t('Edit field'), + 'title' => 'Edit field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK, ); $items['admin/user/profile/delete'] = array( - 'title' => t('Delete field'), + 'title' => 'Delete field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_delete'), 'type' => MENU_CALLBACK, ); $items['profile/autocomplete'] = array( - 'title' => t('Profile autocomplete'), + 'title' => 'Profile autocomplete', 'page callback' => 'profile_autocomplete', 'access arguments' => array('access user profiles'), 'type' => MENU_CALLBACK, diff --git a/modules/search/search.module b/modules/search/search.module index be06edcce..fde62393a 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -158,36 +158,37 @@ function search_block($op = 'list', $delta = 0) { */ function search_menu() { $items['search'] = array( - 'title' => t('Search'), + 'title' => 'Search', 'page callback' => 'search_view', 'access arguments' => array('search content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['admin/settings/search'] = array( - 'title' => t('Search settings'), - 'description' => t('Configure relevance settings for search and other indexing options'), + 'title' => 'Search settings', + 'description' => 'Configure relevance settings for search and other indexing options', 'page callback' => 'drupal_get_form', 'page arguments' => array('search_admin_settings'), 'access arguments' => array('administer search'), 'type' => MENU_NORMAL_ITEM, ); $items['admin/settings/search/wipe'] = array( - 'title' => t('Clear index'), + 'title' => 'Clear index', 'page callback' => 'drupal_get_form', 'page arguments' => array('search_wipe_confirm'), 'access arguments' => array('administer search'), 'type' => MENU_CALLBACK, ); $items['admin/logs/search'] = array( - 'title' => t('Top search phrases'), - 'description' => t('View most popular search phrases.'), + 'title' => 'Top search phrases', + 'description' => 'View most popular search phrases.', 'page callback' => 'watchdog_top', 'page arguments' => array('search'), ); foreach (module_implements('search') as $name) { $items['search/'. $name .'/%'] = array( - 'title' => module_invoke($name, 'search', 'name', TRUE), + 'title callback' => 'module_invoke', + 'title arguments' => array($name, 'search', 'name', TRUE), 'page callback' => 'search_view', 'page arguments' => array($name), 'access callback' => '_search_menu', diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 61c089626..dbbf238b2 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -101,42 +101,42 @@ function statistics_link($type, $node = NULL, $teaser = FALSE) { */ function statistics_menu() { $items['admin/logs/hits'] = array( - 'title' => t('Recent hits'), - 'description' => t('View pages that have recently been visited.'), + 'title' => 'Recent hits', + 'description' => 'View pages that have recently been visited.', 'page callback' => 'statistics_recent_hits', 'access arguments' => array('access statistics'), ); $items['admin/logs/pages'] = array( - 'title' => t('Top pages'), - 'description' => t('View pages that have been hit frequently.'), + 'title' => 'Top pages', + 'description' => 'View pages that have been hit frequently.', 'page callback' => 'statistics_top_pages', 'access arguments' => array('access statistics'), 'weight' => 1, ); $items['admin/logs/visitors'] = array( - 'title' => t('Top visitors'), - 'description' => t('View visitors that hit many pages.'), + 'title' => 'Top visitors', + 'description' => 'View visitors that hit many pages.', 'page callback' => 'statistics_top_visitors', 'access arguments' => array('access statistics'), 'weight' => 2, ); $items['admin/logs/referrers'] = array( - 'title' => t('Top referrers'), - 'description' => t('View top referrers.'), + 'title' => 'Top referrers', + 'description' => 'View top referrers.', 'page callback' => 'statistics_top_referrers', 'access arguments' => array('access statistics'), ); $items['admin/logs/access/%'] = array( - 'title' => t('Details'), - 'description' => t('View access log.'), + 'title' => 'Details', + 'description' => 'View access log.', 'page callback' => 'statistics_access_log', 'page arguments' => array(3), 'access arguments' => array('access statistics'), 'type' => MENU_CALLBACK, ); $items['admin/logs/settings'] = array( - 'title' => t('Access log settings'), - 'description' => t('Control details about what and how your site logs.'), + 'title' => 'Access log settings', + 'description' => 'Control details about what and how your site logs.', 'page callback' => 'drupal_get_form', 'page arguments' => array('statistics_access_logging_settings'), 'access arguments' => array('administer site configuration'), @@ -144,7 +144,7 @@ function statistics_menu() { 'weight' => 3, ); $items['user/%user/track/navigation'] = array( - 'title' => t('Track page visits'), + 'title' => 'Track page visits', 'page callback' => 'statistics_user_tracker', 'access callback' => 'user_access', 'access arguments' => array('access statistics'), @@ -152,7 +152,7 @@ function statistics_menu() { 'weight' => 2, ); $items['node/%node/track'] = array( - 'title' => t('Track'), + 'title' => 'Track', 'page callback' => 'statistics_node_tracker', 'access callback' => 'user_access', 'access arguments' => array('access statistics'), diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module index 8e55664e1..e11f151f3 100644 --- a/modules/syslog/syslog.module +++ b/modules/syslog/syslog.module @@ -25,8 +25,8 @@ function syslog_help($section) { function syslog_menu() { $items['admin/settings/logging/syslog'] = array( - 'title' => t('Syslog'), - 'description' => t('Settings for syslog logging. Syslog is a system administration logging tool, where messages are routed by facility and severity. It is more suitable for medium to large sites, and would not be suitable for shared hosting environments.'), + 'title' => 'Syslog', + 'description' => 'Settings for syslog logging. Syslog is a system administration logging tool, where messages are routed by facility and severity. It is more suitable for medium to large sites, and would not be suitable for shared hosting environments.', 'page callback' => 'drupal_get_form', 'page arguments' => array('syslog_admin_settings'), ); diff --git a/modules/system/system.module b/modules/system/system.module index 55282f3a8..fab91e2d6 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -124,53 +124,53 @@ function system_elements() { */ function system_menu() { $items['system/files'] = array( - 'title' => t('File download'), + 'title' => 'File download', 'page callback' => 'file_download', 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); $items['admin'] = array( - 'title' => t('Administer'), + 'title' => 'Administer', 'access arguments' => array('access administration pages'), 'page callback' => 'system_main_admin_page', 'weight' => 9, ); $items['admin/compact'] = array( - 'title' => t('Compact mode'), + 'title' => 'Compact mode', 'page callback' => 'system_admin_compact_page', 'type' => MENU_CALLBACK, ); $items['admin/by-task'] = array( - 'title' => t('By task'), + 'title' => 'By task', 'page callback' => 'system_main_admin_page', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/by-module'] = array( - 'title' => t('By module'), + 'title' => 'By module', 'page callback' => 'system_admin_by_module', 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); // menu items that are basically just menu blocks $items['admin/settings'] = array( - 'title' => t('Site configuration'), - 'description' => t('Adjust basic site configuration options.'), + 'title' => 'Site configuration', + 'description' => 'Adjust basic site configuration options.', 'position' => 'right', 'weight' => -5, 'page callback' => 'system_settings_overview', 'access arguments' => array('administer site configuration'), ); $items['admin/build'] = array( - 'title' => t('Site building'), - 'description' => t('Control how your site looks and feels.'), + 'title' => 'Site building', + 'description' => 'Control how your site looks and feels.', 'position' => 'right', 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('administer site configuration'), ); $items['admin/settings/admin'] = array( - 'title' => t('Administration theme'), - 'description' => t('Settings for how your administrative pages should look.'), + 'title' => 'Administration theme', + 'description' => 'Settings for how your administrative pages should look.', 'position' => 'left', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_admin_theme_settings'), @@ -178,25 +178,25 @@ function system_menu() { ); // Themes: $items['admin/build/themes'] = array( - 'title' => t('Themes'), - 'description' => t('Change which theme your site uses or allows users to set.'), + 'title' => 'Themes', + 'description' => 'Change which theme your site uses or allows users to set.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_themes_form'), ); $items['admin/build/themes/select'] = array( - 'title' => t('List'), - 'description' => t('Select the default theme.'), + 'title' => 'List', + 'description' => 'Select the default theme.', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, ); $items['admin/build/themes/settings'] = array( - 'title' => t('Configure'), + 'title' => 'Configure', 'page arguments' => array('system_theme_settings'), 'type' => MENU_LOCAL_TASK, ); // Theme configuration subtabs $items['admin/build/themes/settings/global'] = array( - 'title' => t('Global settings'), + 'title' => 'Global settings', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, ); @@ -213,117 +213,117 @@ function system_menu() { // Modules: $items['admin/build/modules'] = array( - 'title' => t('Modules'), - 'description' => t('Enable or disable add-on modules for your site.'), + 'title' => 'Modules', + 'description' => 'Enable or disable add-on modules for your site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_modules'), ); $items['admin/build/modules/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/build/modules/list/confirm'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_CALLBACK, ); $items['admin/build/modules/uninstall'] = array( - 'title' => t('Uninstall'), + 'title' => 'Uninstall', 'page arguments' => array('system_modules_uninstall'), 'type' => MENU_LOCAL_TASK, ); $items['admin/build/modules/uninstall/confirm'] = array( - 'title' => t('Uninstall'), + 'title' => 'Uninstall', 'type' => MENU_CALLBACK, ); // Settings: $items['admin/settings/site-information'] = array( - 'title' => t('Site information'), - 'description' => t('Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.'), + 'title' => 'Site information', + 'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_information_settings'), ); $items['admin/settings/error-reporting'] = array( - 'title' => t('Error reporting'), - 'description' => t('Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.'), + 'title' => 'Error reporting', + 'description' => 'Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_error_reporting_settings'), ); $items['admin/settings/logging'] = array( - 'title' => t('Logging and alerts'), - 'description' => t('Settings for logging and alerts modules. Various modules can route Drupal\'s system events to different destination, such as syslog, database, email, ...etc.'), + 'title' => 'Logging and alerts', + 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destination, such as syslog, database, email, ...etc.", 'page callback' => 'system_logging_overview', ); $items['admin/settings/performance'] = array( - 'title' => t('Performance'), - 'description' => t('Enable or disable page caching for anonymous users, and enable or disable CSS preprocessor.'), + 'title' => 'Performance', + 'description' => 'Enable or disable page caching for anonymous users, and enable or disable CSS preprocessor.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_performance_settings'), ); $items['admin/settings/file-system'] = array( - 'title' => t('File system'), - 'description' => t('Tell Drupal where to store uploaded files and how they are accessed.'), + 'title' => 'File system', + 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_file_system_settings'), ); $items['admin/settings/image-toolkit'] = array( - 'title' => t('Image toolkit'), - 'description' => t('Choose which image toolkit to use if you have installed optional toolkits.'), + 'title' => 'Image toolkit', + 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_image_toolkit_settings'), ); $items['admin/content/rss-publishing'] = array( - 'title' => t('RSS publishing'), - 'description' => t('Configure the number of items per feed and whether feeds should be titles/teasers/full-text.'), + 'title' => 'RSS publishing', + 'description' => 'Configure the number of items per feed and whether feeds should be titles/teasers/full-text.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_rss_feeds_settings'), ); $items['admin/settings/date-time'] = array( - 'title' => t('Date and time'), - 'description' => t("Settings for how Drupal displays date and time, as well as the system's default timezone."), + 'title' => 'Date and time', + 'description' => "Settings for how Drupal displays date and time, as well as the system's default timezone.", 'page callback' => 'drupal_get_form', 'page arguments' => array('system_date_time_settings'), ); $items['admin/settings/site-maintenance'] = array( - 'title' => t('Site maintenance'), - 'description' => t('Take the site off-line for maintenance or bring it back online.'), + 'title' => 'Site maintenance', + 'description' => 'Take the site off-line for maintenance or bring it back online.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_maintenance_settings'), ); $items['admin/settings/clean-urls'] = array( - 'title' => t('Clean URLs'), - 'description' => t('Enable or disable clean URLs for your site.'), + 'title' => 'Clean URLs', + 'description' => 'Enable or disable clean URLs for your site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_clean_url_settings'), ); // Logs: $items['admin/logs'] = array( - 'title' => t('Logs'), - 'description' => t('View system logs and other status information.'), + 'title' => 'Logs', + 'description' => 'View system logs and other status information.', 'page callback' => 'system_admin_menu_block_page', 'weight' => 5, 'position' => 'left', ); $items['admin/logs/status'] = array( - 'title' => t('Status report'), - 'description' => t("Get a status report about your site's operation and any detected problems."), + 'title' => 'Status report', + 'description' => "Get a status report about your site's operation and any detected problems.", 'page callback' => 'system_status', 'weight' => 10, 'access arguments' => array('administer site configuration'), ); $items['admin/logs/status/run-cron'] = array( - 'title' => t('Run cron'), + 'title' => 'Run cron', 'page callback' => 'system_run_cron', 'type' => MENU_CALLBACK, ); $items['admin/logs/status/php'] = array( - 'title' => t('PHP'), + 'title' => 'PHP', 'page callback' => 'system_php', 'type' => MENU_CALLBACK, ); $items['admin/logs/status/sql'] = array( - 'title' => t('SQL'), + 'title' => 'SQL', 'page callback' => 'system_sql', 'type' => MENU_CALLBACK, ); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index d65d52d7c..92d0139cb 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -83,20 +83,20 @@ function taxonomy_term_path($term) { */ function taxonomy_menu() { $items['admin/content/taxonomy'] = array( - 'title' => t('Categories'), - 'description' => t('Create vocabularies and terms to categorize your content.'), + 'title' => 'Categories', + 'description' => 'Create vocabularies and terms to categorize your content.', 'page callback' => 'taxonomy_overview_vocabularies', 'access arguments' => array('administer taxonomy'), ); $items['admin/content/taxonomy/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/taxonomy/add/vocabulary'] = array( - 'title' => t('Add vocabulary'), + 'title' => 'Add vocabulary', 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_form_vocabulary'), 'type' => MENU_LOCAL_TASK, @@ -104,33 +104,33 @@ function taxonomy_menu() { ); $items['admin/content/taxonomy/edit/vocabulary/%taxonomy_vocabulary'] = array( - 'title' => t('Edit vocabulary'), + 'title' => 'Edit vocabulary', 'page callback' => 'taxonomy_admin_vocabulary_edit', 'page arguments' => array(5), 'type' => MENU_CALLBACK, ); $items['admin/content/taxonomy/edit/term'] = array( - 'title' => t('Edit term'), + 'title' => 'Edit term', 'page callback' => 'taxonomy_admin_term_edit', 'type' => MENU_CALLBACK, ); $items['taxonomy/term'] = array( - 'title' => t('Taxonomy term'), + 'title' => 'Taxonomy term', 'page callback' => 'taxonomy_term_page', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); $items['taxonomy/autocomplete'] = array( - 'title' => t('Autocomplete taxonomy'), + 'title' => 'Autocomplete taxonomy', 'page callback' => 'taxonomy_autocomplete', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); $items['admin/content/taxonomy/%taxonomy_vocabulary'] = array( - 'title' => t('List terms'), + 'title' => 'List terms', 'page callback' => 'taxonomy_overview_terms', 'page arguments' => array(3), 'access arguments' => array('administer taxonomy'), @@ -138,13 +138,13 @@ function taxonomy_menu() { ); $items['admin/content/taxonomy/%taxonomy_vocabulary/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/content/taxonomy/%taxonomy_vocabulary/add/term'] = array( - 'title' => t('Add term'), + 'title' => 'Add term', 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_form_term', 3), 'type' => MENU_LOCAL_TASK, diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module index 4c1da37a5..ef9b29003 100644 --- a/modules/throttle/throttle.module +++ b/modules/throttle/throttle.module @@ -8,8 +8,8 @@ function throttle_menu() { $items['admin/settings/throttle'] = array( - 'description' => t('Control how your site cuts out content during heavy load.'), - 'title' => t('Throttle'), + 'title' => 'Throttle', + 'description' => 'Control how your site cuts out content during heavy load.', 'page callback' => 'drupal_get_form', 'page arguments' => array('throttle_admin_settings'), 'access arguments' => array('administer site configuration'), diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index 9f924d649..5c290d115 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -24,34 +24,34 @@ function tracker_help($section) { */ function tracker_menu() { $items['tracker'] = array( - 'title' => t('Recent posts'), + 'title' => 'Recent posts', 'page callback' => 'tracker_page', 'access arguments' => array('access content'), 'weight' => 1, ); $items['tracker/all'] = array( - 'title' => t('All recent posts'), + 'title' => 'All recent posts', 'type' => MENU_DEFAULT_LOCAL_TASK, 'access callback' => 'user_is_logged_in', ); $items['tracker/%user_current'] = array( - 'title' => t('My recent posts'), + 'title' => 'My recent posts', 'type' => MENU_LOCAL_TASK, 'access callback' => 'user_is_logged_in', 'access arguments' => array(1), ); $items['user/%user/track'] = array( - 'title' => t('Track'), + 'title' => 'Track', 'page callback' => 'tracker_track_user', 'access callback' => 'user_access', 'access arguments' => array('access content'), 'type' => MENU_LOCAL_TASK, ); $items['user/%user/track/posts'] = array( - 'title' => t('Track posts'), + 'title' => 'Track posts', 'type' => MENU_DEFAULT_LOCAL_TASK, ); return $items; diff --git a/modules/upload/upload.module b/modules/upload/upload.module index aff48c849..85277fdd1 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -83,8 +83,8 @@ function upload_menu() { 'type' => MENU_CALLBACK, ); $items['admin/settings/uploads'] = array( - 'title' => t('File uploads'), - 'description' => t('Control how files may be attached to content.'), + 'title' => 'File uploads', + 'description' => 'Control how files may be attached to content.', 'page callback' => 'drupal_get_form', 'page arguments' => array('upload_admin_settings'), 'access arguments' => array('administer site configuration'), diff --git a/modules/user/user.module b/modules/user/user.module index ac83715ee..582ac0e5b 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -765,7 +765,7 @@ function user_load_self($arg) { */ function user_menu() { $items['user/autocomplete'] = array( - 'title' => t('User autocomplete'), + 'title' => 'User autocomplete', 'page callback' => 'user_autocomplete', 'access callback' => 'user_access', 'access arguments' => array('access user profiles'), @@ -774,7 +774,7 @@ function user_menu() { // Registration and login pages. $items['user'] = array( - 'title' => t('Log in'), + 'title' => 'Log in', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_login'), 'access callback' => 'user_is_anonymous', @@ -782,12 +782,12 @@ function user_menu() { ); $items['user/login'] = array( - 'title' => t('Log in'), + 'title' => 'Log in', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['user/register'] = array( - 'title' => t('Create new account'), + 'title' => 'Create new account', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_register'), 'access callback' => 'user_register_access', @@ -795,104 +795,104 @@ function user_menu() { ); $items['user/password'] = array( - 'title' => t('Request new password'), + 'title' => 'Request new password', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_pass'), 'access callback' => 'user_is_anonymous', 'type' => MENU_LOCAL_TASK, ); $items['user/reset/%/%/%'] = array( - 'title' => t('Reset password'), + 'title' => 'Reset password', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_pass_reset', 2, 3, 4), 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); $items['user/help'] = array( - 'title' => t('Help'), + 'title' => 'Help', 'page callback' => 'user_help_page', 'type' => MENU_CALLBACK, ); // Admin user pages $items['admin/user'] = array( - 'title' => t('User management'), - 'description' => t('Manage your site\'s users, groups and access to site features.'), + 'title' => 'User management', + 'description' => "Manage your site's users, groups and access to site features.", 'position' => 'left', 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('administer site configuration'), ); $items['admin/user/user'] = array( - 'title' => t('Users'), - 'description' => t('List, add, and edit users.'), + 'title' => 'Users', + 'description' => 'List, add, and edit users.', 'page callback' => 'user_admin', 'page arguments' => array('list'), 'access arguments' => array('administer users')); $items['admin/user/user/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/user/user/create'] = array( - 'title' => t('Add user'), + 'title' => 'Add user', 'page arguments' => array('create'), 'type' => MENU_LOCAL_TASK, ); $items['admin/user/settings'] = array( - 'title' => t('User settings'), - 'description' => t('Configure default behavior of users, including registration requirements, e-mails, and user pictures.'), + 'title' => 'User settings', + 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_settings'), ); // Admin access pages $items['admin/user/access'] = array( - 'title' => t('Access control'), - 'description' => t('Determine access to features by selecting permissions for roles.'), + 'title' => 'Access control', + 'description' => 'Determine access to features by selecting permissions for roles.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_perm'), 'access arguments' => array('administer access control'), ); $items['admin/user/roles'] = array( - 'title' => t('Roles'), - 'description' => t('List, edit, or add user roles.'), + 'title' => 'Roles', + 'description' => 'List, edit, or add user roles.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_new_role'), 'access arguments' => array('administer access control'), ); $items['admin/user/roles/edit'] = array( - 'title' => t('Edit role'), + 'title' => 'Edit role', 'page arguments' => array('user_admin_role'), 'type' => MENU_CALLBACK, ); $items['admin/user/rules'] = array( - 'title' => t('Access rules'), - 'description' => t('List and create rules to disallow usernames, e-mail addresses, and IP addresses.'), + 'title' => 'Access rules', + 'description' => 'List and create rules to disallow usernames, e-mail addresses, and IP addresses.', 'page callback' => 'user_admin_access', 'access arguments' => array('administer access control'), ); $items['admin/user/rules/list'] = array( - 'title' => t('List'), + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['admin/user/rules/add'] = array( - 'title' => t('Add rule'), + 'title' => 'Add rule', 'page callback' => 'user_admin_access_add', 'type' => MENU_LOCAL_TASK, ); $items['admin/user/rules/check'] = array( - 'title' => t('Check rules'), + 'title' => 'Check rules', 'page callback' => 'user_admin_access_check', 'type' => MENU_LOCAL_TASK, ); $items['admin/user/rules/edit'] = array( - 'title' => t('Edit rule'), + 'title' => 'Edit rule', 'page callback' => 'user_admin_access_edit', 'type' => MENU_CALLBACK, ); $items['admin/user/rules/delete'] = array( - 'title' => t('Delete rule'), + 'title' => 'Delete rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_access_delete_confirm'), 'type' => MENU_CALLBACK, @@ -900,8 +900,8 @@ function user_menu() { if (module_exists('search')) { $items['admin/user/search'] = array( - 'title' => t('Search users'), - 'description' => t('Search users by name.'), + 'title' => 'Search users', + 'description' => 'Search users by name.', 'page callback' => 'user_admin', 'page arguments' => array('search'), 'access arguments' => array('administer users'), @@ -909,14 +909,14 @@ function user_menu() { } $items['logout'] = array( - 'title' => t('Log out'), + 'title' => 'Log out', 'access callback' => 'user_is_logged_in', 'page callback' => 'user_logout', 'weight' => 10, ); $items['user/%user_current'] = array( - 'title' => t('My account'), + 'title' => 'My account', 'page callback' => 'user_view', 'page arguments' => array(1), 'access callback' => 'user_view_access', @@ -925,13 +925,13 @@ function user_menu() { ); $items['user/%user/view'] = array( - 'title' => t('View'), + 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items['user/%user/delete'] = array( - 'title' => t('Delete'), + 'title' => 'Delete', 'page callback' => 'user_edit', 'access callback' => 'user_access', 'access arguments' => array('administer users'), @@ -939,7 +939,7 @@ function user_menu() { ); $items['user/%user/edit'] = array( - 'title' => t('Edit'), + 'title' => 'Edit', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_edit'), 'access callback' => 'user_edit_access', @@ -951,7 +951,8 @@ function user_menu() { if (($categories = _user_categories($empty_account)) && (count($categories) > 1)) { foreach ($categories as $key => $category) { $items['user/%user/edit/'. $category['name']] = array( - 'title' => $category['title'], + 'title callback' => 'check_plain', + 'title arguments' => array($category['title']), 'page arguments' => array('user_edit', 3), 'type' => $category['name'] == 'account' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, 'weight' => $category['weight'], |