From 28feea3cc56e75a9d4d169c34d2609e8847cf30b Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Wed, 23 Aug 2006 04:40:57 +0000
Subject: [PATCH] #80079 by drewish, fix some double placeholdering and other
bugs with using t().
---
modules/block/block.module | 4 ++--
modules/node/content_types.inc | 8 ++++----
modules/system/system.module | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/block/block.module b/modules/block/block.module
index 49c7046b8f41..ecba6810cea6 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -93,11 +93,11 @@ function block_menu($may_cache) {
foreach (list_themes() as $key => $theme) {
if ($theme->status) {
if ($key == variable_get('theme_default', 'bluemarine')) {
- $items[] = array('path' => 'admin/build/block/list/' . $key, 'title' => t('%key settings', array('%key' => $key)),
+ $items[] = array('path' => 'admin/build/block/list/'. $key, 'title' => t('!key settings', array('!key' => $key)),
'access' => user_access('administer blocks'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
}
else {
- $items[] = array('path' => 'admin/build/block/list/' . $key, 'title' => t('%key settings', array('%key' => $key)),
+ $items[] = array('path' => 'admin/build/block/list/'. $key, 'title' => t('!key settings', array('!key' => $key)),
'access' => user_access('administer blocks'), 'type' => MENU_LOCAL_TASK);
}
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 0e6d05bc9cdf..6e0fb0d7fc6d 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -280,7 +280,7 @@ function node_type_form_submit($form_id, $form_values) {
$update_count = node_type_update_nodes($type->old_type, $type->type);
if ($update_count) {
- drupal_set_message(t('Changed the content type of %update_count %posts from %old_type to %type.', array('%update_count' => $update_count, '%posts' => format_plural($update_count, 'post', 'posts'), '%old_type' => theme('placeholder', $type->old_type), '%type' => theme('placeholder', $type->type))));
+ drupal_set_message(t('Changed the content type of %update_count %posts from %old_type to %type.', array('%update_count' => $update_count, '%posts' => format_plural($update_count, 'post', 'posts'), '%old_type' => $type->old_type, '%type' => $type->type)));
cache_clear_all('filter:', TRUE);
}
}
@@ -320,7 +320,7 @@ function node_type_form_submit($form_id, $form_values) {
node_types_rebuild();
menu_rebuild();
cache_clear_all();
- $t_args = array('%name' => theme('placeholder', $type->name));
+ $t_args = array('%name' => $type->name);
if ($op == t('Reset to defaults')) {
drupal_set_message(t('The content type %name has been reset to its default values.', $t_args));
@@ -366,7 +366,7 @@ function node_type_delete($type) {
$form['type'] = array('#type' => 'value', '#value' => $type->type);
$form['name'] = array('#type' => 'value', '#value' => $type->name);
- $message = t('Are you sure you want to delete the content type %type?', array('%type' => theme('placeholder', $type->name)));
+ $message = t('Are you sure you want to delete the content type %type?', array('%type' => $type->name));
$caption = '';
$num_nodes = db_num_rows(db_query("SELECT * FROM {node} WHERE type = '%s'", $type->type));
@@ -385,7 +385,7 @@ function node_type_delete($type) {
function node_type_delete_form_submit($form_id, $form_values) {
db_query("DELETE FROM {node_type} WHERE type = '%s'", $form_values['type']);
- $t_args = array('%name' => theme('placeholder', $form_values['name']));
+ $t_args = array('%name' => $form_values['name']);
drupal_set_message(t('The content type %name has been deleted.', $t_args));
watchdog('menu', t('Deleted content type %name.', $t_args), WATCHDOG_NOTICE);
diff --git a/modules/system/system.module b/modules/system/system.module
index 746fdb103a49..cf1ff5a41b33 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -798,7 +798,7 @@ function system_cron_status($cron = '') {
else {
$status = t('Cron has not run. It appears cron jobs have not been setup on your system. Please check the help pages for <a href="@url">configuring cron jobs</a>.', array('@url' => 'http://drupal.org/cron'));
}
- $status .= ' '. t('Cron can, if necessary, also be run <a href="%cron">manually</a>.', array('%cron' => url('admin/settings/cron-status/cron')));
+ $status .= ' '. t('Cron can, if necessary, also be run <a href="!cron">manually</a>.', array('!cron' => url('admin/settings/cron-status/cron')));
return $status;
}
--
GitLab