diff options
| -rw-r--r-- | modules/node/content_types.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index 916426ecd..c74b33f2c 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -383,7 +383,7 @@ function node_type_delete_confirm($type) { $num_nodes = db_num_rows(db_query("SELECT * FROM {node} WHERE type = '%s'", $type->type)); if ($num_nodes) { - $caption .= '<p>'. t('<strong>Warning:</strong> there %are currently %num_nodes %type %nodes on your site. %they may not be able to be displayed or edited correctly, once you have removed this content type.', array('%are' => format_plural($num_nodes, 'is', 'are'), '%num_nodes' => $num_nodes, '%type' => $type->name, '%nodes' => format_plural($num_nodes, 'node', 'nodes'), '%they' => format_plural($num_nodes, 'It', 'They'))) .'</p>'; + $caption .= '<p>'. strtr(format_plural($num_nodes, '<strong>Warning:</strong> there is currently @count %type node on your site. It may not be able to be displayed or edited correctly, once you have removed this content type.', '<strong>Warning:</strong> there are currently @count %type nodes on your site. They may not be able to be displayed or edited correctly, once you have removed this content type.'), array('%type' => theme('placeholder', $type->name))) .'</p>'; } $caption .= '<p>'. t('This action cannot be undone.') .'</p>'; diff --git a/modules/system/system.module b/modules/system/system.module index 238deb75d..0963745d4 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1399,9 +1399,8 @@ function system_modules_confirm_form($modules, $form_values = array()) { $t_argument = array( '%module' => $modules[$name]->info['name'], '%dependencies' => implode(', ', $missing_dependencies), - '!modules' => format_plural(count($missing_dependencies), ' module', ' modules'), ); - $items[] = t('You must enable the %dependencies !modules to install %module.', $t_argument); + $items[] = strtr(format_plural(count($missing_dependencies), 'You must enable the %dependencies module to install %module.', 'You must enable the %dependencies modules to install %module.'), $t_argument); } $form['text'] = array('#value' => theme('item_list', $items)); } |