diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-10-22 08:28:47 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-10-22 08:28:47 +0000 |
| commit | 36d44fbfb07e4682f219368e1424c58fc61315a1 (patch) | |
| tree | d6a5363c6ec34a5b81aac6fee283ee7479d45ea4 | |
| parent | c93c0fc7000f5cbb78ac2715ace58c28b789dc81 (diff) | |
| download | brdo-36d44fbfb07e4682f219368e1424c58fc61315a1.tar.gz brdo-36d44fbfb07e4682f219368e1424c58fc61315a1.tar.bz2 | |
#84146: Use 'Sentence capitalization' for menu items, page titles, form items, etc
31 files changed, 246 insertions, 244 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 043e4e2bd..f8a3313b5 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -362,7 +362,7 @@ function theme_page($content) { $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; $output .= '<html xmlns="http://www.w3.org/1999/xhtml">'; $output .= '<head>'; - $output .= ' <title>'. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'drupal')) .'</title>'; + $output .= ' <title>'. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'Drupal')) .'</title>'; $output .= drupal_get_html_head(); $output .= drupal_get_css(); $output .= drupal_get_js(); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 93129f6dd..1fb22293a 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -51,33 +51,33 @@ function aggregator_menu($may_cache) { 'callback' => 'aggregator_admin_overview', 'access' => $edit); $items[] = array('path' => 'admin/content/aggregator/add/feed', - 'title' => t('add feed'), + 'title' => t('Add feed'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_feed'), 'access' => $edit, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/content/aggregator/add/category', - 'title' => t('add category'), + 'title' => t('Add category'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_category'), 'access' => $edit, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/content/aggregator/remove', - 'title' => t('remove items'), + 'title' => t('Remove items'), 'callback' => 'aggregator_admin_remove_feed', 'access' => $edit, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/content/aggregator/update', - 'title' => t('update items'), + 'title' => t('Update items'), 'callback' => 'aggregator_admin_refresh_feed', 'access' => $edit, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/content/aggregator/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/content/aggregator/settings', - 'title' => t('settings'), + 'title' => t('Settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_admin_settings'), 'type' => MENU_LOCAL_TASK, @@ -85,16 +85,16 @@ function aggregator_menu($may_cache) { 'access' => $edit); $items[] = array('path' => 'aggregator', - 'title' => t('news aggregator'), + 'title' => t('News aggregator'), 'callback' => 'aggregator_page_last', 'access' => $view, 'weight' => 5); $items[] = array('path' => 'aggregator/sources', - 'title' => t('sources'), + 'title' => t('Sources'), 'callback' => 'aggregator_page_sources', 'access' => $view); $items[] = array('path' => 'aggregator/categories', - 'title' => t('categories'), + 'title' => t('Categories'), 'callback' => 'aggregator_page_categories', 'access' => $view, 'type' => MENU_ITEM_GROUPING); @@ -132,17 +132,17 @@ function aggregator_menu($may_cache) { 'access' => $view, 'type' => MENU_CALLBACK); $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/view', - 'title' => t('view'), + 'title' => t('View'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/categorize', - 'title' => t('categorize'), + 'title' => t('Categorize'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_page_source'), 'access' => $edit, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/configure', - 'title' => t('configure'), + 'title' => t('Configure'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_feed', $feed), 'access' => $edit, @@ -154,17 +154,17 @@ function aggregator_menu($may_cache) { $category = aggregator_get_category(arg(2)); if ($category) { $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/view', - 'title' => t('view'), + 'title' => t('View'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/categorize', - 'title' => t('categorize'), + 'title' => t('Categorize'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_page_category'), 'access' => $edit, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/configure', - 'title' => t('configure'), + 'title' => t('Configure'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_category', $category), 'access' => $edit, @@ -178,7 +178,7 @@ function aggregator_menu($may_cache) { $feed = aggregator_get_feed(arg(5)); if ($feed) { $items[] = array('path' => 'admin/content/aggregator/edit/feed/'. $feed['fid'], - 'title' => t('edit feed'), + 'title' => t('Edit feed'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_feed', $feed), 'access' => $edit, @@ -189,7 +189,7 @@ function aggregator_menu($may_cache) { $category = aggregator_get_category(arg(5)); if ($category) { $items[] = array('path' => 'admin/content/aggregator/edit/category/'. $category['cid'], - 'title' => t('edit category'), + 'title' => t('Edit category'), 'callback' => 'drupal_get_form', 'callback arguments' => array('aggregator_form_category', $category), 'access' => $edit, @@ -1035,7 +1035,7 @@ function aggregator_admin_overview() { * Menu callback; displays the most recent items gathered from any feed. */ function aggregator_page_last() { - drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'drupal') . ' ' . t('aggregator')); + drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'Drupal') . ' ' . t('aggregator')); return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1)); } @@ -1056,7 +1056,7 @@ function aggregator_page_source() { function aggregator_page_category() { $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))); - drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'drupal') . ' ' . t('aggregator - @title', array('@title' => $category->title))); + drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category->title))); return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3)); } @@ -1175,7 +1175,7 @@ function aggregator_page_sources() { $output .= theme('item_list', $list); $link['sources'] = array( - 'title' => t('more'), + 'title' => t('More'), 'href' => 'aggregator/sources/'. $feed->fid ); @@ -1279,7 +1279,7 @@ function aggregator_page_categories() { } $link['categories'] = array( - 'title' => t('more'), + 'title' => t('More'), 'href' => 'aggregator/categories/'. $category->cid ); diff --git a/modules/block/block.module b/modules/block/block.module index 0f2fb1e4e..bea866901 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -66,24 +66,24 @@ function block_menu($may_cache) { if ($may_cache) { $items[] = array( 'path' => 'admin/build/block', - 'title' => t('blocks'), + 'title' => t('Blocks'), 'access' => user_access('administer blocks'), 'description' => t('Configure what block content appears in your site\'s sidebars and other regions.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('block_admin_display')); - $items[] = array('path' => 'admin/build/block/list', 'title' => t('list'), + $items[] = array('path' => 'admin/build/block/list', 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/build/block/configure', 'title' => t('configure block'), + $items[] = array('path' => 'admin/build/block/configure', 'title' => t('Configure block'), 'access' => user_access('administer blocks'), 'callback' => 'drupal_get_form', 'callback arguments' => array('block_admin_configure'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/build/block/delete', 'title' => t('delete block'), + $items[] = array('path' => 'admin/build/block/delete', 'title' => t('Delete block'), 'access' => user_access('administer blocks'), 'callback' => 'drupal_get_form', 'callback arguments' => array('block_box_delete'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/build/block/add', 'title' => t('add block'), + $items[] = array('path' => 'admin/build/block/add', 'title' => t('Add block'), 'access' => user_access('administer blocks'), 'callback' => 'drupal_get_form', 'callback arguments' => array('block_box_form'), diff --git a/modules/blog/blog.module b/modules/blog/blog.module index f3f8ed32e..bc1da62c8 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -12,7 +12,7 @@ function blog_node_info() { return array( 'blog' => array( - 'name' => t('blog entry'), + 'name' => t('Blog entry'), 'module' => 'blog', 'description' => t('A blog is a regularly updated journal or diary made up of individual posts shown in reversed chronological order. Each member of the site may create and maintain a blog.'), ) @@ -104,7 +104,7 @@ function blog_feed_user($uid = 0) { */ function blog_feed_last() { $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10)); - $channel['title'] = variable_get('site_name', 'drupal') .' blogs'; + $channel['title'] = variable_get('site_name', 'Drupal') .' blogs'; $channel['link'] = url('blog', NULL, NULL, TRUE); $channel['description'] = $term->description; node_feed($result, $channel); @@ -228,7 +228,7 @@ function blog_form(&$node) { function blog_view($node, $teaser = FALSE, $page = FALSE) { if ($page) { // Breadcrumb navigation - $breadcrumb[] = array('path' => 'blog', 'title' => t('blogs')); + $breadcrumb[] = array('path' => 'blog', 'title' => t('Blogs')); $breadcrumb[] = array('path' => 'blog/'. $node->uid, 'title' => t("@name's blog", array('@name' => $node->name))); $breadcrumb[] = array('path' => 'node/'. $node->nid); menu_set_location($breadcrumb); @@ -263,13 +263,13 @@ function blog_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'node/add/blog', 'title' => t('blog entry'), + $items[] = array('path' => 'node/add/blog', 'title' => t('Blog entry'), 'access' => user_access('edit own blog')); - $items[] = array('path' => 'blog', 'title' => t('blogs'), + $items[] = array('path' => 'blog', 'title' => t('Blogs'), 'callback' => 'blog_page', 'access' => user_access('access content'), 'type' => MENU_SUGGESTED_ITEM); - $items[] = array('path' => 'blog/'. $user->uid, 'title' => t('my blog'), + $items[] = array('path' => 'blog/'. $user->uid, 'title' => t('My blog'), 'access' => user_access('edit own blog'), 'type' => MENU_DYNAMIC_ITEM); } diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index 7231ee59e..de6bb7fd8 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -576,7 +576,7 @@ function blogapi_menu($may_cache) { 'type' => MENU_CALLBACK); $items[] = array( 'path' => 'admin/settings/blogapi', - 'title' => t('blog APIs'), + 'title' => t('Blog APIs'), 'description' => t('Configure which content types and engines external blog clients can use.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('blogapi_admin_settings'), diff --git a/modules/book/book.module b/modules/book/book.module index 2bded276f..9f633d907 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -12,7 +12,7 @@ function book_node_info() { return array( 'book' => array( - 'name' => t('book page'), + 'name' => t('Book page'), 'module' => 'book', 'description' => t("A book is a collaborative writing effort: users can collaborate writing the pages of the book, positioning the pages in the right order, and reviewing or modifying pages previously written. So when you have some information to share or when you read a page of the book and you didn't like it, or if you think a certain page could have been written better, you can do something about it."), ) @@ -65,13 +65,13 @@ function book_link($type, $node = NULL, $teaser = FALSE) { if (!$teaser) { if (book_access('create', $node)) { $links['book_add_child'] = array( - 'title' => t('add child page'), + 'title' => t('Add child page'), 'href' => "node/add/book/parent/$node->nid" ); } if (user_access('see printer-friendly version')) { $links['book_printer'] = array( - 'title' => t('printer-friendly version'), + 'title' => t('Printer-friendly version'), 'href' => 'book/export/html/'. $node->nid, 'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.')) ); @@ -91,24 +91,24 @@ function book_menu($may_cache) { if ($may_cache) { $items[] = array( 'path' => 'admin/content/book', - 'title' => t('books'), + 'title' => t('Books'), 'description' => t('Manage site\'s books and orphaned book pages.'), 'callback' => 'book_admin', 'access' => user_access('administer nodes')); $items[] = array( 'path' => 'admin/content/book/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK); $items[] = array( 'path' => 'admin/content/book/orphan', - 'title' => t('orphan pages'), + 'title' => t('Orphan pages'), 'callback' => 'drupal_get_form', 'callback arguments' => array('book_admin_orphan'), 'type' => MENU_LOCAL_TASK, 'weight' => 8); $items[] = array( 'path' => 'book', - 'title' => t('books'), + 'title' => t('Books'), 'callback' => 'book_render', 'access' => user_access('access content'), 'type' => MENU_SUGGESTED_ITEM); @@ -131,7 +131,7 @@ function book_menu($may_cache) { if (db_num_rows($result) > 0) { $items[] = array( 'path' => 'node/'. arg(1) .'/outline', - 'title' => t('outline'), + 'title' => t('Outline'), 'callback' => 'drupal_get_form', 'callback arguments' => array('book_outline', arg(1)), 'access' => user_access('outline posts in books'), diff --git a/modules/comment/comment.module b/modules/comment/comment.module index d2f85e895..c1489ed39 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -100,20 +100,20 @@ function comment_menu($may_cache) { $access = user_access('administer comments'); $items[] = array( 'path' => 'admin/content/comment', - 'title' => t('comments'), + 'title' => t('Comments'), 'description' => t('List and edit site comments and the comment moderation queue.'), 'callback' => 'comment_admin', 'access' => $access ); // Tabs: - $items[] = array('path' => 'admin/content/comment/list', 'title' => t('list'), + $items[] = array('path' => 'admin/content/comment/list', 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); // Subtabs: - $items[] = array('path' => 'admin/content/comment/list/new', 'title' => t('published comments'), + $items[] = array('path' => 'admin/content/comment/list/new', 'title' => t('Published comments'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/content/comment/list/approval', 'title' => t('approval queue'), + $items[] = array('path' => 'admin/content/comment/list/approval', 'title' => t('Approval queue'), 'callback' => 'comment_admin', 'callback arguments' => array('approval'), 'access' => $access, @@ -121,18 +121,18 @@ function comment_menu($may_cache) { $items[] = array( 'path' => 'admin/content/comment/settings', - 'title' => t('settings'), + 'title' => t('Settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('comment_admin_settings'), 'access' => $access, 'weight' => 10, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'comment/delete', 'title' => t('delete comment'), + $items[] = array('path' => 'comment/delete', 'title' => t('Delete comment'), 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); $access = user_access('post comments'); - $items[] = array('path' => 'comment/edit', 'title' => t('edit comment'), + $items[] = array('path' => 'comment/edit', 'title' => t('Edit comment'), 'callback' => 'comment_edit', 'access' => $access, 'type' => MENU_CALLBACK); } @@ -140,12 +140,12 @@ function comment_menu($may_cache) { if (arg(0) == 'comment' && arg(1) == 'reply' && is_numeric(arg(2))) { $node = node_load(arg(2)); if ($node->nid) { - $items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'), + $items[] = array('path' => 'comment/reply', 'title' => t('Reply to comment'), 'callback' => 'comment_reply', 'access' => node_access('view', $node), 'type' => MENU_CALLBACK); } } if ((arg(0) == 'node') && is_numeric(arg(1)) && is_numeric(arg(2))) { - $items[] = array('path' => ('node/'. arg(1) .'/'. arg(2)), 'title' => t('view'), + $items[] = array('path' => ('node/'. arg(1) .'/'. arg(2)), 'title' => t('View'), 'callback' => 'node_page', 'type' => MENU_CALLBACK); } @@ -244,7 +244,7 @@ function comment_link($type, $node = NULL, $teaser = FALSE) { if (user_access('post comments')) { if (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) { $links['comment_add'] = array( - 'title' => t('add new comment'), + 'title' => t('Add new comment'), 'href' => "comment/reply/$node->nid", 'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')), 'fragment' => 'comment_form' diff --git a/modules/contact/contact.module b/modules/contact/contact.module index f1a166d4c..57fe5fed9 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -49,19 +49,19 @@ function contact_menu($may_cache) { $items = array(); if ($may_cache) { $items[] = array('path' => 'admin/build/contact', - 'title' => t('contact form'), + 'title' => t('Contact form'), 'description' => t('Create a system contact form and set up categories for the form to use.'), 'callback' => 'contact_admin_categories', 'access' => user_access('administer site configuration'), ); $items[] = array('path' => 'admin/build/contact/list', - 'title' => t('list'), + 'title' => t('List'), 'callback' => 'contact_admin_categories', 'access' => user_access('administer site configuration'), 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items[] = array('path' => 'admin/build/contact/add', - 'title' => t('add category'), + 'title' => t('Add category'), 'callback' => 'drupal_get_form', 'callback arguments' => array('contact_admin_edit'), 'access' => user_access('administer site configuration'), @@ -69,21 +69,21 @@ function contact_menu($may_cache) { 'weight' => 1, ); $items[] = array('path' => 'admin/build/contact/edit', - 'title' => t('edit contact category'), + 'title' => t('Edit contact category'), 'callback' => 'drupal_get_form', 'callback arguments' => array('contact_admin_edit'), 'access' => user_access('administer site configuration'), 'type' => MENU_CALLBACK, ); $items[] = array('path' => 'admin/build/contact/delete', - 'title' => t('delete contact'), + 'title' => t('Delete contact'), 'callback' => 'drupal_get_form', 'callback arguments' => array('contact_admin_delete'), 'access' => user_access('administer site configuration'), 'type' => MENU_CALLBACK, ); $items[] = array('path' => 'admin/build/contact/settings', - 'title' => t('settings'), + 'title' => t('Settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('contact_admin_settings'), 'access' => user_access('administer site configuration'), @@ -91,7 +91,7 @@ function contact_menu($may_cache) { 'weight' => 2, ); $items[] = array('path' => 'contact', - 'title' => t('contact'), + 'title' => t('Contact'), 'callback' => 'contact_site_page', 'access' => user_access('access site-wide contact form'), 'type' => MENU_SUGGESTED_ITEM, @@ -103,7 +103,7 @@ function contact_menu($may_cache) { $account = user_load(array('uid' => arg(1))); if (($user->uid != $account->uid && $account->contact) || user_access('administer users')) { $items[] = array('path' => 'user/'. arg(1) .'/contact', - 'title' => t('contact'), + 'title' => t('Contact'), 'callback' => 'contact_user_page', 'type' => MENU_LOCAL_TASK, 'access' => $user->uid, @@ -365,7 +365,7 @@ function contact_mail_user_submit($form_id, $form_values) { $account = user_load(array('uid' => arg(1), 'status' => 1)); // Compose the body: $message[] = "$account->name,"; - $message[] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", NULL, NULL, TRUE), '!form-url' => url($_GET['q'], NULL, NULL, TRUE), '!site' => variable_get('site_name', 'drupal'))); + $message[] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", NULL, NULL, TRUE), '!form-url' => url($_GET['q'], NULL, NULL, TRUE), '!site' => variable_get('site_name', 'Drupal'))); $message[] = t("If you don't want to receive such e-mails, you can change your settings at !url.", array('!url' => url("user/$account->uid", NULL, NULL, TRUE))); $message[] = t('Message:'); $message[] = $form_values['message']; @@ -380,7 +380,7 @@ function contact_mail_user_submit($form_id, $form_values) { $from = $user->mail; // Format the subject: - $subject = '['. variable_get('site_name', 'drupal') .'] '. $form_values['subject']; + $subject = '['. variable_get('site_name', 'Drupal') .'] '. $form_values['subject']; // Prepare the body: $body = implode("\n\n", $message); diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index 64b788747..4f5921dd4 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -54,7 +54,7 @@ print drupal_client_page(); function drupal_sites_registry_settings() { // Check if all required fields are present - if ((variable_get('site_name', 'drupal') == 'drupal') || (variable_get('site_name', 'drupal') == '')) { + if ((variable_get('site_name', 'Drupal') == 'Drupal') || (variable_get('site_name', 'Drupal') == '')) { form_set_error('drupal_directory', t('You must set the name of your site on the <a href="@url">administer » settings » site information</a> page.', array('@url' => url('admin/settings/site-information')))); } else if (variable_get('site_mail', ini_get('sendmail_from')) == '') { @@ -346,13 +346,13 @@ function drupal_menu($may_cache) { $items = array(); if ($may_cache) { $items[] = array('path' => 'admin/settings/sites-registry', - 'title' => t('sites registry'), + '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.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('drupal_sites_registry_settings'), 'access' => user_access('administer site configuration')); $items[] = array('path' => 'admin/settings/distributed-authentication', - 'title' => t('distributed authentication'), + 'title' => t('Distributed authentication'), 'description' => t('Allow your site to accept logins from other Drupal sites such as drupal.org.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('drupal_distributed_authentication_settings'), diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 833ae4e79..7903de5db 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -62,20 +62,20 @@ function filter_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/settings/filters', - 'title' => t('input formats'), + 'title' => t('Input formats'), 'description' => t('Configure how content input by users is filtered, including allowed HTML tags, PHP code tags. Also allows enabling of module-provided filters.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_overview'), 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/list', - 'title' => t('list'), + 'title' => t('List'), 'callback' => 'filter_admin_overview', 'type' => MENU_DEFAULT_LOCAL_TASK, 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/add', - 'title' => t('add input format'), + 'title' => t('Add input format'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_format_form'), 'type' => MENU_LOCAL_TASK, @@ -83,14 +83,14 @@ function filter_menu($may_cache) { 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/delete', - 'title' => t('delete input format'), + 'title' => t('Delete input format'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_delete'), 'type' => MENU_CALLBACK, 'access' => user_access('administer filters'), ); $items[] = array('path' => 'filter/tips', - 'title' => t('compose tips'), + 'title' => t('Compose tips'), 'callback' => 'filter_tips_long', 'access' => TRUE, 'type' => MENU_SUGGESTED_ITEM, @@ -109,7 +109,7 @@ function filter_menu($may_cache) { 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/'. arg(3) .'/list', - 'title' => t('view'), + 'title' => t('View'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_format_form', $formats[arg(3)]), 'type' => MENU_DEFAULT_LOCAL_TASK, @@ -117,7 +117,7 @@ function filter_menu($may_cache) { 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/'. arg(3) .'/configure', - 'title' => t('configure'), + 'title' => t('Configure'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_configure'), 'type' => MENU_LOCAL_TASK, @@ -125,7 +125,7 @@ function filter_menu($may_cache) { 'access' => user_access('administer filters'), ); $items[] = array('path' => 'admin/settings/filters/'. arg(3) .'/order', - 'title' => t('rearrange'), + 'title' => t('Rearrange'), 'callback' => 'drupal_get_form', 'callback arguments' => array('filter_admin_order', 'format' => $formats[arg(3)]), 'type' => MENU_LOCAL_TASK, @@ -177,7 +177,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) { <p>This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.</p> <p>For more information see W3C\'s <a href="http://www.w3.org/TR/html/">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.</p>'); $tips = array( - 'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'drupal') .'</a>'), + 'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'Drupal') .'</a>'), 'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with <br />line break')), 'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>'. t('Paragraph one.') .'</p> <p>'. t('Paragraph two.') .'</p>'), 'strong' => array( t('Strong'), '<strong>'. t('Strong'). '</strong>'), diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 39d56f398..8322e25f1 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -42,38 +42,38 @@ function forum_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'node/add/forum', - 'title' => t('forum topic'), + 'title' => t('Forum topic'), 'access' => user_access('create forum topics')); $items[] = array('path' => 'forum', - 'title' => t('forums'), + 'title' => t('Forums'), 'callback' => 'forum_page', 'access' => user_access('access content'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'admin/content/forum', - 'title' => t('forums'), + 'title' => t('Forums'), 'description' => t('Control forums and their hierarchy and change forum settings.'), 'callback' => 'forum_overview', 'access' => user_access('administer forums'), 'type' => MENU_NORMAL_ITEM); $items[] = array('path' => 'admin/content/forum/list', - 'title' => t('list'), + 'title' => t('List'), 'access' => user_access('administer forums'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/content/forum/add/container', - 'title' => t('add container'), + 'title' => t('Add container'), 'callback' => 'forum_form_main', 'callback arguments' => array('container'), 'access' => user_access('administer forums'), 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/content/forum/add/forum', - 'title' => t('add forum'), + 'title' => t('Add forum'), 'callback' => 'forum_form_main', 'callback arguments' => array('forum'), 'access' => user_access('administer forums'), 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/content/forum/settings', - 'title' => t('settings'), + 'title' => t('Settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('forum_admin_settings'), 'weight' => 5, @@ -85,13 +85,13 @@ function forum_menu($may_cache) { // Check if this is a valid term. if ($term) { $items[] = array('path' => 'admin/content/forum/edit/container', - 'title' => t('edit container'), + 'title' => t('Edit container'), 'callback' => 'forum_form_main', 'callback arguments' => array('container', (array)$term), 'access' => user_access('administer forums'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/content/forum/edit/forum', - 'title' => t('edit forum'), + 'title' => t('Edit forum'), 'callback' => 'forum_form_main', 'callback arguments' => array('forum', (array)$term), 'access' => user_access('administer forums'), @@ -113,7 +113,7 @@ function forum_menu($may_cache) { function forum_node_info() { return array( 'forum' => array( - 'name' => t('forum topic'), + 'name' => t('Forum topic'), 'module' => 'forum', 'description' => t('Create a new topic for discussion in the forums.'), 'title_label' => t('Subject'), diff --git a/modules/help/help.module b/modules/help/help.module index ae80cd0ba..9cd1471f3 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -15,7 +15,7 @@ function help_menu($may_cache) { if ($may_cache) { $admin_access = user_access('access administration pages'); - $items[] = array('path' => 'admin/help', 'title' => t('help'), + $items[] = array('path' => 'admin/help', 'title' => t('Help'), 'callback' => 'help_main', 'access' => $admin_access, 'weight' => 9); @@ -70,6 +70,8 @@ function help_main() { } function help_links_as_list() { + $module_info = module_rebuild_cache(); + $modules = array(); foreach (module_implements('help', TRUE) as $module) { if (module_invoke($module, 'help', "admin/help#$module")) { @@ -82,7 +84,7 @@ function help_links_as_list() { $break = ceil(count($modules) / 4); $output = '<div class="clear-block"><div class="help-items"><ul>'; foreach ($modules as $i => $module) { - $output .= '<li>'. l(t($module), 'admin/help/'. $module) .'</li>'; + $output .= '<li>'. l($module_info[$module]->info['name'], 'admin/help/'. $module) .'</li>'; if (($i + 1) % $break == 0) { $output .= '</ul></div><div class="help-items'. ($i + 1 == $break * 3 ? ' help-items-last' : '') .'"><ul>'; } diff --git a/modules/legacy/legacy.module b/modules/legacy/legacy.module index 8fef686fb..9eb6da437 100644 --- a/modules/legacy/legacy.module +++ b/modules/legacy/legacy.module @@ -40,35 +40,35 @@ function legacy_menu($may_cache) { if ($may_cache) { // Map "taxonomy/page/or/52,97" to "taxonomy/term/52+97". - $items[] = array('path' => 'taxonomy/page', 'title' => t('taxonomy'), + $items[] = array('path' => 'taxonomy/page', 'title' => t('Taxonomy'), 'callback' => 'legacy_taxonomy_page', 'access' => TRUE, 'type' => MENU_CALLBACK); // Map "taxonomy/feed/or/52,97" to "taxonomy/term/52+97/0/feed". - $items[] = array('path' => 'taxonomy/feed', 'title' => t('taxonomy'), + $items[] = array('path' => 'taxonomy/feed', 'title' => t('Taxonomy'), 'callback' => 'legacy_taxonomy_feed', 'access' => TRUE, 'type' => MENU_CALLBACK); // Map "blog/feed/52" to "blog/52/feed". - $items[] = array('path' => 'blog/feed', 'title' => t('blog'), + $items[] = array('path' => 'blog/feed', 'title' => t('Blog'), 'callback' => 'legacy_blog_feed', 'access' => TRUE, 'type' => MENU_CALLBACK); } else { // Map "node/view/52" to "node/52". - $items[] = array('path' => 'node/view', 'title' => t('view'), + $items[] = array('path' => 'node/view', 'title' => t('View'), 'callback' => 'drupal_goto', 'callback arguments' => array('node/'. arg(2), NULL, NULL), 'access' => TRUE, 'type' => MENU_CALLBACK); // Map "book/view/52" to "node/52". - $items[] = array('path' => 'book/view', 'title' => t('view'), + $items[] = array('path' => 'book/view', 'title' => t('View'), 'callback' => 'drupal_goto', 'callback arguments' => array('node/'. arg(2), NULL, NULL), 'access' => TRUE, 'type' => MENU_CALLBACK); // Map "user/view/52" to "user/52". - $items[] = array('path' => 'user/view', 'title' => t('view'), + $items[] = array('path' => 'user/view', 'title' => t('View'), 'callback' => 'drupal_goto', 'callback arguments' => array('user/'. arg(2), NULL, NULL), 'access' => TRUE, 'type' => MENU_CALLBACK); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 87db41769..3e7e7f121 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -57,19 +57,19 @@ function locale_menu($may_cache) { if ($may_cache) { // Main admin menu item $items[] = array('path' => 'admin/settings/locale', - 'title' => t('localization'), + 'title' => t('Localization'), 'description' => t('Configure site localization and user interface translation.'), 'callback' => 'locale_admin_manage', 'access' => $access); // Top level tabs $items[] = array('path' => 'admin/settings/locale/language', - 'title' => t('manage languages'), + 'title' => t('Manage languages'), 'access' => $access, 'weight' => -10, 'type' => MENU_DEFAULT_LOCAL_TASK); $items[] = array('path' => 'admin/settings/locale/string/search', - 'title' => t('manage strings'), + 'title' => t('Manage strings'), 'callback' => 'locale_string_search', 'access' => $access, 'weight' => 10, @@ -77,25 +77,25 @@ function locale_menu($may_cache) { // Manage languages subtabs $items[] = array('path' => 'admin/settings/locale/language/overview', - 'title' => t('list'), + 'title' => t('List'), 'callback' => 'locale_admin_manage', 'access' => $access, 'weight' => 0, 'type' => MENU_DEFAULT_LOCAL_TASK); $items[] = array('path' => 'admin/settings/locale/language/add', - 'title' => t('add language'), + 'title' => t('Add language'), 'callback' => 'locale_admin_manage_add', 'access' => $access, 'weight' => 5, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/settings/locale/language/import', - 'title' => t('import'), + 'title' => t('Import'), 'callback' => 'locale_admin_import', 'access' => $access, 'weight' => 10, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/settings/locale/language/export', - 'title' => t('export'), + 'title' => t('Export'), 'callback' => 'locale_admin_export', 'access' => $access, 'weight' => 20, @@ -103,7 +103,7 @@ function locale_menu($may_cache) { // Language related callbacks $items[] = array('path' => 'admin/settings/locale/language/delete', - 'title' => t('confirm'), + 'title' => t('Confirm'), 'callback' => 'drupal_get_form', 'callback arguments' => array('locale_admin_manage_delete_form'), 'access' => $access, @@ -117,13 +117,13 @@ function locale_menu($may_cache) { if (is_numeric(arg(5))) { // String related callbacks $items[] = array('path' => 'admin/settings/locale/string/edit/'. arg(5), - 'title' => t('edit string'), + 'title' => t('Edit string'), 'callback' => 'drupal_get_form', 'callback arguments' => array('locale_admin_string_edit', arg(5)), 'access' => $access, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/settings/locale/string/delete/'. arg(5), - 'title' => t('delete string'), + 'title' => t('Delete string'), 'callback' => 'locale_admin_string_delete', 'callback arguments' => array(arg(5)), 'access' => $access, diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 99d6b0282..d7e4ff9f8 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -48,66 +48,66 @@ function menu_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/build/menu', - 'title' => t('menus'), + 'title' => t('Menus'), 'description' => t('Control your site\'s navigation menu, create menu blocks, as well as rename and reorganize menu items.'), 'callback' => 'menu_overview', 'access' => user_access('administer menu')); $items[] = array('path' => 'admin/build/menu/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/build/menu/item/add', - 'title' => t('add menu item'), + 'title' => t('Add menu item'), 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_edit_item_form', 'add'), 'access' => user_access('administer menu'), 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/build/menu/item/edit', - 'title' => t('edit menu item'), + 'title' => t('Edit menu item'), 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_edit_item_form', 'edit'), 'access' => user_access('administer menu'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/build/menu/item/reset', - 'title' => t('reset menu item'), + 'title' => t('Reset menu item'), 'callback' => 'drupal_get_form', 'callback arguments' => array('menu_reset_item'), 'access' => user_access('administer menu'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/build/menu/item/disable', - 'title' => t('disable menu item'), + 'title' => t('Disable menu item'), 'callback' => 'menu_disable_item', 'access' => user_access('administer menu'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/build/menu/item/delete', - 'title' => t('delete menu item'), + 'title' => t('Delete menu item'), '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/menu/add', - 'title' => t('add menu'), + 'title' => t('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' => t('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' => t('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' => t('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 1b591136f..4b50598b2 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -973,7 +973,7 @@ function node_link($type, $node = NULL, $teaser = FALSE) { if ($type == 'node') { if ($teaser == 1 && $node->teaser && $node->readmore) { $links['node_read_more'] = array( - 'title' => t('read more'), + 'title' => t('Read more'), 'href' => "node/$node->nid", 'attributes' => array('title' => t('Read the rest of this posting.')) ); @@ -990,7 +990,7 @@ function node_menu($may_cache) { $items = array(); if ($may_cache) { $items[] = array('path' => 'admin/content', - 'title' => t('content management'), + 'title' => t('Content management'), 'description' => t('Manage your site\'s content.'), 'position' => 'left', 'weight' => -10, @@ -1000,7 +1000,7 @@ function node_menu($may_cache) { $items[] = array( 'path' => 'admin/content/node', - 'title' => t('posts'), + 'title' => t('Posts'), 'description' => t('View, edit, and delete your site\'s content.'), 'callback' => 'node_admin_content', 'access' => user_access('administer nodes') @@ -1019,7 +1019,7 @@ function node_menu($may_cache) { $items[] = array( 'path' => 'admin/content/node-settings', - 'title' => t('post settings'), + '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.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('node_configure'), @@ -1028,36 +1028,36 @@ function node_menu($may_cache) { $items[] = array( 'path' => 'admin/content/types', - 'title' => t('content types'), + 'title' => t('Content types'), 'description' => t('Manage posts by content type, including default status, front page promotion, etc.'), 'callback' => 'node_overview_types', 'access' => user_access('administer content types'), ); $items[] = array( 'path' => 'admin/content/types/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( 'path' => 'admin/content/types/add', - 'title' => t('add content type'), + 'title' => t('Add content type'), 'callback' => 'drupal_get_form', 'callback arguments' => array('node_type_form'), 'type' => MENU_LOCAL_TASK, ); $items[] = array('path' => 'node', - 'title' => t('content'), + 'title' => t('Content'), 'callback' => 'node_page_default', 'access' => user_access('access content'), 'type' => MENU_MODIFIABLE_BY_ADMIN); $items[] = array('path' => 'node/add', - 'title' => t('create content'), + 'title' => t('Create content'), 'callback' => 'node_add', 'access' => user_access('access content'), 'type' => MENU_ITEM_GROUPING, 'weight' => 1); - $items[] = array('path' => 'rss.xml', 'title' => t('rss feed'), + $items[] = array('path' => 'rss.xml', 'title' => t('RSS feed'), 'callback' => 'node_feed', 'access' => user_access('access content'), 'type' => MENU_CALLBACK); @@ -1068,7 +1068,7 @@ function node_menu($may_cache) { $type_url_str = str_replace('_', '-', $type->type); $items[] = array( 'path' => 'node/add/'. $type_url_str, - 'title' => t($name), + 'title' => drupal_ucfirst(t($name)), 'access' => node_access('create', $type->type), ); } @@ -1738,7 +1738,7 @@ function node_feed($nodes = 0, $channel = array()) { $channel_defaults = array( 'version' => '2.0', - 'title' => variable_get('site_name', 'drupal') .' - '. variable_get('site_slogan', ''), + 'title' => variable_get('site_name', 'Drupal') .' - '. variable_get('site_slogan', ''), 'link' => $base_url, 'description' => variable_get('site_mission', ''), 'language' => $locale @@ -2024,7 +2024,7 @@ function node_add($type = NULL) { if (function_exists($type->module .'_form') && node_access('create', $type->type)) { $type_url_str = str_replace('_', '-', $type->type); $title = t('Add a new @s.', array('@s' => $type->name)); - $out = '<dt>'. l($type->name, "node/add/$type_url_str", array('title' => $title)) .'</dt>'; + $out = '<dt>'. l(drupal_ucfirst($type->name), "node/add/$type_url_str", array('title' => $title)) .'</dt>'; $out .= '<dd>'. filter_xss_admin($type->description) .'</dd>'; $item[$type->type] = $out; } @@ -2257,7 +2257,7 @@ function node_page_default() { if (db_num_rows($result)) { $feed_url = url('rss.xml', NULL, NULL, TRUE); - drupal_add_feed($feed_url, variable_get('site_name', 'drupal') .' '. t('RSS')); + drupal_add_feed($feed_url, variable_get('site_name', 'Drupal') .' '. t('RSS')); $output = ''; while ($node = db_fetch_object($result)) { diff --git a/modules/path/path.module b/modules/path/path.module index bd97ac45f..e83e38376 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -48,23 +48,23 @@ function path_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'admin/build/path', 'title' => t('url aliases'), + $items[] = array('path' => 'admin/build/path', 'title' => t('URL aliases'), 'description' => t('Change your site\'s URL paths by aliasing them.'), 'callback' => 'path_admin', 'access' => user_access('administer url aliases')); - $items[] = array('path' => 'admin/build/path/edit', 'title' => t('edit alias'), + $items[] = array('path' => 'admin/build/path/edit', 'title' => t('Edit alias'), 'callback' => 'drupal_get_form', 'callback arguments' => array('path_admin_edit'), 'access' => user_access('administer url aliases'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/build/path/delete', 'title' => t('delete alias'), + $items[] = array('path' => 'admin/build/path/delete', 'title' => t('Delete alias'), 'callback' => 'drupal_get_form', 'callback arguments' => array('path_admin_delete_confirm'), 'access' => user_access('administer url aliases'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/build/path/list', 'title' => t('list'), + $items[] = array('path' => 'admin/build/path/list', 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/build/path/add', 'title' => t('add alias'), + $items[] = array('path' => 'admin/build/path/add', 'title' => t('Add alias'), 'callback' => 'drupal_get_form', 'callback arguments' => array('path_admin_edit'), 'access' => user_access('administer url aliases'), diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 5d7a13d74..abf251874 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -237,21 +237,21 @@ function poll_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'node/add/poll', 'title' => t('poll'), + $items[] = array('path' => 'node/add/poll', 'title' => t('Poll'), 'access' => user_access('create polls')); - $items[] = array('path' => 'poll', 'title' => t('polls'), + $items[] = array('path' => 'poll', 'title' => t('Polls'), 'callback' => 'poll_page', 'access' => user_access('access content'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'poll/vote', - 'title' => t('vote'), + 'title' => t('Vote'), 'callback' => 'poll_vote', 'access' => user_access('vote on polls'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'poll/cancel', - 'title' => t('cancel'), + 'title' => t('Cancel'), 'callback' => 'poll_cancel', 'access' => user_access('cancel own vote'), 'type' => MENU_CALLBACK); @@ -265,7 +265,7 @@ function poll_menu($may_cache) { $node = node_load(arg(1)); if ($node->type == 'poll') { $items[] = array('path' => 'node/'. arg(1) .'/votes', - 'title' => t('votes'), + 'title' => t('Votes'), 'callback' => 'poll_votes', 'access' => user_access('inspect all votes'), 'weight' => 3, @@ -273,7 +273,7 @@ function poll_menu($may_cache) { } if ($node->type == 'poll' && $node->allowvotes) { $items[] = array('path' => 'node/'. arg(1) .'/results', - 'title' => t('results'), + 'title' => t('Results'), 'callback' => 'poll_results', 'access' => user_access('access content'), 'weight' => 3, @@ -325,7 +325,7 @@ function poll_load($node) { function poll_node_info() { return array( 'poll' => array( - 'name' => t("poll"), + 'name' => t('Poll'), 'module' => 'poll', 'description' => t("A poll is a multiple-choice question which visitors can vote on."), 'title_label' => t('Question'), @@ -605,9 +605,9 @@ function poll_view($node, $teaser = FALSE, $page = FALSE, $block = FALSE) { $node->readmore = FALSE; $links = module_invoke_all('link', 'node', $node, 1); - $links[] = array('title' => t('older polls'), 'href' => 'poll', 'attributes' => array('title' => t('View the list of polls on this site.'))); + $links[] = array('title' => t('Older polls'), 'href' => 'poll', 'attributes' => array('title' => t('View the list of polls on this site.'))); if ($node->allowvotes && $block) { - $links[] = array('title' => t('results'), 'href' => 'node/'. $node->nid .'/results', 'attributes' => array('title' => t('View the current poll results.'))); + $links[] = array('title' => t('Results'), 'href' => 'node/'. $node->nid .'/results', 'attributes' => array('title' => t('View the current poll results.'))); } $node->links = $links; diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 9ff9efeff..d3664ff4d 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -53,35 +53,35 @@ function profile_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'profile', - 'title' => t('user list'), + 'title' => t('User list'), 'callback' => 'profile_browse', 'access' => user_access('access user profiles'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'admin/user/profile', - 'title' => t('profiles'), + 'title' => t('Profiles'), 'description' => t('Create customizable fields for your users.'), 'callback' => 'profile_admin_overview'); $items[] = array('path' => 'admin/user/profile/add', - 'title' => t('add field'), + 'title' => t('Add field'), 'callback' => 'drupal_get_form', 'callback arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/user/profile/autocomplete', - 'title' => t('profile category autocomplete'), + 'title' => t('Profile category autocomplete'), 'callback' => 'profile_admin_settings_autocomplete', 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/user/profile/edit', - 'title' => t('edit field'), + 'title' => t('Edit field'), 'callback' => 'drupal_get_form', 'callback arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/user/profile/delete', - 'title' => t('delete field'), + 'title' => t('Delete field'), 'callback' => 'drupal_get_form', 'callback arguments' => array('profile_field_delete'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'profile/autocomplete', 'title' => t('profile autocomplete'), + $items[] = array('path' => 'profile/autocomplete', 'title' => t('Profile autocomplete'), 'callback' => 'profile_autocomplete', 'access' => 1, 'type' => MENU_CALLBACK); diff --git a/modules/search/search.module b/modules/search/search.module index 3a5ae4435..ef99f07d2 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -150,25 +150,25 @@ function search_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'search', - 'title' => t('search'), + 'title' => t('Search'), 'callback' => 'drupal_get_form', 'callback arguments' => array('search_view'), 'access' => user_access('search content'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'admin/settings/search', - 'title' => t('search settings'), + 'title' => t('Search settings'), 'description' => t('Configure relevance settings for search and other indexing options'), 'callback' => 'drupal_get_form', 'callback arguments' => array('search_admin_settings'), 'access' => user_access('administer search'), 'type' => MENU_NORMAL_ITEM); $items[] = array('path' => 'admin/settings/search/wipe', - 'title' => t('clear index'), + 'title' => t('Clear index'), 'callback' => 'drupal_get_form', 'callback arguments' => array('search_wipe_confirm'), 'access' => user_access('administer search'), 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/logs/search', 'title' => t('top search phrases'), + $items[] = array('path' => 'admin/logs/search', 'title' => t('Top search phrases'), 'description' => t('View most popular search phrases.'), 'callback' => 'watchdog_top', 'callback arguments' => array('search')); diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 6ae63436d..b1c1f9635 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -114,40 +114,40 @@ function statistics_menu($may_cache) { if ($may_cache) { $items[] = array( 'path' => 'admin/logs/hits', - 'title' => t('recent hits'), + 'title' => t('Recent hits'), 'description' => t('View pages that have recently been visited.'), 'callback' => 'statistics_recent_hits', 'access' => $access); $items[] = array( 'path' => 'admin/logs/pages', - 'title' => t('top pages'), + 'title' => t('Top pages'), 'description' => t('View pages that have been hit frequently.'), 'callback' => 'statistics_top_pages', 'access' => $access, 'weight' => 1); $items[] = array( 'path' => 'admin/logs/visitors', - 'title' => t('top visitors'), + 'title' => t('Top visitors'), 'description' => t('View visitors that hit many pages.'), 'callback' => 'statistics_top_visitors', 'access' => $access, 'weight' => 2); $items[] = array( 'path' => 'admin/logs/referrers', - 'title' => t('top referrers'), + 'title' => t('Top referrers'), 'description' => t('View top referrers.'), 'callback' => 'statistics_top_referrers', 'access' => $access); $items[] = array( 'path' => 'admin/logs/access', - 'title' => t('details'), + 'title' => t('Details'), 'description' => t('View access log.'), 'callback' => 'statistics_access_log', 'access' => $access, 'type' => MENU_CALLBACK); $items[] = array( 'path' => 'admin/logs/settings', - 'title' => t('access log settings'), + 'title' => t('Access log settings'), 'description' => t('Control details about what and how your site logs.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('statistics_access_logging_settings'), @@ -159,7 +159,7 @@ function statistics_menu($may_cache) { if (arg(0) == 'user' && is_numeric(arg(1)) && variable_get('statistics_enable_access_log', 0)) { $items[] = array( 'path' => 'user/'. arg(1) .'/track/navigation', - 'title' => t('track page visits'), + 'title' => t('Track page visits'), 'callback' => 'statistics_user_tracker', 'access' => $access, 'type' => MENU_LOCAL_TASK, @@ -168,7 +168,7 @@ function statistics_menu($may_cache) { if (arg(0) == 'node' && is_numeric(arg(1)) && variable_get('statistics_enable_access_log', 0)) { $items[] = array( 'path' => 'node/'. arg(1) .'/track', - 'title' => t('track'), + 'title' => t('Track'), 'callback' => 'statistics_node_tracker', 'access' => $access, 'type' => MENU_LOCAL_TASK, diff --git a/modules/system/system.install b/modules/system/system.install index 9014c05b5..8c3bb8a10 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3217,7 +3217,7 @@ function system_update_1005() { $types = array( array( 'type' => 'page', - 'name' => t('page'), + 'name' => t('Page'), 'module' => 'node', 'description' => t('If you want to add a static page, like a contact page or an about page, use a page.'), 'custom' => TRUE, @@ -3226,7 +3226,7 @@ function system_update_1005() { ), array( 'type' => 'story', - 'name' => t('story'), + 'name' => t('Story'), 'module' => 'node', 'description' => t('Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extendd by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.'), 'custom' => TRUE, diff --git a/modules/system/system.module b/modules/system/system.module index 773b2b219..bb9161718 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -101,25 +101,25 @@ function system_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'system/files', 'title' => t('file download'), + $items[] = array('path' => 'system/files', 'title' => t('File download'), 'callback' => 'file_download', 'access' => TRUE, 'type' => MENU_CALLBACK); $access = user_access('administer site configuration'); - $items[] = array('path' => 'admin', 'title' => t('administer'), + $items[] = array('path' => 'admin', 'title' => t('Administer'), 'access' => user_access('access administration pages'), 'callback' => 'system_main_admin_page', 'weight' => 9); - $items[] = array('path' => 'admin/compact', 'title' => t('compact mode'), + $items[] = array('path' => 'admin/compact', 'title' => t('Compact mode'), 'access' => user_access('access administration pages'), 'callback' => 'system_admin_compact_page', 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/by-task', 'title' => t('by task'), + $items[] = array('path' => 'admin/by-task', 'title' => t('By task'), 'callback' => 'system_main_admin_page', 'type' => MENU_DEFAULT_LOCAL_TASK); - $items[] = array('path' => 'admin/by-module', 'title' => t('by module'), + $items[] = array('path' => 'admin/by-module', 'title' => t('By module'), 'callback' => 'system_admin_by_module', 'type' => MENU_LOCAL_TASK, 'weight' => 2); @@ -127,7 +127,7 @@ function system_menu($may_cache) { // menu items that are basically just menu blocks $items[] = array( 'path' => 'admin/settings', - 'title' => t('site configuration'), + 'title' => t('Site configuration'), 'description' => t('Adjust basic site configuration options.'), 'position' => 'right', 'weight' => -5, @@ -135,7 +135,7 @@ function system_menu($may_cache) { 'access' => $access); $items[] = array('path' => 'admin/build', - 'title' => t('site building'), + 'title' => t('Site building'), 'description' => t('Control how your site looks and feels.'), 'position' => 'right', 'weight' => -10, @@ -144,7 +144,7 @@ function system_menu($may_cache) { $items[] = array( 'path' => 'admin/settings/admin', - 'title' => t('administration theme'), + 'title' => t('Administration theme'), 'description' => t('Settings for how your administrative pages should look.'), 'position' => 'left', 'callback' => 'drupal_get_form', @@ -155,7 +155,7 @@ function system_menu($may_cache) { // Themes: $items[] = array( 'path' => 'admin/build/themes', - 'title' => t('themes'), + 'title' => t('Themes'), 'description' => t('Change which theme your site uses or allows users to set.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_themes'), @@ -163,7 +163,7 @@ function system_menu($may_cache) { $items[] = array( 'path' => 'admin/build/themes/select', - 'title' => t('list'), + 'title' => t('List'), 'description' => t('Select the default theme.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_themes'), @@ -172,14 +172,14 @@ function system_menu($may_cache) { 'weight' => -1); $items[] = array('path' => 'admin/build/themes/settings', - 'title' => t('configure'), + 'title' => t('Configure'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_theme_settings'), 'access' => $access, 'type' => MENU_LOCAL_TASK); // Theme configuration subtabs - $items[] = array('path' => 'admin/build/themes/settings/global', 'title' => t('global settings'), + $items[] = array('path' => 'admin/build/themes/settings/global', 'title' => t('Global settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_theme_settings'), 'access' => $access, @@ -196,7 +196,7 @@ function system_menu($may_cache) { // Modules: $items[] = array('path' => 'admin/build/modules', - 'title' => t('modules'), + 'title' => t('Modules'), 'description' => t('Enable or disable add-on modules for your site.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_modules'), @@ -205,31 +205,31 @@ function system_menu($may_cache) { // Settings: $items[] = array( 'path' => 'admin/settings/site-information', - 'title' => t('site information'), + 'title' => t('Site information'), 'description' => t('Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_site_information_settings')); $items[] = array( 'path' => 'admin/settings/error-reporting', - 'title' => t('error reporting'), + 'title' => t('Error reporting'), 'description' => t('Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_error_reporting_settings')); $items[] = array( 'path' => 'admin/settings/page-caching', - 'title' => t('page caching'), + 'title' => t('Page caching'), 'description' => t('Enable or disable page caching for anonymous users.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_page_caching_settings')); $items[] = array( 'path' => 'admin/settings/file-system', - 'title' => t('file system'), + 'title' => t('File system'), 'description' => t('Tell Drupal where to store uploaded files and how they are accessed.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_file_system_settings')); $items[] = array( 'path' => 'admin/settings/image-toolkit', - 'title' => t('image toolkit'), + 'title' => t('Image toolkit'), 'description' => t('Choose which image toolkit to use if you have installed optional toolkits.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_image_toolkit_settings')); @@ -241,19 +241,19 @@ function system_menu($may_cache) { 'callback arguments' => array('system_rss_feeds_settings')); $items[] = array( 'path' => 'admin/settings/date-time', - 'title' => t('date and time'), + 'title' => t('Date and time'), 'description' => t('Settings for how Drupal displays date and time, as well as the system\'s default timezone.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_date_time_settings')); $items[] = array( 'path' => 'admin/settings/site-maintenance', - 'title' => t('site maintenance'), + 'title' => t('Site maintenance'), 'description' => t('Take the site off-line for maintenance or bring it back online.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_site_maintenance_settings')); $items[] = array( 'path' => 'admin/settings/clean-urls', - 'title' => t('clean URLs'), + 'title' => t('Clean URLs'), 'description' => t('Enable or disable clean URLs for your site.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_clean_url_settings')); @@ -262,21 +262,21 @@ function system_menu($may_cache) { // Logs: $items[] = array( 'path' => 'admin/logs', - 'title' => t('logs'), + 'title' => t('Logs'), 'description' => t('View system logs and other status information.'), 'callback' => 'system_admin_menu_block_page', 'weight' => 5, 'position' => 'left'); $items[] = array( 'path' => 'admin/logs/status', - 'title' => t('status report'), + 'title' => t('Status report'), 'description' => t('Get a status report about your site\'s operation and any detected problems.'), 'callback' => 'system_status', 'weight' => 10, 'access' => $access); $items[] = array( 'path' => 'admin/logs/status/run-cron', - 'title' => t('run cron'), + 'title' => t('Run cron'), 'callback' => 'system_run_cron', 'type' => MENU_CALLBACK); $items[] = array( @@ -520,7 +520,7 @@ function system_site_information_settings() { $form['site_name'] = array( '#type' => 'textfield', '#title' => t('Name'), - '#default_value' => variable_get('site_name', 'drupal'), + '#default_value' => variable_get('site_name', 'Drupal'), '#description' => t('The name of this web site.'), '#required' => TRUE ); @@ -2063,7 +2063,7 @@ function system_admin_by_module() { // Check for permissions. if (module_hook($module, 'perm')) { - $admin_tasks[-1] = l(t('configure permissions'), 'admin/user/access'); + $admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/access'); } // Check for menu items that are admin links. @@ -2079,7 +2079,7 @@ function system_admin_by_module() { // Check for help links. if (module_invoke($module, 'help', "admin/help#$module")) { - $admin_tasks[100] = l(t('get help'), "admin/help/$module"); + $admin_tasks[100] = l(t('Get help'), "admin/help/$module"); } // Sort diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 86795cae5..c1c4372cd 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -63,43 +63,43 @@ function taxonomy_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/content/taxonomy', - 'title' => t('categories'), + 'title' => t('Categories'), 'description' => t('Create vocabularies and terms to categorize your content.'), 'callback' => 'taxonomy_overview_vocabularies', 'access' => user_access('administer taxonomy')); $items[] = array('path' => 'admin/content/taxonomy/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/content/taxonomy/add/vocabulary', - 'title' => t('add vocabulary'), + 'title' => t('Add vocabulary'), 'callback' => 'drupal_get_form', 'callback arguments' => array('taxonomy_form_vocabulary'), 'access' => user_access('administer taxonomy'), 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/content/taxonomy/edit/vocabulary', - 'title' => t('edit vocabulary'), + 'title' => t('Edit vocabulary'), 'callback' => 'taxonomy_admin_vocabulary_edit', 'access' => user_access('administer taxonomy'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/content/taxonomy/edit/term', - 'title' => t('edit term'), + 'title' => t('Edit term'), 'callback' => 'taxonomy_admin_term_edit', 'access' => user_access('administer taxonomy'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'taxonomy/term', - 'title' => t('taxonomy term'), + 'title' => t('Taxonomy term'), 'callback' => 'taxonomy_term_page', 'access' => user_access('access content'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'taxonomy/autocomplete', - 'title' => t('autocomplete taxonomy'), + 'title' => t('Autocomplete taxonomy'), 'callback' => 'taxonomy_autocomplete', 'access' => user_access('access content'), 'type' => MENU_CALLBACK); @@ -108,19 +108,19 @@ function taxonomy_menu($may_cache) { if (is_numeric(arg(3))) { $vid = arg(3); $items[] = array('path' => 'admin/content/taxonomy/'. $vid, - 'title' => t('list terms'), + 'title' => t('List terms'), 'callback' => 'taxonomy_overview_terms', 'callback arguments' => array($vid), 'access' => user_access('administer taxonomy'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/content/taxonomy/'. $vid .'/list', - 'title' => t('list'), + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/content/taxonomy/'. $vid .'/add/term', - 'title' => t('add term'), + 'title' => t('Add term'), 'callback' => 'drupal_get_form', 'callback arguments' => array('taxonomy_form_term', $vid), 'access' => user_access('administer taxonomy'), @@ -1312,7 +1312,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') { case 'feed': $term = taxonomy_get_term($tids[0]); $channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, NULL, NULL, TRUE); - $channel['title'] = variable_get('site_name', 'drupal') .' - '. $title; + $channel['title'] = variable_get('site_name', 'Drupal') .' - '. $title; $channel['description'] = $term->description; $result = taxonomy_select_nodes($tids, $terms['operator'], $depth, FALSE); diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module index 9f80af747..3b24cc77b 100644 --- a/modules/throttle/throttle.module +++ b/modules/throttle/throttle.module @@ -13,7 +13,7 @@ function throttle_menu($may_cache) { $items[] = array( 'path' => 'admin/settings/throttle', 'description' => t('Control how your site cuts out content during heavy load.'), - 'title' => t('throttle'), + 'title' => t('Throttle'), 'callback' => 'drupal_get_form', 'callback arguments' => array('throttle_admin_settings'), 'access' => user_access('administer site configuration'), diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index 410b7cbd0..813b8c745 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -34,14 +34,14 @@ function tracker_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'tracker', 'title' => t('recent posts'), + $items[] = array('path' => 'tracker', 'title' => t('Recent posts'), 'callback' => 'tracker_page', 'access' => user_access('access content'), 'weight' => 1); if ($user->uid) { - $items[] = array('path' => 'tracker/all', 'title' => t('all recent posts'), + $items[] = array('path' => 'tracker/all', 'title' => t('All recent posts'), 'type' => MENU_DEFAULT_LOCAL_TASK); - $items[] = array('path' => 'tracker/'. $user->uid, 'title' => t('my recent posts'), + $items[] = array('path' => 'tracker/'. $user->uid, 'title' => t('My recent posts'), 'type' => MENU_LOCAL_TASK); } } @@ -51,10 +51,10 @@ function tracker_menu($may_cache) { drupal_add_css(drupal_get_path('module', 'tracker') .'/tracker.css'); if (arg(0) == 'user' && is_numeric(arg(1))) { - $items[] = array('path' => 'user/'. arg(1) .'/track', 'title' => t('track'), + $items[] = array('path' => 'user/'. arg(1) .'/track', 'title' => t('Track'), 'callback' => 'tracker_track_user', 'access' => user_access('access content'), 'type' => MENU_IS_LOCAL_TASK); - $items[] = array('path' => 'user/'. arg(1) .'/track/posts', 'title' => t('track posts'), + $items[] = array('path' => 'user/'. arg(1) .'/track/posts', 'title' => t('Track posts'), 'type' => MENU_DEFAULT_LOCAL_TASK); } } diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 07aed8d65..9772598d4 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -77,7 +77,7 @@ function upload_menu($may_cache) { 'type' => MENU_CALLBACK ); $items[] = array('path' => 'admin/settings/uploads', - 'title' => t('file uploads'), + 'title' => t('File uploads'), 'description' => t('Control how files may be attached to content.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('upload_admin_settings'), @@ -98,7 +98,7 @@ function upload_menu($may_cache) { } $items[] = array( - 'path' => $filename, 'title' => t('file download'), + 'path' => $filename, 'title' => t('File download'), 'callback' => 'upload_download', 'access' => user_access('view uploaded files'), 'type' => MENU_CALLBACK diff --git a/modules/user/user.module b/modules/user/user.module index 7874ea8f8..48b0b2ee6 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -689,75 +689,75 @@ function user_menu($may_cache) { $view_access = user_access('access user profiles'); if ($may_cache) { - $items[] = array('path' => 'user', 'title' => t('user account'), + $items[] = array('path' => 'user', 'title' => t('User account'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_login'), 'access' => TRUE, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'user/autocomplete', 'title' => t('user autocomplete'), + $items[] = array('path' => 'user/autocomplete', 'title' => t('User autocomplete'), 'callback' => 'user_autocomplete', 'access' => $view_access, 'type' => MENU_CALLBACK); // Registration and login pages. - $items[] = array('path' => 'user/login', 'title' => t('log in'), + $items[] = array('path' => 'user/login', 'title' => t('Log in'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_login'), 'access' => TRUE, 'type' => MENU_DEFAULT_LOCAL_TASK); - $items[] = array('path' => 'user/register', 'title' => t('create new account'), + $items[] = array('path' => 'user/register', 'title' => t('Create new account'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_register'), 'access' => !$user->uid && variable_get('user_register', 1), 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'user/password', 'title' => t('request new password'), + $items[] = array('path' => 'user/password', 'title' => t('Request new password'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_pass'), 'access' => !$user->uid, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'user/reset', 'title' => t('reset password'), + $items[] = array('path' => 'user/reset', 'title' => t('Reset password'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_pass_reset'), 'access' => TRUE, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'user/help', 'title' => t('help'), + $items[] = array('path' => 'user/help', 'title' => t('Help'), 'callback' => 'user_help_page', 'type' => MENU_CALLBACK); // Admin user pages $items[] = array('path' => 'admin/user', - 'title' => t('user management'), + 'title' => t('User management'), 'description' => t('Manage your site\'s users, groups and access to site features.'), 'position' => 'left', 'callback' => 'system_admin_menu_block_page', 'access' => user_access('administer site configuration'), ); - $items[] = array('path' => 'admin/user/user', 'title' => t('users'), + $items[] = array('path' => 'admin/user/user', 'title' => t('Users'), 'description' => t('List, add, and edit users.'), 'callback' => 'user_admin', 'callback arguments' => array('list'), 'access' => $admin_access); - $items[] = array('path' => 'admin/user/user/list', 'title' => t('list'), + $items[] = array('path' => 'admin/user/user/list', 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/user/user/create', 'title' => t('add user'), + $items[] = array('path' => 'admin/user/user/create', 'title' => t('Add user'), 'callback' => 'user_admin', 'callback arguments' => array('create'), 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/user/settings', 'title' => t('user settings'), + $items[] = array('path' => 'admin/user/settings', 'title' => t('User settings'), 'description' => t('Configure default behavior of users, including registration requirements, e-mails, and user pictures.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_settings')); // Admin access pages - $items[] = array('path' => 'admin/user/access', 'title' => t('access control'), + $items[] = array('path' => 'admin/user/access', 'title' => t('Access control'), 'description' => t('Determine access to features by selecting permissions for roles.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_perm'), 'access' => $access_access); - $items[] = array('path' => 'admin/user/roles', 'title' => t('roles'), + $items[] = array('path' => 'admin/user/roles', 'title' => t('Roles'), 'description' => t('List, edit, or add user roles.'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_new_role'), 'access' => $access_access, 'type' => MENU_NORMAL_ITEM); - $items[] = array('path' => 'admin/user/roles/edit', 'title' => t('edit role'), + $items[] = array('path' => 'admin/user/roles/edit', 'title' => t('Edit role'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_role'), 'access' => $access_access, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/user/rules', 'title' => t('access rules'), + $items[] = array('path' => 'admin/user/rules', 'title' => t('Access rules'), 'description' => t('List and create rules to disallow usernames, e-mail addresses, and IP addresses.'), 'callback' => 'user_admin_access', 'access' => $access_access); - $items[] = array('path' => 'admin/user/rules/list', 'title' => t('list'), + $items[] = array('path' => 'admin/user/rules/list', 'title' => t('List'), 'access' => $access_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/user/rules/add', 'title' => t('add rule'), + $items[] = array('path' => 'admin/user/rules/add', 'title' => t('Add rule'), 'callback' => 'user_admin_access_add', 'access' => $access_access, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/user/rules/check', 'title' => t('check rules'), + $items[] = array('path' => 'admin/user/rules/check', 'title' => t('Check rules'), 'callback' => 'user_admin_access_check', 'access' => $access_access, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/user/rules/edit', 'title' => t('edit rule'), + $items[] = array('path' => 'admin/user/rules/edit', 'title' => t('Edit rule'), 'callback' => 'user_admin_access_edit', 'access' => $access_access, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/user/rules/delete', 'title' => t('delete rule'), + $items[] = array('path' => 'admin/user/rules/delete', 'title' => t('Delete rule'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_admin_access_delete_confirm'), 'access' => $access_access, 'type' => MENU_CALLBACK); if (module_exists('search')) { - $items[] = array('path' => 'admin/user/search', 'title' => t('search users'), + $items[] = array('path' => 'admin/user/search', 'title' => t('Search users'), 'description' => t('Search users by name.'), 'callback' => 'user_admin', 'callback arguments' => array('search'), 'access' => $admin_access, 'type' => MENU_NORMAL_ITEM); @@ -765,12 +765,12 @@ function user_menu($may_cache) { // Your personal page if ($user->uid) { - $items[] = array('path' => 'user/'. $user->uid, 'title' => t('my account'), + $items[] = array('path' => 'user/'. $user->uid, 'title' => t('My account'), 'callback' => 'user_view', 'callback arguments' => array(arg(1)), 'access' => TRUE, 'type' => MENU_DYNAMIC_ITEM); } - $items[] = array('path' => 'logout', 'title' => t('log out'), + $items[] = array('path' => 'logout', 'title' => t('Log out'), 'access' => $user->uid, 'callback' => 'user_logout', 'weight' => 10); @@ -789,17 +789,17 @@ function user_menu($may_cache) { // Only admins can view blocked accounts $view_access &= $account->status || $admin_access; - $items[] = array('path' => 'user/'. arg(1), 'title' => t('user'), + $items[] = array('path' => 'user/'. arg(1), 'title' => t('User'), 'type' => MENU_CALLBACK, 'callback' => 'user_view', 'callback arguments' => array(arg(1)), 'access' => $view_access); - $items[] = array('path' => 'user/'. arg(1) .'/view', 'title' => t('view'), + $items[] = array('path' => 'user/'. arg(1) .'/view', 'title' => t('View'), 'access' => $view_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'user/'. arg(1) .'/edit', 'title' => t('edit'), + $items[] = array('path' => 'user/'. arg(1) .'/edit', 'title' => t('Edit'), 'callback' => 'drupal_get_form', 'callback arguments' => array('user_edit'), 'access' => $admin_access || $user->uid == arg(1), 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'user/'. arg(1) .'/delete', 'title' => t('delete'), + $items[] = array('path' => 'user/'. arg(1) .'/delete', 'title' => t('Delete'), 'callback' => 'user_edit', 'access' => $admin_access, 'type' => MENU_CALLBACK); @@ -1051,7 +1051,7 @@ function user_pass_submit($form_id, $form_values) { $from = variable_get('site_mail', ini_get('sendmail_from')); // Mail one time login URL and instructions. - $variables = array('!username' => $account->name, '!site' => variable_get('site_name', 'drupal'), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $account->mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE)); + $variables = array('!username' => $account->name, '!site' => variable_get('site_name', 'Drupal'), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $account->mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE)); $subject = _user_mail_text('pass_subject', $variables); $body = _user_mail_text('pass_body', $variables); $mail_success = drupal_mail('user-pass', $account->mail, $subject, $body, $from); @@ -1218,7 +1218,7 @@ function user_register_submit($form_id, $form_values) { $account = user_save('', array_merge($form_values, array('pass' => $pass, 'init' => $mail, 'roles' => $roles, 'status' => ($admin || variable_get('user_register', 1) == 1)))); watchdog('user', t('New user: %name %email.', array('%name' => $name, '%email' => '<'. $mail .'>')), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit')); - $variables = array('!username' => $name, '!site' => variable_get('site_name', 'drupal'), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '!login_url' => user_pass_reset_url($account)); + $variables = array('!username' => $name, '!site' => variable_get('site_name', 'Drupal'), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '!login_url' => user_pass_reset_url($account)); // The first user may login immediately, and receives a customized welcome e-mail. if ($account->uid == 1) { diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 806bc7b97..b3312b0de 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -40,19 +40,19 @@ function watchdog_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'admin/logs/watchdog', 'title' => t('recent log entries'), + $items[] = array('path' => 'admin/logs/watchdog', 'title' => t('Recent log entries'), 'description' => t('View events that have recently been logged.'), 'callback' => 'watchdog_overview', 'weight' => -1); - $items[] = array('path' => 'admin/logs/page-not-found', 'title' => t("top 'page not found' errors"), + $items[] = array('path' => 'admin/logs/page-not-found', 'title' => t("Top 'page not found' errors"), 'description' => t("View 'page not found' errors (404s)."), 'callback' => 'watchdog_top', 'callback arguments' => array('page not found')); - $items[] = array('path' => 'admin/logs/access-denied', 'title' => t("top 'access denied' errors"), + $items[] = array('path' => 'admin/logs/access-denied', 'title' => t("Top 'access denied' errors"), 'description' => t("View 'access denied' errors (403s)."), 'callback' => 'watchdog_top', 'callback arguments' => array('access denied')); - $items[] = array('path' => 'admin/logs/event', 'title' => t('details'), + $items[] = array('path' => 'admin/logs/event', 'title' => t('Details'), 'callback' => 'watchdog_event', 'type' => MENU_CALLBACK); } diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 086bf2128..d6d5138f4 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -35,7 +35,7 @@ function chameleon_page($content, $show_blocks = TRUE) { $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\">\n"; $output .= "<head>\n"; - $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n"; + $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "Drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n"; $output .= drupal_get_html_head(); $output .= drupal_get_css(); $output .= drupal_get_js(); diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index 2e8027a58..b6504d06a 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -186,7 +186,7 @@ function phptemplate_page($content, $show_blocks = TRUE) { // Construct page title if (drupal_get_title()) { - $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'drupal')); + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); } else { $head_title = array(variable_get('site_name', 'drupal')); |