From 058971c33b8dca63fd33b188328fc3e3ec9fb372 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 3 Oct 2003 14:55:27 +0000 Subject: - Help improvements and translation improvements from Michael. Thanks! --- modules/admin.module | 10 ++--- modules/archive.module | 6 +-- modules/archive/archive.module | 6 +-- modules/block.module | 1 - modules/block/block.module | 1 - modules/blog.module | 9 ++-- modules/blog/blog.module | 9 ++-- modules/bloggerapi.module | 22 +++++----- modules/book.module | 17 ++++---- modules/book/book.module | 17 ++++---- modules/comment.module | 80 +++++++++++++++++++++++++++--------- modules/comment/comment.module | 80 +++++++++++++++++++++++++++--------- modules/drupal.module | 13 +++--- modules/drupal/drupal.module | 13 +++--- modules/forum.module | 13 +++--- modules/forum/forum.module | 13 +++--- modules/help.module | 41 +++++++++++------- modules/help/help.module | 41 +++++++++++------- modules/locale.module | 18 ++++---- modules/locale/locale.module | 18 ++++---- modules/node.module | 21 ++++++---- modules/node/node.module | 21 ++++++---- modules/page.module | 5 ++- modules/page/page.module | 5 ++- modules/ping.module | 9 ++-- modules/ping/ping.module | 9 ++-- modules/poll.module | 32 ++++++++++++--- modules/poll/poll.module | 32 ++++++++++++--- modules/profile.module | 6 +-- modules/profile/profile.module | 6 +-- modules/queue.module | 6 +-- modules/search.module | 7 ++-- modules/search/search.module | 7 ++-- modules/statistics.module | 43 +++++++++---------- modules/statistics/statistics.module | 43 +++++++++---------- modules/story.module | 20 +++++---- modules/story/story.module | 20 +++++---- modules/system.module | 13 +++--- modules/system/system.module | 13 +++--- modules/taxonomy.module | 45 ++++++++++++++------ modules/taxonomy/taxonomy.module | 45 ++++++++++++++------ modules/throttle.module | 32 ++++++++------- modules/throttle/throttle.module | 32 ++++++++------- modules/title.module | 18 +++++++- modules/tracker.module | 17 ++++++-- modules/tracker/tracker.module | 17 ++++++-- 46 files changed, 615 insertions(+), 337 deletions(-) (limited to 'modules') diff --git a/modules/admin.module b/modules/admin.module index 779547f3f..1eddba355 100644 --- a/modules/admin.module +++ b/modules/admin.module @@ -14,16 +14,16 @@ function admin_help($section) { switch ($section) { case "admin/system/modules": - $output .= "Handles the administration pages."; + $output .= t("Handles the administration pages."); break; case "admin": - $output .= "Welcome to the administration section. Below are the most recent system events. To get started please choose an item in the left column. If there is an arrow it will expand into a submenu. To jump up a level use the link,bread crumbs, above this block of text. To return to the home page click on the site name, and to go to Drupal's home page click on Druplicon, the drop on to the right."; + $output .= t("Welcome to the administration section. Below are the most recent system events. To get started please choose an item in the left column. If there is an arrow it will expand into a submenu. To jump up a level use the link,bread crumbs, above this block of text. To return to the home page click on the site name, and to go to Drupal's home page click on Druplicon, the drop on to the right."); break; - case "admin": - $output = "This is a complete overview of the site administration page."; + case "admin/overview": + $output = t("This is a complete overview of the site administration page."); break; } - return t($output); + return $output; } function admin_system($field){ diff --git a/modules/archive.module b/modules/archive.module index c12272c04..e9ce7e0fe 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -6,14 +6,14 @@ function archive_help($section) { switch ($section) { case 'admin/system/modules': - $output = "Displays a calendar to navigate old content."; + $output = t("Displays a calendar to navigate old content."); break; case 'admin/system/modules/archive': - $output = "Choose the starting \"day of the week\" for the displayed calendar block."; + $output = t("Choose the starting \"day of the week\" for the displayed calendar block."); break; } - return t($output); + return $output; } function archive_system($field){ $output = ""; diff --git a/modules/archive/archive.module b/modules/archive/archive.module index c12272c04..e9ce7e0fe 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -6,14 +6,14 @@ function archive_help($section) { switch ($section) { case 'admin/system/modules': - $output = "Displays a calendar to navigate old content."; + $output = t("Displays a calendar to navigate old content."); break; case 'admin/system/modules/archive': - $output = "Choose the starting \"day of the week\" for the displayed calendar block."; + $output = t("Choose the starting \"day of the week\" for the displayed calendar block."); break; } - return t($output); + return $output; } function archive_system($field){ $output = ""; diff --git a/modules/block.module b/modules/block.module index e74a80ac8..eb14f84dc 100644 --- a/modules/block.module +++ b/modules/block.module @@ -41,7 +41,6 @@ function block_help($section = "admin/system/block/help") { break; case 'admin/system/block': $output = t("Blocks are the boxes in the left- and right- side bars of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. The custom checkbox lets your users hide the block using their account setting. You can also create your own blocks, where you specify the content of the block rather than its being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("new block"), "admin/system/block/add"))); -; break; case 'admin/system/block/add': $output = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using %overview. The title is used when displaying the block. The description is used in the \"block\" column on the %overview page. If you are going to place PHP code in the block, and you have create php content permission (see the %permission page) you must change the type to PHP to make your code active.", array("%overview" => l(t("blocks"), "admin/system/block"), "%permission" => l(t("permissions"), "admin/user/permission"))); diff --git a/modules/block/block.module b/modules/block/block.module index e74a80ac8..eb14f84dc 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -41,7 +41,6 @@ function block_help($section = "admin/system/block/help") { break; case 'admin/system/block': $output = t("Blocks are the boxes in the left- and right- side bars of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. The custom checkbox lets your users hide the block using their account setting. You can also create your own blocks, where you specify the content of the block rather than its being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("new block"), "admin/system/block/add"))); -; break; case 'admin/system/block/add': $output = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using %overview. The title is used when displaying the block. The description is used in the \"block\" column on the %overview page. If you are going to place PHP code in the block, and you have create php content permission (see the %permission page) you must change the type to PHP to make your code active.", array("%overview" => l(t("blocks"), "admin/system/block"), "%permission" => l(t("permissions"), "admin/user/permission"))); diff --git a/modules/blog.module b/modules/blog.module index d1af39448..b75f3654c 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -81,19 +81,20 @@ function blog_help($section) { case 'admin/blog/help': case 'admin/help': $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.

"; - $output .= strtr("

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.

", array("%scripting-com" => "". t("http://www.scripting.com/") ."" )); + $output .= "

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.

"; $output .= "

The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.

"; $output .= "

If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link (b) next to each news item in its lists. Click on this and you will be taken to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site and from your syndicated partner sites.

"; + $output = t($output,array("%scripting-com" => "http://www.scripting.com/" )); break; case 'admin/system/modules': - $output .= "Enables keeping a blog or easily and regularly updated web page."; + $output .= t("Enables keeping a blog or easily and regularly updated web page."); break; case 'admin/system/modules/blog': - $output .= "A weBLOG is a running journal of a users ideas. Enter the minimum word count for a single entry, and the text displayed on the entry submission form"; + $output .= t("A weBLOG is a running journal of a users ideas. Enter the minimum word count for a single entry, and the text displayed on the entry submission form"); break; } - return t($output); + return $output; } function blog_feed_user($uid = 0) { diff --git a/modules/blog/blog.module b/modules/blog/blog.module index d1af39448..b75f3654c 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -81,19 +81,20 @@ function blog_help($section) { case 'admin/blog/help': case 'admin/help': $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.

"; - $output .= strtr("

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.

", array("%scripting-com" => "". t("http://www.scripting.com/") ."" )); + $output .= "

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.

"; $output .= "

The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.

"; $output .= "

If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link (b) next to each news item in its lists. Click on this and you will be taken to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site and from your syndicated partner sites.

"; + $output = t($output,array("%scripting-com" => "http://www.scripting.com/" )); break; case 'admin/system/modules': - $output .= "Enables keeping a blog or easily and regularly updated web page."; + $output .= t("Enables keeping a blog or easily and regularly updated web page."); break; case 'admin/system/modules/blog': - $output .= "A weBLOG is a running journal of a users ideas. Enter the minimum word count for a single entry, and the text displayed on the entry submission form"; + $output .= t("A weBLOG is a running journal of a users ideas. Enter the minimum word count for a single entry, and the text displayed on the entry submission form"); break; } - return t($output); + return $output; } function blog_feed_user($uid = 0) { diff --git a/modules/bloggerapi.module b/modules/bloggerapi.module index 7c185e7f7..ff4c21fec 100644 --- a/modules/bloggerapi.module +++ b/modules/bloggerapi.module @@ -348,31 +348,31 @@ function bloggerapi_help($section) { case 'admin/bloggerapi/help': case 'admin/help': $output = "

Introduction

"; - $output .= strtr("

%blogger-com, the well-known public weblog service, provides an application programing interface (API) to allow remote procedure calls (RPC) to the Blogger service. Drupal supports this %blogger-api, which means that many remote clients (e.g. %client-radio, %client-blogbuddy, %client-w_bloggar, and %client-textrouter) may post to Drupal. These clients provide a bevy of interesting capabilities like offline composing, spellcheck, and WYSIWYG editing; many folks prefer to blog with a client application over typical web forms. By supporting the Blogger API, Drupal grows grander than a web site engine, it's a content accepting machine™.

", array("%blogger-com" => "". t("Blogger") ."", "%blogger-api" => "". t("Blogger API") ."", "%client-radio" => "". t("Radio") ."", "%client-blogbuddy" => "". t("BlogBuddy") ."", "%client-w_bloggar" => "". t("w.bloggar") ."", "%client-textrouter" => "". t("TextRouter") ."" )); - $output .= strtr("

The %blogger-api uses the %xml-rpc protocol for communicating with the outside world. %xml-rpc, originally developed by Dave Winer of %userland-software, is a simple XML-based RPC specification ideally suited to the web. Drupal also uses %xml-rpc for several other tasks (e.g. notifiying %weblogs-com of blog updates and making/accepting %dist-auth requests)

",array("%blogger-api" => "". t("Blogger API") ."", "%xml-rpc" => "". t("XML-RPC") ."", "%userland-software" => "". t("UserLand Software") ."", "%weblogs-com" => "". t("weblogs.com") ."", "%dist-auth" => l(t("distributed authentication"), "user/help") )) ; + $output .= "

%blogger-com, the well-known public weblog service, provides an application programing interface (API) to allow remote procedure calls (RPC) to the Blogger service. Drupal supports this %blogger-api, which means that many remote clients (e.g. %client-radio, %client-blogbuddy, %client-w_bloggar, and %client-textrouter) may post to Drupal. These clients provide a bevy of interesting capabilities like offline composing, spellcheck, and WYSIWYG editing; many folks prefer to blog with a client application over typical web forms. By supporting the Blogger API, Drupal grows grander than a web site engine, it's a content accepting machine™.

"; + $output .= "

The %blogger_api uses the %xml-rpc protocol for communicating with the outside world. %xml-rpc, originally developed by Dave Winer of %userland-software, is a simple XML-based RPC specification ideally suited to the web. Drupal also uses %xml-rpc for several other tasks (e.g. notifiying %weblogs-com of blog updates and making/accepting %dist-auth requests)

"; $output .= "

Blogger API implementation

"; - $output .= strtr("

A word of warning on the Blogger API: it is unofficial. It exists because Blogger is one of the most popular and the first service to implement an XML-RPC interface. It may not be the best implementation of a distributed weblog API. For a promising candidate, see the %echo-proj.

", array("%echo-proj" => "". t("Echo project") ."" )); + $output .= "

A word of warning on the Blogger API: it is unofficial. It exists because Blogger is one of the most popular and the first service to implement an XML-RPC interface. It may not be the best implementation of a distributed weblog API. For a promising candidate, see the %echo-proj.

"; $output .= "

Drupal's support for the Blogger API is quite complete. Each method with an asterisk below has been implemented in Drupal.

"; - $output .= strtr("

%bloggerapi-newpost
%bloggerapi-editpost
%bloggerapi-getuserblogs
%bloggerapi-getuserinfo
%bloggerapi-gettemplate
%bloggerapi-settemplate

", array("%bloggerapi-newpost" => "%blogger-api/xmlrpc_newPost.html\">". t("blogger.newPost()*") ."", "%bloggerapi-editpost" => "%blogger-api/xmlrpc_editPost.html\">". t("blogger.editPost()*") ."", "%bloggerapi-getuserblogs" => "%blogger-api/xmlrpc_getUserBlogs.html\">". t("blogger.getUsersBlogs()*") ."", "%bloggerapi-getuserinfo" => "%blogger-api/xmlrpc_getUserInfo.html\">". t("blogger.getUserInfo()*") ."", "%bloggerapi-gettemplate" => "%blogger-api/xmlrpc_getTemplate.html\">". t("blogger.getTemplate()*") ."", "%bloggerapi-settemplate" => "blogger-api/xmlrpc_setTemplate.html\">". t("blogger.setTemplate()*") ."" )); - $output = strtr($output, array("%blogger-api" => "%mess-296
%mess-225
%mess-147

", array("%mess-296" => "%blogger-dev/296\">". t("blogger.getPost()*") ."", "%mess-225" => "%blogger-dev/225\">". t("blogger.getRecentPosts()*") ."", "%mess-147" => "%blogger-dev/147\">". t("blogger.deletePost()*") ."" )); - $output = strtr($output, array("%blogger-dev" => "To install the Blogger API module, enable the module on the %mod-config. Also make sure you have your permissions set correctly for accessing the Blogger API, the relevant settings can be found under the %user-management section in the administration pages. Check the checkbox behind the line \"access Blogger API\" for the roles that are allowed to use the Blogger API.

", array("%mod-config" => l(t("modules configuration page"), "admin/systems/modules"), "%user-management" => l(t("user management"), "admin/user/permission") )); + $output .= "

To install the Blogger API module, enable the module on the %mod-config. Also make sure you have your permissions set correctly for accessing the Blogger API, the relevant settings can be found under the %user-management section in the administration pages. Check the checkbox behind the line \"access Blogger API\" for the roles that are allowed to use the Blogger API.

"; $output .= "

Once the API is enabled you can download one of the above mentioned Blogger API clients and get blogging.

"; $output .= "

Setup of the client

"; - $output .= strtr("

The Drupal page you need to call in order to connect using the Blogger API is http://server/xmlrpc.php where server is the URL of the site you want to post to. As an example when posting to drupal.org, the account settings for %client-wbloggar would be: host: www.drupal.org (default = plant.blogger.com) and page: xmlrpc.php (default = /api/RPC2).

", array("%client-wbloggar" => "". t("w.bloggar") ."" )); + $output .= "

The Drupal page you need to call in order to connect using the Blogger API is http://server/xmlrpc.php where server is the URL of the site you want to post to. As an example when posting to drupal.org, the account settings for %client-w_bloggar would be: host: www.drupal.org (default = plant.blogger.com) and page: xmlrpc.php (default = /api/RPC2).

"; $output .= "

You can't use remote authentication when posting using a Blogger API enabled client, even when you could use that to authenticate on the site itself. You will have to use the site's local username, enter a password for that account, and then use that combination to post using the Blogger API client.

"; $output .= "

Notes and limitations

"; $output .= ""; + $output = t($output, array("%blogger-com" => "Blogger", "%blogger_api" => "%blogger-api\">Blogger API", "%client-radio" => "Radio", "%client-blogbuddy" => "BlogBuddy", "%client-w_bloggar" => "w.bloggar", "%client-textrouter" => "TextRouter", "%xml-rpc" => "XML-RPC", "%userland-software" => "UserLand Software", "%weblogs-com" => "weblogs.com", "%dist-auth" => l(t("distributed authentication"), "user/help"), "%echo-proj" => "". t("Echo project") ."", "%bloggerapi-newpost" => "%blogger-api/xmlrpc_newPost.html\">blogger.newPost()*", "%bloggerapi-editpost" => "%blogger-api/xmlrpc_editPost.html\">blogger.editPost()*", "%bloggerapi-getuserblogs" => "%blogger-api/xmlrpc_getUserBlogs.html\">blogger.getUsersBlogs()*", "%bloggerapi-getuserinfo" => "%blogger-api/xmlrpc_getUserInfo.html\">blogger.getUserInfo()*", "%bloggerapi-gettemplate" => "%blogger-api/xmlrpc_getTemplate.html\">blogger.getTemplate()*", "%bloggerapi-settemplate" => "%blogger-api/xmlrpc_setTemplate.html\">blogger.setTemplate()*", "%mess-296" => "%blogger-dev/296\">blogger.getPost()*", "%mess-225" => "%blogger-dev/225\">blogger.getRecentPosts()*", "%mess-147" => "%blogger-dev/147\">blogger.deletePost()*","%mod-config" => l(t("modules configuration page"), "admin/systems/modules"), "%user-management" => l(t("user management"), "admin/user/permission") )); + $output = strtr($output, array("%blogger-api" => " " diff --git a/modules/book.module b/modules/book.module index 7cf8b99b3..808fc39f1 100644 --- a/modules/book.module +++ b/modules/book.module @@ -852,26 +852,27 @@ function book_help($section = "admin/node/book/help") { $output .= "

The book organises content into a nested hierarchical structure. It is particularly good for manuals, Frequently Asked Questions (FAQs) and the like, allowing you to have chapters, sections, etc.

"; $output .= "

A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.

"; $output .= "

A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.

"; - $output .= strtr("

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use %permissions to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the %create link.

", array("%permissions" => l(t("permissions"), "admin/user/permission"), "%create" => l(t("create book page"), "node/add/book") )); - $output .= strtr("

Administrators may review the hierarchy of their books by clicking on the %collaborative-book link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now orphans. Administrators should periodically %orphans-book and reaffiliate those pages as desired. Finally, administrators may also %export-book to a single, flat HTML page which is suitable for printing.

", array( "%collaborative-book" => l(t("collaborative book"), "admin/node/book"), "%orphans-book" => l(t("review their books for orphans"), "admin/node/book/orphan"), "%export-book" => l(t("export their books"), "book/print") )); + $output .= "

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use %permissions to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the %create link.

"; + $output .= "

Administrators may review the hierarchy of their books by clicking on the %collaborative-book link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now orphans. Administrators should periodically %orphans-book and reaffiliate those pages as desired. Finally, administrators may also %export-book to a single, flat HTML page which is suitable for printing.

"; $output .= "

Maintaining a FAQ using a collaborative book

"; $output .= "

Collaborative books let you easily set up a Frequently Asked Questions (FAQ) section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!

"; - $output .= strtr("

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on the %create link. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

", array("%create" => l(t("create book page"), "node/add/book") )); + $output .= "

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on the %create link. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; $output .= "

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the book module, you can reorganize posts in your book so that it stays organized.

"; - $output .= strtr("

Notes:

", array("%create" => l(t("create book page"), "node/add/book"), "%permission" => l(t("permissions"), "admin/user/permission") )); + $output .= "

Notes:

"; + $output = t($output, array("%permissions" => l(t("permissions"), "admin/user/permission"), "%create" => l(t("create book page"), "node/add/book"), "%collaborative-book" => l(t("collaborative book"), "admin/node/book"), "%orphans-book" => l(t("review their books for orphans"), "admin/node/book/orphan"), "%export-book" => l(t("export their books"), "book/print"), "%create" => l(t("create book page"), "node/add/book") )); break; case 'admin/system/modules': - $output = "Allows users to collaboratively author a book."; + $output = t("Allows users to collaboratively author a book."); break; case 'admin/node/book': - $output = "The book module offers a mean to organize content, authored by many users, in an online manual, outline or FAQ."; + $output = t("The book module offers a mean to organize content, authored by many users, in an online manual, outline or FAQ."); break; case 'admin/node/book/orphan': - $output = "Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are refered to as 'orphan pages'. On this page, administrators can review their books for orphans and reattach those pages as desired."; + $output = t("Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are refered to as 'orphan pages'. On this page, administrators can review their books for orphans and reattach those pages as desired."); break; } - return t($output); + return $output; } ?> diff --git a/modules/book/book.module b/modules/book/book.module index 7cf8b99b3..808fc39f1 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -852,26 +852,27 @@ function book_help($section = "admin/node/book/help") { $output .= "

The book organises content into a nested hierarchical structure. It is particularly good for manuals, Frequently Asked Questions (FAQs) and the like, allowing you to have chapters, sections, etc.

"; $output .= "

A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.

"; $output .= "

A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.

"; - $output .= strtr("

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use %permissions to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the %create link.

", array("%permissions" => l(t("permissions"), "admin/user/permission"), "%create" => l(t("create book page"), "node/add/book") )); - $output .= strtr("

Administrators may review the hierarchy of their books by clicking on the %collaborative-book link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now orphans. Administrators should periodically %orphans-book and reaffiliate those pages as desired. Finally, administrators may also %export-book to a single, flat HTML page which is suitable for printing.

", array( "%collaborative-book" => l(t("collaborative book"), "admin/node/book"), "%orphans-book" => l(t("review their books for orphans"), "admin/node/book/orphan"), "%export-book" => l(t("export their books"), "book/print") )); + $output .= "

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use %permissions to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the %create link.

"; + $output .= "

Administrators may review the hierarchy of their books by clicking on the %collaborative-book link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now orphans. Administrators should periodically %orphans-book and reaffiliate those pages as desired. Finally, administrators may also %export-book to a single, flat HTML page which is suitable for printing.

"; $output .= "

Maintaining a FAQ using a collaborative book

"; $output .= "

Collaborative books let you easily set up a Frequently Asked Questions (FAQ) section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!

"; - $output .= strtr("

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on the %create link. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

", array("%create" => l(t("create book page"), "node/add/book") )); + $output .= "

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on the %create link. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; $output .= "

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the book module, you can reorganize posts in your book so that it stays organized.

"; - $output .= strtr("

Notes:

", array("%create" => l(t("create book page"), "node/add/book"), "%permission" => l(t("permissions"), "admin/user/permission") )); + $output .= "

Notes:

"; + $output = t($output, array("%permissions" => l(t("permissions"), "admin/user/permission"), "%create" => l(t("create book page"), "node/add/book"), "%collaborative-book" => l(t("collaborative book"), "admin/node/book"), "%orphans-book" => l(t("review their books for orphans"), "admin/node/book/orphan"), "%export-book" => l(t("export their books"), "book/print"), "%create" => l(t("create book page"), "node/add/book") )); break; case 'admin/system/modules': - $output = "Allows users to collaboratively author a book."; + $output = t("Allows users to collaboratively author a book."); break; case 'admin/node/book': - $output = "The book module offers a mean to organize content, authored by many users, in an online manual, outline or FAQ."; + $output = t("The book module offers a mean to organize content, authored by many users, in an online manual, outline or FAQ."); break; case 'admin/node/book/orphan': - $output = "Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are refered to as 'orphan pages'. On this page, administrators can review their books for orphans and reattach those pages as desired."; + $output = t("Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are refered to as 'orphan pages'. On this page, administrators can review their books for orphans and reattach those pages as desired."); break; } - return t($output); + return $output; } ?> diff --git a/modules/comment.module b/modules/comment.module index caaca8f09..b8429670d 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -19,12 +19,12 @@ function comment_help($section = "admin/comment/help") { $output .= "
  • Expanded -- Displays the title and text for each post.
    • "; $output .= "
  • Collapsed -- Displays only the title for each post.
    • "; $output .= ""; - $output .= strtr("

    When a user chooses save settings, the comments are then redisplayed using the user's new choices. Administrators can set the default settings for the comment control panel, along with other comment defaults, in %comment-config.

    ",array("%comment-config" => l(t("site configuration » modules » comment"), "admin/system/modules/comment") )); + $output .= "

    When a user chooses save settings, the comments are then redisplayed using the user's new choices. Administrators can set the default settings for the comment control panel, along with other comment defaults, in %comment-config.

    "; $output .= "

    NOTE: When comment moderation is enabled, users will have another control panel option to control thresholds (see below).

    "; $output .= "

    Additional comment configurations

    "; - $output .= strtr("

    Comments behave like other user submissions in Drupal. Filters, smileys and HTML that work in nodes will also work with content. To prevent a single user from spamming the web site with too many comments, administrators can set a comment throttle in %site-config under Submission settings.

    ", array("%site-config" => l(t("site configuration"), "admin/system") )); - $output .= strtr("

    Administrators can control access to various comment module functions through %user-permissions. Know that in a new Drupal installation, all comment permissions are disabled by default. The choice of which permissions to grant to which roles (groups of users) is left up to the site administrator.

    ", array("%user-permissions" => l(t("user management » user permissions"), "admin/user/permission") )); + $output .= "

    Comments behave like other user submissions in Drupal. Filters, smileys and HTML that work in nodes will also work with content. To prevent a single user from spamming the web site with too many comments, administrators can set a comment throttle in %site-config under Submission settings.

    "; + $output .= "

    Administrators can control access to various comment module functions through %user-permissions. Know that in a new Drupal installation, all comment permissions are disabled by default. The choice of which permissions to grant to which roles (groups of users) is left up to the site administrator.

    "; $output .= "

    The following permissions can be enabled for anonymous users, authenticated users, or any other user roles that the administrator chooses to define:

    "; $output .= "