From efcbfc3e9e9145d55dbd98400c3910c4f9b37bb1 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 8 Jan 2010 16:54:06 +0000
Subject: [PATCH] - Patch #678586 by jhodgdon: help text improvements.
---
modules/taxonomy/taxonomy.admin.inc | 4 ++--
modules/taxonomy/taxonomy.module | 8 +++-----
modules/taxonomy/taxonomy.pages.inc | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 77c5d74bd420..b045d8e5b5de 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -133,10 +133,10 @@ function taxonomy_form_vocabulary($form, &$form_state, $edit = array()) {
);
$form['machine_name'] = array(
'#type' => 'textfield',
- '#title' => t('Machine readable name'),
+ '#title' => t('Machine-readable name'),
'#default_value' => $edit['machine_name'],
'#maxlength' => 255,
- '#description' => t('The unique machine readable name for this vocabulary, used for theme templates, can only contain lowercase letters, numbers and underscores.'),
+ '#description' => t('The unique machine-readable name for this vocabulary, used for theme templates. Can only contain lowercase letters, numbers, and underscores.'),
'#required' => TRUE,
'#attached' => array(
'js' => array(drupal_get_path('module', 'system') . '/system.js', $js_settings),
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 24d8fcfdf8e0..226008e2e102 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -45,14 +45,12 @@ function taxonomy_help($path, $arg) {
$vocabulary = taxonomy_vocabulary_load($arg[3]);
switch ($vocabulary->hierarchy) {
case 0:
- return '<p>' . t('You can reorganize the terms in %capital_name using their drag and drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '</p>';
+ return '<p>' . t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '</p>';
case 1:
- return '<p>' . t('%capital_name contains terms grouped with parent terms. You can reorganize the terms in %capital_name using their drag and drop handles.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '</p>';
+ return '<p>' . t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '</p>';
case 2:
- return '<p>' . t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '</p>';
+ return '<p>' . t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '</p>';
}
- case 'admin/structure/taxonomy/add':
- return '<p>' . t('To create a new taxonomy vocabulary, type in a name and a description.') . '</p>';
}
}
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index 999a2131a0f1..e4987e52b961 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -50,7 +50,7 @@ function taxonomy_term_page($term) {
else {
$build['no_content'] = array(
'#prefix' => '<p>',
- '#markup' => t('There are currently no posts in this category.'),
+ '#markup' => t('There is currently no content classified with this term.'),
'#suffix' => '</p>',
);
}
--
GitLab