From c6b1eaa20d665ca608d31536f995451634be3963 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 5 Aug 2004 05:40:53 +0000 Subject: [PATCH] - Patch #9775 by TDobes: consistency operation. Changed to "edit foo," "delete foo," and "view foo" links into simply "edit," "delete," and "view". --- modules/aggregator.module | 4 ++-- modules/aggregator/aggregator.module | 4 ++-- modules/block.module | 4 ++-- modules/block/block.module | 4 ++-- modules/blogapi.module | 4 ++-- modules/blogapi/blogapi.module | 4 ++-- modules/book.module | 5 +---- modules/book/book.module | 5 +---- modules/comment.module | 24 ++++++++++++------------ modules/comment/comment.module | 24 ++++++++++++------------ modules/node.module | 4 ++-- modules/node/node.module | 4 ++-- modules/user.module | 18 +++++++++--------- modules/user/user.module | 18 +++++++++--------- 14 files changed, 60 insertions(+), 66 deletions(-) diff --git a/modules/aggregator.module b/modules/aggregator.module index 9035354617..6a2d535406 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -691,7 +691,7 @@ function aggregator_view() { $header = array(t('title'), t('items'), t('last update'), t('next update'), array('data' => t('operations'), 'colspan' => 3)); $rows = array(); while ($feed = db_fetch_object($result)) { - $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit feed'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); + $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); } $output .= theme('table', $header, $rows); @@ -702,7 +702,7 @@ function aggregator_view() { $header = array(t('title'), t('items'), t('operations')); $rows = array(); while ($category = db_fetch_object($result)) { - $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit category'), "admin/aggregator/edit/category/$category->cid")); + $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid")); } $output .= theme('table', $header, $rows); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 9035354617..6a2d535406 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -691,7 +691,7 @@ function aggregator_view() { $header = array(t('title'), t('items'), t('last update'), t('next update'), array('data' => t('operations'), 'colspan' => 3)); $rows = array(); while ($feed = db_fetch_object($result)) { - $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit feed'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); + $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); } $output .= theme('table', $header, $rows); @@ -702,7 +702,7 @@ function aggregator_view() { $header = array(t('title'), t('items'), t('operations')); $rows = array(); while ($category = db_fetch_object($result)) { - $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit category'), "admin/aggregator/edit/category/$category->cid")); + $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid")); } $output .= theme('table', $header, $rows); diff --git a/modules/block.module b/modules/block.module index aa0859674c..1678509b70 100644 --- a/modules/block.module +++ b/modules/block.module @@ -183,8 +183,8 @@ function block_admin_display() { foreach ($blocks as $block) { if ($block['module'] == 'block') { - $edit = l(t('edit block'), 'admin/block/edit/'. $block['delta']); - $delete = l(t('delete block'), 'admin/block/delete/'. $block['delta']); + $edit = l(t('edit'), 'admin/block/edit/'. $block['delta']); + $delete = l(t('delete'), 'admin/block/delete/'. $block['delta']); } else { $edit = ''; diff --git a/modules/block/block.module b/modules/block/block.module index aa0859674c..1678509b70 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -183,8 +183,8 @@ function block_admin_display() { foreach ($blocks as $block) { if ($block['module'] == 'block') { - $edit = l(t('edit block'), 'admin/block/edit/'. $block['delta']); - $delete = l(t('delete block'), 'admin/block/delete/'. $block['delta']); + $edit = l(t('edit'), 'admin/block/edit/'. $block['delta']); + $delete = l(t('delete'), 'admin/block/delete/'. $block['delta']); } else { $edit = ''; diff --git a/modules/blogapi.module b/modules/blogapi.module index 9218e8fb3b..41f7eebdea 100644 --- a/modules/blogapi.module +++ b/modules/blogapi.module @@ -143,7 +143,7 @@ function blogapi_new_post($req_params) { $nid = node_save($node); if ($nid) { - watchdog('special', t('%node-type: added "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$nid")); + watchdog('special', t('%node-type: added "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$nid")); return new xmlrpcresp(new xmlrpcval($nid, 'string')); } @@ -203,7 +203,7 @@ function blogapi_edit_post($req_params) { } $nid = node_save($node); if ($nid) { - watchdog('special', t('%node-type: updated "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$nid")); + watchdog('special', t('%node-type: updated "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$nid")); return new xmlrpcresp(new xmlrpcval(true, 'boolean')); } diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index 9218e8fb3b..41f7eebdea 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -143,7 +143,7 @@ function blogapi_new_post($req_params) { $nid = node_save($node); if ($nid) { - watchdog('special', t('%node-type: added "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$nid")); + watchdog('special', t('%node-type: added "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$nid")); return new xmlrpcresp(new xmlrpcval($nid, 'string')); } @@ -203,7 +203,7 @@ function blogapi_edit_post($req_params) { } $nid = node_save($node); if ($nid) { - watchdog('special', t('%node-type: updated "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$nid")); + watchdog('special', t('%node-type: updated "%node-title" using blog API', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$nid")); return new xmlrpcresp(new xmlrpcval(true, 'boolean')); } diff --git a/modules/book.module b/modules/book.module index 7b8a60811e..a4f72ebc60 100644 --- a/modules/book.module +++ b/modules/book.module @@ -58,9 +58,6 @@ function book_link($type, $node = 0, $main = 0) { } if ($type == 'node' && $node->type == 'book') { - if (book_access('update', $node)) { - $links[] = l(t('edit this page'), 'node/'. $node->nid .'/edit', array('title' => t('Suggest an update for this book page.'))); - } if (!$main) { $links[] = l(t('printer-friendly version'), 'book/print/'. $node->nid, array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))); } @@ -690,7 +687,7 @@ function book_print_recurse($parent = '', $depth = 1) { } function book_admin_view_line($node, $depth = 0) { - return array('
'. form_textfield(NULL, $node->nid .'][title', $node->title, 64, 255) .'
', form_weight(NULL, $node->nid .'][weight', $node->weight), l(t('view node'), 'node/'. $node->nid), l(t('edit node'), 'node/'. $node->nid .'/edit'), l(t('delete node'), 'admin/node/delete/'. $node->nid)); + return array('
'. form_textfield(NULL, $node->nid .'][title', $node->title, 64, 255) .'
', form_weight(NULL, $node->nid .'][weight', $node->weight), l(t('view'), 'node/'. $node->nid), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } function book_admin_view_book($nid, $depth = 1) { diff --git a/modules/book/book.module b/modules/book/book.module index 7b8a60811e..a4f72ebc60 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -58,9 +58,6 @@ function book_link($type, $node = 0, $main = 0) { } if ($type == 'node' && $node->type == 'book') { - if (book_access('update', $node)) { - $links[] = l(t('edit this page'), 'node/'. $node->nid .'/edit', array('title' => t('Suggest an update for this book page.'))); - } if (!$main) { $links[] = l(t('printer-friendly version'), 'book/print/'. $node->nid, array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))); } @@ -690,7 +687,7 @@ function book_print_recurse($parent = '', $depth = 1) { } function book_admin_view_line($node, $depth = 0) { - return array('
'. form_textfield(NULL, $node->nid .'][title', $node->title, 64, 255) .'
', form_weight(NULL, $node->nid .'][weight', $node->weight), l(t('view node'), 'node/'. $node->nid), l(t('edit node'), 'node/'. $node->nid .'/edit'), l(t('delete node'), 'admin/node/delete/'. $node->nid)); + return array('
'. form_textfield(NULL, $node->nid .'][title', $node->title, 64, 255) .'
', form_weight(NULL, $node->nid .'][weight', $node->weight), l(t('view'), 'node/'. $node->nid), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } function book_admin_view_book($nid, $depth = 1) { diff --git a/modules/comment.module b/modules/comment.module index c740eea78d..8c528d3138 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -61,9 +61,9 @@ function comment_help($section = "admin/help#comment") {

Finally, you may want to enter some initial comment scores. In administer » comments » configure » moderation roles you can assign a beginning rating for all comments posted by a particular permission role. If you do not assign any initial scores, Drupal will assign a rating of 0 as the default.

", array('%comment-config' => url('admin/comment/configure'), '%user-permissions' => url('admin/user/configure/permission'), '%tracker' => url('tracker'), '%download-notify' => 'http://drupal.org/project/releases', '%comment-votes' => url('admin/comment/configure/votes'), '%comment-matrix' => url('admin/comment/configure/matrix'), '%comment-thresholds' => url('admin/comment/configure/thresholds'), '%slashdot' => ' http://slashdot.org', '%comment-initial' => url('admin/comment/configure/roles'))); case 'admin/comment': case 'admin/comment/new': - return t("Below is a list of the latest comments posted your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit comment\" to modify the text, and \"delete comment\" to remove their submission."); + return t("Below is a list of the latest comments posted your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission."); case 'admin/comment/approval': - return t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit comment\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit comment\" to modify the text, and \"delete comment\" to remove their submission."); + return t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit\" to modify the text, and \"delete\" to remove their submission."); case 'admin/comment/configure': case 'admin/comment/configure/settings': return t("Comments can be attached to any node, and their settings are below. The display comes in two types: a \"flat list\" where everything is flush to the left side, and comments come in chronological order, and a \"threaded list\" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: \"expanded\", where you see both the title and the contents, and \"collapsed\" where you only see the title. Preview comment forces a user to look at their comment by clicking on a \"Preview\" button before they can actually add the comment."); @@ -268,7 +268,7 @@ function comment_node_link($node) { while ($comment = db_fetch_object($result)) { $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name; - $rows[] = array(l($comment->subject, "node/$node->nid", NULL, NULL, "comment-$comment->cid"), format_name($comment), l(t('view comment'), "node/$node->nid", NULL, NULL, $comment->cid), l(t('edit comment'), "admin/comment/edit/$comment->cid"), l(t('delete comment'), "admin/comment/delete/$comment->cid")); + $rows[] = array(l($comment->subject, "node/$node->nid", NULL, NULL, "comment-$comment->cid"), format_name($comment), l(t('view'), "node/$node->nid", NULL, NULL, $comment->cid), l(t('edit'), "admin/comment/edit/$comment->cid"), l(t('delete'), "admin/comment/delete/$comment->cid")); } if ($rows) { @@ -555,7 +555,7 @@ function comment_post($edit) { module_invoke_all('comment', 'update', $edit); // Add entry to the watchdog log. - watchdog('special', t('comment: updated "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view comment'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + watchdog('special', t('comment: updated "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); } else { // Add the comment to database. @@ -664,7 +664,7 @@ function comment_post($edit) { module_invoke_all('comment', 'insert', $edit); // Add an entry to the watchdog log. - watchdog('special', t('comment: added "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view comment'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + watchdog('special', t('comment: added "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); } // Clear the cache so an anonymous user can see his comment being added. @@ -701,15 +701,15 @@ function comment_links($comment, $return = 1) { if (node_comment_mode($comment->nid) == 2) { if (user_access('administer comments') && user_access('access administration pages')) { - $links[] = l(t('delete comment'), "admin/comment/delete/$comment->cid"); - $links[] = l(t('edit comment'), "admin/comment/edit/$comment->cid"); - $links[] = l(t('reply to this comment'), "comment/reply/$comment->nid/$comment->cid"); + $links[] = l(t('delete'), "admin/comment/delete/$comment->cid"); + $links[] = l(t('edit'), "admin/comment/edit/$comment->cid"); + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); } else if (user_access('post comments')) { if (comment_access('edit', $comment)) { - $links[] = l(t('edit your comment'), "comment/edit/$comment->cid"); + $links[] = l(t('edit'), "comment/edit/$comment->cid"); } - $links[] = l(t('reply to this comment'), "comment/reply/$comment->nid/$comment->cid"); + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); } else { $links[] = theme('comment_post_forbidden'); @@ -1028,8 +1028,8 @@ function comment_admin_overview($type = 'new') { format_name($comment), ($comment->status == 0 ? t('published') : t('not published')), format_date($comment->timestamp, 'small'), - l(t('edit comment'), "admin/comment/edit/$comment->cid"), - l(t('delete comment'), "admin/comment/delete/$comment->cid") + l(t('edit'), "admin/comment/edit/$comment->cid"), + l(t('delete'), "admin/comment/delete/$comment->cid") ); } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index c740eea78d..8c528d3138 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -61,9 +61,9 @@ function comment_help($section = "admin/help#comment") {

Finally, you may want to enter some initial comment scores. In administer » comments » configure » moderation roles you can assign a beginning rating for all comments posted by a particular permission role. If you do not assign any initial scores, Drupal will assign a rating of 0 as the default.

", array('%comment-config' => url('admin/comment/configure'), '%user-permissions' => url('admin/user/configure/permission'), '%tracker' => url('tracker'), '%download-notify' => 'http://drupal.org/project/releases', '%comment-votes' => url('admin/comment/configure/votes'), '%comment-matrix' => url('admin/comment/configure/matrix'), '%comment-thresholds' => url('admin/comment/configure/thresholds'), '%slashdot' => ' http://slashdot.org', '%comment-initial' => url('admin/comment/configure/roles'))); case 'admin/comment': case 'admin/comment/new': - return t("Below is a list of the latest comments posted your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit comment\" to modify the text, and \"delete comment\" to remove their submission."); + return t("Below is a list of the latest comments posted your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission."); case 'admin/comment/approval': - return t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit comment\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit comment\" to modify the text, and \"delete comment\" to remove their submission."); + return t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit\" to modify the text, and \"delete\" to remove their submission."); case 'admin/comment/configure': case 'admin/comment/configure/settings': return t("Comments can be attached to any node, and their settings are below. The display comes in two types: a \"flat list\" where everything is flush to the left side, and comments come in chronological order, and a \"threaded list\" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: \"expanded\", where you see both the title and the contents, and \"collapsed\" where you only see the title. Preview comment forces a user to look at their comment by clicking on a \"Preview\" button before they can actually add the comment."); @@ -268,7 +268,7 @@ function comment_node_link($node) { while ($comment = db_fetch_object($result)) { $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name; - $rows[] = array(l($comment->subject, "node/$node->nid", NULL, NULL, "comment-$comment->cid"), format_name($comment), l(t('view comment'), "node/$node->nid", NULL, NULL, $comment->cid), l(t('edit comment'), "admin/comment/edit/$comment->cid"), l(t('delete comment'), "admin/comment/delete/$comment->cid")); + $rows[] = array(l($comment->subject, "node/$node->nid", NULL, NULL, "comment-$comment->cid"), format_name($comment), l(t('view'), "node/$node->nid", NULL, NULL, $comment->cid), l(t('edit'), "admin/comment/edit/$comment->cid"), l(t('delete'), "admin/comment/delete/$comment->cid")); } if ($rows) { @@ -555,7 +555,7 @@ function comment_post($edit) { module_invoke_all('comment', 'update', $edit); // Add entry to the watchdog log. - watchdog('special', t('comment: updated "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view comment'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + watchdog('special', t('comment: updated "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); } else { // Add the comment to database. @@ -664,7 +664,7 @@ function comment_post($edit) { module_invoke_all('comment', 'insert', $edit); // Add an entry to the watchdog log. - watchdog('special', t('comment: added "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view comment'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + watchdog('special', t('comment: added "%comment-subject"', array('%comment-subject' => $edit['subject'])), l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); } // Clear the cache so an anonymous user can see his comment being added. @@ -701,15 +701,15 @@ function comment_links($comment, $return = 1) { if (node_comment_mode($comment->nid) == 2) { if (user_access('administer comments') && user_access('access administration pages')) { - $links[] = l(t('delete comment'), "admin/comment/delete/$comment->cid"); - $links[] = l(t('edit comment'), "admin/comment/edit/$comment->cid"); - $links[] = l(t('reply to this comment'), "comment/reply/$comment->nid/$comment->cid"); + $links[] = l(t('delete'), "admin/comment/delete/$comment->cid"); + $links[] = l(t('edit'), "admin/comment/edit/$comment->cid"); + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); } else if (user_access('post comments')) { if (comment_access('edit', $comment)) { - $links[] = l(t('edit your comment'), "comment/edit/$comment->cid"); + $links[] = l(t('edit'), "comment/edit/$comment->cid"); } - $links[] = l(t('reply to this comment'), "comment/reply/$comment->nid/$comment->cid"); + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); } else { $links[] = theme('comment_post_forbidden'); @@ -1028,8 +1028,8 @@ function comment_admin_overview($type = 'new') { format_name($comment), ($comment->status == 0 ? t('published') : t('not published')), format_date($comment->timestamp, 'small'), - l(t('edit comment'), "admin/comment/edit/$comment->cid"), - l(t('delete comment'), "admin/comment/delete/$comment->cid") + l(t('edit'), "admin/comment/edit/$comment->cid"), + l(t('delete'), "admin/comment/delete/$comment->cid") ); } diff --git a/modules/node.module b/modules/node.module index b7ec704932..8bb328dcf3 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1339,7 +1339,7 @@ function node_submit($node) { // perform this operation: if (node_access('update', $node)) { $node->nid = node_save($node); - watchdog('special', t('%node-type: updated "%node-title"', array('%node-type' => t($node->type), '%node-title' => $node->title)), l(t('view post'), 'node/'. $node->nid)); + watchdog('special', t('%node-type: updated "%node-title"', array('%node-type' => t($node->type), '%node-title' => $node->title)), l(t('view'), 'node/'. $node->nid)); $msg = t('the %name was updated.', array ('%name' => node_invoke($node, 'node_name'))); } } @@ -1348,7 +1348,7 @@ function node_submit($node) { // perform this operation: if (node_access('create', $node)) { $node->nid = node_save($node); - watchdog('special', t('%node-type: added "%node-title"', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$node->nid")); + watchdog('special', t('%node-type: added "%node-title"', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$node->nid")); $msg = t('your %name was created.', array ('%name' => node_invoke($node, 'node_name'))); } } diff --git a/modules/node/node.module b/modules/node/node.module index b7ec704932..8bb328dcf3 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1339,7 +1339,7 @@ function node_submit($node) { // perform this operation: if (node_access('update', $node)) { $node->nid = node_save($node); - watchdog('special', t('%node-type: updated "%node-title"', array('%node-type' => t($node->type), '%node-title' => $node->title)), l(t('view post'), 'node/'. $node->nid)); + watchdog('special', t('%node-type: updated "%node-title"', array('%node-type' => t($node->type), '%node-title' => $node->title)), l(t('view'), 'node/'. $node->nid)); $msg = t('the %name was updated.', array ('%name' => node_invoke($node, 'node_name'))); } } @@ -1348,7 +1348,7 @@ function node_submit($node) { // perform this operation: if (node_access('create', $node)) { $node->nid = node_save($node); - watchdog('special', t('%node-type: added "%node-title"', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view post'), "node/$node->nid")); + watchdog('special', t('%node-type: added "%node-title"', array('%node-type' => t("$node->type"), '%node-title' => $node->title)), l(t('view'), "node/$node->nid")); $msg = t('your %name was created.', array ('%name' => node_invoke($node, 'node_name'))); } } diff --git a/modules/user.module b/modules/user.module index a39d3159de..351f09a61d 100644 --- a/modules/user.module +++ b/modules/user.module @@ -784,7 +784,7 @@ function user_login($edit = array(), $msg = '') { $account = user_load(array('name' => "$name@$server")); if (!$account->uid) { // Register this new user. $user = user_save('', array('name' => "$name@$server", 'pass' => user_password(), 'init' => "$name@$server", 'status' => 1, "authname_$module" => "$name@$server", 'roles' => array(_user_authenticated_id()))); - watchdog('user', "new user: $name@$server ($module ID)", l(t('edit user'), "user/$user->uid/edit")); + watchdog('user', "new user: $name@$server ($module ID)", l(t('edit'), "user/$user->uid/edit")); break; } } @@ -949,7 +949,7 @@ function user_register($edit = array()) { // TODO: Is this necessary? Won't session_write() replicate this? unset($edit['session']); $account = user_save('', array('name' => $edit['name'], 'pass' => $pass, 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => array(_user_authenticated_id()), 'status' => (variable_get('user_register', 1) == 1 ? 1 : 0))); - watchdog('user', 'new user: "'. $edit['name'] .'" <'. $edit['mail'] .'>', l(t('edit user'), "user/$account->uid/edit")); + watchdog('user', 'new user: "'. $edit['name'] .'" <'. $edit['mail'] .'>', l(t('edit'), "user/$account->uid/edit")); $variables = array('%username' => $edit['name'], '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $edit['mail'], '%date' => format_date(time()), '%login_uri' => url('user/login', NULL, NULL, TRUE), '%edit_uri' => url('user/edit', NULL, NULL, TRUE)); @@ -1323,12 +1323,12 @@ function user_admin_access($edit = array()) { $header = array(t('type'), t('mask'), t('operations')); $result = db_query("SELECT * FROM {access} WHERE type = '%s' AND status = 1 ORDER BY mask", $type); while ($rule = db_fetch_object($result)) { - $rows[] = array(t('Allow'), $rule->mask, array('data' => l(t('delete rule'), "admin/user/configure/access/$type/$rule->aid"), 'align' => 'center')); + $rows[] = array(t('Allow'), $rule->mask, array('data' => l(t('delete'), "admin/user/configure/access/$type/$rule->aid"), 'align' => 'center')); } $result = db_query("SELECT * FROM {access} WHERE type = '%s' AND status = 0 ORDER BY mask", $type); while ($rule = db_fetch_object($result)) { - $rows[] = array(t('Deny'), $rule->mask, l(t('delete rule'), "admin/user/configure/access/$type/$rule->aid")); + $rows[] = array(t('Deny'), $rule->mask, l(t('delete'), "admin/user/configure/access/$type/$rule->aid")); } $options = array('1' => t('Allow'), '0' => t('Deny')); @@ -1459,7 +1459,7 @@ function user_admin_role($edit = array()) { $header = array(t('name'), t('operations')); while ($role = db_fetch_object($result)) { if ($role->name != 'anonymous user' && $role->name != 'authenticated user') { - $rows[] = array($role->name, array('data' => l(t('edit role'), "admin/user/configure/role/$role->rid"), 'align' => 'center')); + $rows[] = array($role->name, array('data' => l(t('edit'), "admin/user/configure/role/$role->rid"), 'align' => 'center')); } else { $rows[] = array($role->name, array('data' => ''. t('locked') .'', 'align' => 'center')); @@ -1496,7 +1496,7 @@ function user_admin_account() { $roles[] = $role->name; } - $rows[] = array($account->uid, format_name($account), $status[$account->status], implode(',
', $roles), format_date($account->changed, 'small'), l(t('edit account'), "user/$account->uid/edit")); + $rows[] = array($account->uid, format_name($account), $status[$account->status], implode(',
', $roles), format_date($account->changed, 'small'), l(t('edit'), "user/$account->uid/edit")); } $pager = theme('pager', NULL, 50, 0, tablesort_pager()); @@ -1576,14 +1576,14 @@ function user_help($section) { case 'admin/user/configure/access': return t('Access rules allow Drupal administrators to choose usernames and e-mail address that are prevented from using drupal. To enter the mask for e-mail addresses click on e-mail rules, for the username mask click on name rules.', array('%e-mail' => url('admin/user/configure/access/mail'), '%username' => url('admin/user/configure/access/name'))); case 'admin/user/configure/access/mail': - return t('Setup and test the e-mail access rules. The access function checks if you match a deny and not an allow. If you match only a deny then it is denied. Any other case, such as both a deny and an allow pattern matching, allows the pattern.
Notes: '); + return t('Setup and test the e-mail access rules. The access function checks if you match a deny and not an allow. If you match only a deny then it is denied. Any other case, such as both a deny and an allow pattern matching, allows the pattern.'); case 'admin/user/configure/access/name': - return t('Setup and test the username access rules. The access function checks if you match a deny and not an allow. If you do then it is denied. Any other case, such as a deny pattern and an allow pattern, allows the pattern.
Notes: '); + return t('Setup and test the username access rules. The access function checks if you match a deny and not an allow. If you do then it is denied. Any other case, such as a deny pattern and an allow pattern, allows the pattern.'); case 'admin/user/configure/permission': return t('In this area you will define the permissions for each user role (role names are defined on the user roles page). Each permission describes a fine-grained logical operation, such as being able to access the administration pages, or adding/modifying a user account. You could say a permission represents access granted to a user to perform a set of operations.', array('%role' => url('admin/user/configure/role'))); case 'admin/user/configure/role': return t(' - Roles allow you to fine tune the security and administration of drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit role".
By default, Drupal comes with two user roles: + Roles allow you to fine tune the security and administration of drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles: