Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.448 diff -u -r1.448 forum.module --- modules/forum/forum.module 30 Jan 2008 15:35:47 -0000 1.448 +++ modules/forum/forum.module 31 Jan 2008 12:51:23 -0000 @@ -378,7 +378,7 @@ // Make the vocabulary required for 'real' forum-nodes. $vid = variable_get('forum_nav_vocabulary', ''); $form['taxonomy'][$vid]['#required'] = TRUE; - $form['taxonomy'][$vid]['#options'][''] = t('- Please choose -'); + $form['taxonomy'][$vid]['#options'][''] = '<'. t('Please choose') .'>'; } } Index: modules/forum/forum.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v retrieving revision 1.8 diff -u -r1.8 forum.admin.inc --- modules/forum/forum.admin.inc 30 Jan 2008 10:14:42 -0000 1.8 +++ modules/forum/forum.admin.inc 31 Jan 2008 12:51:22 -0000 @@ -278,8 +278,8 @@ if ($tree) { foreach ($tree as $term) { if (!in_array($term->tid, $exclude)) { - $options[$term->tid] = str_repeat(' -- ', $term->depth) . $term->name; - } + $options[$term->tid] = str_repeat('--', $term->depth) .' '. $term->name; + } } } if ($child_type == 'container') { Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.414 diff -u -r1.414 taxonomy.module --- modules/taxonomy/taxonomy.module 27 Jan 2008 17:55:15 -0000 1.414 +++ modules/taxonomy/taxonomy.module 31 Jan 2008 12:51:24 -0000 @@ -414,11 +414,11 @@ $vocabulary = taxonomy_vocabulary_load($vid); $help = ($help) ? $help : $vocabulary->help; - if (!$vocabulary->multiple) { - $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -'); + if ($vocabulary->multiple) { + $blank = ($vocabulary->required) ? 0 : '<'. t('none') .'>'; } else { - $blank = ($vocabulary->required) ? 0 : t('- None -'); + $blank = ($vocabulary->required) ? '<'. t('Please choose') .'>' : '<'. t('none') .'>'; } return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank); @@ -427,16 +427,18 @@ /** * Generate a set of options for selecting a term from all vocabularies. */ -function taxonomy_form_all($free_tags = 0) { +function taxonomy_form_all($free_tags = FALSE) { $vocabularies = taxonomy_get_vocabularies(); $options = array(); foreach ($vocabularies as $vid => $vocabulary) { - if ($vocabulary->tags && !$free_tags) { continue; } + if ($vocabulary->tags && !$free_tags) { + continue; + } $tree = taxonomy_get_tree($vid); if ($tree && (count($tree) > 0)) { $options[$vocabulary->name] = array(); foreach ($tree as $term) { - $options[$vocabulary->name][$term->tid] = str_repeat('-', $term->depth) . $term->name; + $options[$vocabulary->name][$term->tid] = str_repeat('--', $term->depth) .' '. $term->name; } } } @@ -1025,7 +1027,7 @@ foreach ($tree as $term) { if (!in_array($term->tid, $exclude)) { $choice = new stdClass(); - $choice->option = array($term->tid => str_repeat('-', $term->depth) . $term->name); + $choice->option = array($term->tid => str_repeat('--', $term->depth) .' '. $term->name); $options[] = $choice; } } Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.6 diff -u -r1.6 contact.pages.inc --- modules/contact/contact.pages.inc 16 Jan 2008 22:56:21 -0000 1.6 +++ modules/contact/contact.pages.inc 31 Jan 2008 12:51:21 -0000 @@ -60,7 +60,7 @@ // If there is more than one category available and no default category has been selected, // prepend a default placeholder value. if (!isset($default_category)) { - $default_category = t('- Please choose -'); + $default_category = '<'. t('Please choose') .'>'; $categories = array($default_category) + $categories; } $form['cid'] = array('#type' => 'select', Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.263 diff -u -r1.263 poll.module --- modules/poll/poll.module 15 Jan 2008 07:57:46 -0000 1.263 +++ modules/poll/poll.module 31 Jan 2008 12:51:23 -0000 @@ -247,8 +247,12 @@ ); // Poll attributes - $_duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval"); - $_active = array(0 => t('Closed'), 1 => t('Active')); + $_duration = array(0 => '<'. t('Unlimited') .'>'); + $_duration += drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval"); + $_active = array( + 0 => t('Closed'), + 1 => t('Active'), + ); if ($admin) { $form['settings'] = array(