- Patch #80934 by timnc: more t() fixes.

6 files changed, 8 insertions, 8 deletions

diff --git a/includes/pager.inc b/includes/pager.inc
index 31e01a79a..ee75166c5 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -388,7 +388,7 @@ function theme_pager_link($text, $page_new, $element, $parameters = array(), $at
       $attributes['title'] = $titles[$text];
     }
     else if (is_numeric($text)) {
-      $attributes['title'] = t('Go to page %number', array('%number' => $text));
+      $attributes['title'] = t('Go to page @number', array('@number' => $text));
     }
   }
 
diff --git a/includes/tablesort.inc b/includes/tablesort.inc
index a2bba4d6a..eb1415615 100644
--- a/includes/tablesort.inc
+++ b/includes/tablesort.inc
@@ -63,7 +63,7 @@ function tablesort_sql($header, $before = '') {
 function tablesort_header($cell, $header, $ts) {
   // Special formatting for the currently sorted column header.
   if (is_array($cell) && isset($cell['field'])) {
-    $title = t('sort by %s', array('%s' => $cell['data']));
+    $title = t('sort by @s', array('@s' => $cell['data']));
     if ($cell['data'] == $ts['name']) {
       $ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc');
       $cell['class'] = 'active';
diff --git a/modules/block/block.module b/modules/block/block.module
index e2e07d921..579dbcd20 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -324,7 +324,7 @@ function theme_block_admin_display($form) {
 
       // Output region header
       if ($status && $region != $last_region) {
-        $region_title = t('%region', array('%region' => drupal_ucfirst($block_regions[$region])));
+        $region_title = t('@region', array('@region' => drupal_ucfirst($block_regions[$region])));
         $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
         $last_region = $region;
       }
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 5ade1fcc6..6b0a60026 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -49,7 +49,7 @@ function blog_access($op, $node) {
 function blog_user($type, &$edit, &$user) {
   if ($type == 'view' && user_access('edit own blog', $user)) {
     $items[] = array('title' => t('Blog'),
-      'value' => l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name)))),
+      'value' => l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read @username's latest blog entries.", array('@username' => $user->name)))),
       'class' => 'blog',
     );
     return array(t('History') => $items);
@@ -249,7 +249,7 @@ function blog_link($type, $node = NULL, $teaser = FALSE) {
       $links['blog_usernames_blog'] = array(
         '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)))
+        'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name)))
       );
     }
   }
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 6a2ffc7a3..084c2ed40 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -227,7 +227,7 @@ function upload_admin_settings() {
   foreach ($roles as $rid => $role) {
     $form['settings_role_'. $rid] = array(
       '#type' => 'fieldset',
-      '#title' => t('Settings for %role', array('%role' => $role)),
+      '#title' => t('Settings for @role', array('@role' => $role)),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 272f8169f..ca67eaa4b 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -138,7 +138,7 @@ function chameleon_node($node, $teaser = 0, $page = 0) {
 
   $output .= " </div>\n";
 
-  $submitted['node_submitted'] = theme_get_setting("toggle_node_info_$node->type") ? array('#title' => t("By %author at %date", array('%author' => theme('username', $node), '%date' => format_date($node->created, 'small')))) : array();
+  $submitted['node_submitted'] = theme_get_setting("toggle_node_info_$node->type") ? array('#title' => t("By !author at @date", array('!author' => theme('username', $node), '@date' => format_date($node->created, 'small')))) : array();
 
   $terms = array();
   if (module_exists('taxonomy')) {
@@ -159,7 +159,7 @@ function chameleon_node($node, $teaser = 0, $page = 0) {
 }
 
 function chameleon_comment($comment, $links = "") {
-  $submitted['comment_submitted'] = array('#title' => t('By %author at %date', array('%author' => theme('username', $comment), '%date' => format_date($comment->timestamp. 'small'))));
+  $submitted['comment_submitted'] = array('#title' => t('By !author at @date', array('!author' => theme('username', $comment), '@date' => format_date($comment->timestamp. 'small'))));
 
   $output  = "<div class=\"comment". ($comment->status == COMMENT_NOT_PUBLISHED ? ' comment-unpublished' : '') ."\">\n";
   $output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") ."</h3>\n";