diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-09 23:09:51 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-09 23:09:51 +0000 |
| commit | fa2b71967b3434b68a67236b9c1b50b823477e99 (patch) | |
| tree | 8329f646b26143f187576abffc8ebb1fb9ce661c /modules/forum | |
| parent | 71ee49de3eba0639d13a5861803f1cf031f376df (diff) | |
| download | brdo-fa2b71967b3434b68a67236b9c1b50b823477e99.tar.gz brdo-fa2b71967b3434b68a67236b9c1b50b823477e99.tar.bz2 | |
#678536 by jhodgdon: Improve error message when adding forum topic directly to container.
Diffstat (limited to 'modules/forum')
| -rw-r--r-- | modules/forum/forum.module | 2 | ||||
| -rw-r--r-- | modules/forum/forum.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index e241fd1c1..a059718fd 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -286,7 +286,7 @@ function forum_node_validate($node, $form) { ':vid' => $term->vid, ))->fetchField(); if ($used && in_array($term->tid, $containers)) { - form_set_error('taxonomy_forums', t('The item %forum is only a forum container. Select one of the forums below it.', array('%forum' => $term->name))); + form_set_error('taxonomy_forums', t('The item %forum is a forum container, not a forum. Select one of the forums below instead.', array('%forum' => $term->name))); } } } diff --git a/modules/forum/forum.test b/modules/forum/forum.test index 5499d4614..4b673b707 100644 --- a/modules/forum/forum.test +++ b/modules/forum/forum.test @@ -281,12 +281,12 @@ class ForumTestCase extends DrupalWebTestCase { $type = t('Forum topic'); if ($container) { $this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), t('Forum topic was not created')); - $this->assertRaw(t('The item %title is only a forum container.', array('%title' => $forum['name'])), t('Error message was shown')); + $this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('Error message was shown')); return; } else { $this->assertRaw(t('@type %title has been created.', array('%title' => $title, '@type' => $type)), t('Forum topic was created')); - $this->assertNoRaw(t('The item %title is only a forum container.', array('%title' => $forum['name'])), t('No error message was shown')); + $this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('No error message was shown')); } // Retrieve node object. |