diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/blog/blog.module | 2 | ||||
| -rw-r--r-- | modules/help/help.module | 6 | ||||
| -rw-r--r-- | modules/node/node.module | 6 | ||||
| -rw-r--r-- | modules/profile/profile.module | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 1c9e0d3e0..b4892e738 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -255,7 +255,7 @@ function blog_link($type, $node = NULL, $teaser = FALSE) { if ($type == 'node' && $node->type == 'blog') { if (arg(0) != 'blog' || arg(1) != $node->uid) { $links['blog_usernames_blog'] = array( - 'title' => t("%username's blog", array('%username' => $node->name)), + 'title' => t("@username's blog", array('@username' => $node->name)), 'href' => "blog/$node->uid", 'attributes' => array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name))) ); diff --git a/modules/help/help.module b/modules/help/help.module index 428808f8c..c4ae90256 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -44,7 +44,7 @@ function help_main() { $output = t(" <h2>Help topics</h2> <p>Help is available on the following items:</p> - %help_pages + !help_pages <h2>Glossary of Drupal terminology</h2> <dl> <dt>Block</dt><dd>A small box containing information or content placed in the left-hand or right-hand sidebar of a web page.</dd> @@ -60,11 +60,11 @@ function help_main() { <dt>Public</dt><dd>See published.</dd> <dt>Published</dt><dd>A node that is viewable by everyone. (See unpublished.)</dd> <dt>Role</dt><dd>A classification users are placed into for the purpose of setting users' permissions.</dd> - <dt>Taxonomy</dt><dd>A division of a collection of things into ordered, classified groups. (See <a href=\"%taxonomy\">taxonomy help</a>.)</dd> + <dt>Taxonomy</dt><dd>A division of a collection of things into ordered, classified groups. (See <a href=\"@taxonomy\">taxonomy help</a>.)</dd> <dt>Unpublished</dt><dd>A node that is only viewable by administrators and moderators.</dd> <dt>User</dt><dd>A person who has an account at your Drupal site, and is logged in with that account.</dd> <dt>Visitor</dt><dd>A person who does not have an account at your Drupal site or a person who has an account at your Drupal site but is <strong>not</strong> logged in with that account. Also termed \"anonymous user\".</dd> - </dl>", array('%help_pages' => help_links_as_list(), '%taxonomy' => url('admin/help/taxonomy'))); + </dl>", array('!help_pages' => help_links_as_list(), '@taxonomy' => url('admin/help/taxonomy'))); return $output; } diff --git a/modules/node/node.module b/modules/node/node.module index b8eb22d4c..2fd9d7c84 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1809,7 +1809,7 @@ function node_validate($node, $form = array()) { // Make sure the body has the minimum number of words. // todo use a better word counting algorithm that will work in other languages if (isset($node->body) && count(explode(' ', $node->body)) < $type->min_word_count) { - form_set_error('body', t('The body of your @type is too short. You need at least %words words.', array('%words' => $type->min_word_count, '%type' => $type->name))); + form_set_error('body', t('The body of your @type is too short. You need at least %words words.', array('%words' => $type->min_word_count, '@type' => $type->name))); } if (isset($node->nid) && (node_last_changed($node->nid) > $_POST['edit']['changed'])) { @@ -2004,14 +2004,14 @@ function node_add($type = NULL) { $node = array('uid' => $user->uid, 'name' => $user->name, 'type' => $type); $output = drupal_get_form($type .'_node_form', $node); - drupal_set_title(t('Submit @name', array('%name' => $types[$type]->name))); + drupal_set_title(t('Submit @name', array('@name' => $types[$type]->name))); } else { // If no (valid) node type has been provided, display a node type overview. foreach ($types as $type) { 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)); + $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 .= '<dd>'. filter_xss_admin($type->description) .'</dd>'; $item[$type->type] = $out; diff --git a/modules/profile/profile.module b/modules/profile/profile.module index bc40edb6d..66d4ef84d 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -37,7 +37,7 @@ function profile_help($section) { <li>view user <a href="@profile">profiles</a>.</li> <li>administer profile settings: <a href="@admin-settings-profile">administer >> user management >> profiles</a>.</li> </ul> -', array('%profile' => url('profile'), '%admin-settings-profile' => url('admin/user/profile'))); +', array('@profile' => url('profile'), '@admin-settings-profile' => url('admin/user/profile'))); $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@profile">Profile page</a>.', array('@profile' => 'http://drupal.org/handbook/modules/profile/')) .'</p>'; return $output; case 'admin/settings/modules#description': |