Commit 1cf05b00 authored by Dries's avatar Dries
Browse files

- Patch #89196 by catch, keith, earnie, webchick et al: string massaging.

parent 5ae55b80
......@@ -2009,7 +2009,7 @@ function _form_set_class(&$element, $class = array()) {
}
/**
* Prepare an HTML ID attribute string for a form item.
* Prepare an HTML ID attribute string for a form item.
*
* Remove invalid characters and guarantee uniqueness.
*
......
......@@ -321,7 +321,7 @@ function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
$block['subject'] = check_plain($feed->title);
$result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
$read_more = theme('more_link', url('aggregator/sources/'. $feed->fid), t("View this feed's recent news."));
$read_more = theme('more_link', url('aggregator/sources/'. $feed->fid), t("View this feed's recent news."));
}
break;
......
......@@ -14,7 +14,7 @@ function blog_node_info() {
'blog' => array(
'name' => t('Blog entry'),
'module' => 'blog',
'description' => t('A blog is a regularly updated journal or diary made up of individual posts shown in reversed chronological order. Each member of the site may create and maintain a blog.'),
'description' => t('A <em>blog entry</em> is a single post to an online journal, or <em>blog</em>.'),
)
);
}
......
......@@ -28,7 +28,7 @@ function _book_install_type_create() {
'type' => 'book',
'name' => t('Book page'),
'module' => 'node',
'description' => t("A static page. These posts (as well as other types) may be added to a book outline to create a hierarchical structure for your site."),
'description' => t('A <em>book page</em> is a page of content, organized into a collection of related entries collectively known as a <em>book</em>. A <em>book page</em> automatically displays links to adjacent pages, providing a simple navigation system for organizing and reviewing structured content.'),
'custom' => TRUE,
'modified' => TRUE,
'locked' => FALSE,
......
......@@ -285,7 +285,7 @@ function forum_node_info() {
'forum' => array(
'name' => t('Forum topic'),
'module' => 'forum',
'description' => t('Create a new topic for discussion in the forums.'),
'description' => t('A <em>forum topic</em> is the initial post to a new discussion thread within a forum.'),
'title_label' => t('Subject'),
)
);
......
......@@ -166,7 +166,7 @@ function poll_node_info() {
'poll' => array(
'name' => t('Poll'),
'module' => 'poll',
'description' => t("A poll is a multiple-choice question which visitors can vote on."),
'description' => t('A <em>poll</em> is a question with a set of possible responses. A <em>poll</em>, once created, automatically provides a simple running count of the number of votes received for each response.'),
'title_label' => t('Question'),
'has_body' => FALSE,
)
......
......@@ -80,7 +80,7 @@ function default_profile_tasks(&$task) {
'type' => 'page',
'name' => st('Page'),
'module' => 'node',
'description' => st('If you want to add a static page, like a contact page or an about page, use a page.'),
'description' => st("A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an "About us" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page."),
'custom' => TRUE,
'modified' => TRUE,
'locked' => FALSE,
......@@ -91,7 +91,7 @@ function default_profile_tasks(&$task) {
'type' => 'story',
'name' => st('Story'),
'module' => 'node',
'description' => st('Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.'),
'description' => st("A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments."),
'custom' => TRUE,
'modified' => TRUE,
'locked' => FALSE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment