From 38aaf5f35d8bc51f6792989a1a7732be5a1e7676 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 31 May 2002 20:29:30 +0000 Subject: - Added missing translations and the like. --- modules/block.module | 2 +- modules/block/block.module | 2 +- modules/blog.module | 8 ++++---- modules/blog/blog.module | 8 ++++---- modules/comment.module | 12 ++++++------ modules/comment/comment.module | 12 ++++++------ modules/forum.module | 2 +- modules/forum/forum.module | 2 +- modules/jabber.module | 4 ++-- modules/page.module | 6 +++--- modules/page/page.module | 6 +++--- modules/taxonomy.module | 7 ++++--- modules/taxonomy/taxonomy.module | 7 ++++--- modules/tracker.module | 4 ++-- modules/tracker/tracker.module | 4 ++-- 15 files changed, 44 insertions(+), 42 deletions(-) (limited to 'modules') diff --git a/modules/block.module b/modules/block.module index d227e8b62..bbb9162c4 100644 --- a/modules/block.module +++ b/modules/block.module @@ -267,7 +267,7 @@ function block_user($type, &$edit, &$user) { } if (isset($form)) { - return form_item(t("Block configuration"), ''. $form .'
', "Enable the blocks you would like to see displayed in the side bars."); + return form_item(t("Block configuration"), ''. $form .'
', t("Enable the blocks you would like to see displayed in the side bars.")); } } diff --git a/modules/block/block.module b/modules/block/block.module index d227e8b62..bbb9162c4 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -267,7 +267,7 @@ function block_user($type, &$edit, &$user) { } if (isset($form)) { - return form_item(t("Block configuration"), ''. $form .'
', "Enable the blocks you would like to see displayed in the side bars."); + return form_item(t("Block configuration"), ''. $form .'
', t("Enable the blocks you would like to see displayed in the side bars.")); } } diff --git a/modules/blog.module b/modules/blog.module index 4c2c13f83..7d4f4a206 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -43,7 +43,7 @@ function blog_user($type, &$edit, &$user) { switch ($type) { case "view_public": case "view_private": - return form_item("Blog", lm(t("View recent entries."), array("mod" => "blog", "id" => $user->uid)) ."
". lm(t("View all entries."), array("mod" => "blog", "id" => $user->uid, "all" => 1))); + return form_item(t("Blog"), lm(t("view recent entries"), array("mod" => "blog", "id" => $user->uid), "", array("title" => t("View recent blog entries."))) ."
". lm(t("view all entries"), array("mod" => "blog", "id" => $user->uid, "all" => 1), "", array("title" => t("View all blog entries.")))); } } @@ -170,7 +170,7 @@ function blog_page_user($uid = 0, $date = 0, $all = 0) { $links = link_node($blog, 1); - $output .= "
". check_output($blog->title) ."
". $theme->links($links) ."". l('', array("id" => $node->nid), "node", "", array("title" => t("Permanent link to this blog entry"))) .""; + $output .= "
". check_output($blog->title) ."
". $theme->links($links) ."". l('', array("id" => $node->nid), "node", "", array("title" => t("Permanent link to this blog entry."))) .""; $output .= "
". check_output($blog->teaser, 1) ."

"; } @@ -178,10 +178,10 @@ function blog_page_user($uid = 0, $date = 0, $all = 0) { $output .= ""; $output .= lm("image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", array("mod" => "blog", "op" => "feed", "id" => $account->uid), "", array("title" => t("Read the XML version of this page."))) ."\n"; if (!$all && $date) { - $output .= lm(t("show all blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid, "all" => 1), "", array("title" => t("Show all blogs by this user"))); + $output .= lm(t("show all blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid, "all" => 1), "", array("title" => t("Show all blogs by this user."))); } else { - $output .= lm(t("show recent blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid), "", array("title" => t("Show recent blogs by this user"))); + $output .= lm(t("show recent blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid), "", array("title" => t("Show recent blogs by this user."))); } $theme->box(t("%u's blog", array("%u" => $account->name)), $output); diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 4c2c13f83..7d4f4a206 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -43,7 +43,7 @@ function blog_user($type, &$edit, &$user) { switch ($type) { case "view_public": case "view_private": - return form_item("Blog", lm(t("View recent entries."), array("mod" => "blog", "id" => $user->uid)) ."
". lm(t("View all entries."), array("mod" => "blog", "id" => $user->uid, "all" => 1))); + return form_item(t("Blog"), lm(t("view recent entries"), array("mod" => "blog", "id" => $user->uid), "", array("title" => t("View recent blog entries."))) ."
". lm(t("view all entries"), array("mod" => "blog", "id" => $user->uid, "all" => 1), "", array("title" => t("View all blog entries.")))); } } @@ -170,7 +170,7 @@ function blog_page_user($uid = 0, $date = 0, $all = 0) { $links = link_node($blog, 1); - $output .= "
". check_output($blog->title) ."
". $theme->links($links) ."". l('', array("id" => $node->nid), "node", "", array("title" => t("Permanent link to this blog entry"))) .""; + $output .= "
". check_output($blog->title) ."
". $theme->links($links) ."". l('', array("id" => $node->nid), "node", "", array("title" => t("Permanent link to this blog entry."))) .""; $output .= "
". check_output($blog->teaser, 1) ."

"; } @@ -178,10 +178,10 @@ function blog_page_user($uid = 0, $date = 0, $all = 0) { $output .= ""; $output .= lm("image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", array("mod" => "blog", "op" => "feed", "id" => $account->uid), "", array("title" => t("Read the XML version of this page."))) ."\n"; if (!$all && $date) { - $output .= lm(t("show all blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid, "all" => 1), "", array("title" => t("Show all blogs by this user"))); + $output .= lm(t("show all blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid, "all" => 1), "", array("title" => t("Show all blogs by this user."))); } else { - $output .= lm(t("show recent blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid), "", array("title" => t("Show recent blogs by this user"))); + $output .= lm(t("show recent blogs"), array("mod" => "blog", "op" => "view", "id" => $account->uid), "", array("title" => t("Show recent blogs by this user."))); } $theme->box(t("%u's blog", array("%u" => $account->name)), $output); diff --git a/modules/comment.module b/modules/comment.module index baefa295c..0f11bec1d 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -332,14 +332,14 @@ function comment_threshold($threshold) { function comment_mode($mode) { global $cmodes; - foreach ($cmodes as $key => $value) $options .= " \n"; + foreach ($cmodes as $key => $value) $options .= " \n"; return "\n"; } function comment_order($order) { global $corder; - foreach ($corder as $key=>$value) $options .= " \n"; + foreach ($corder as $key=>$value) $options .= " \n"; return "\n"; } @@ -418,7 +418,7 @@ function comment_view($comment, $folded = 0) { $theme->comment($comment, $folded); } else { - print l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ." by ". format_name($comment) ."

"; + print l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ." ". t("by") ." ". format_name($comment) ."

"; } } @@ -518,10 +518,10 @@ function comment_render($nid, $cid = 0) { if ($mode == 1) { if (db_result($result)) { print "\n"; - print " \n"; + print " \n"; while ($comment = db_fetch_object($result)) { if (comment_visible($comment, $threshold)) { - print " \n"; + print " \n"; } } print "
SubjectAuthorDateScore
". t("Subject") ."". t("Author") ."". t("Date") ."
". l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ."". format_name($comment) ."". format_date($comment->timestamp, "small") ."$comment->score
". l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ."". format_name($comment) ."". format_date($comment->timestamp, "small") ."
\n"; @@ -702,7 +702,7 @@ function comment_page() { case t("Update settings"): global $mode, $order, $threshold; comment_settings(check_query($mode), check_query($order), check_query($threshold)); - drupal_goto(drupal_url(array("id" => $edit["nid"]), "node")); + drupal_goto(drupal_url(array("id" => $edit["nid"], "mode" => $mode, "order" => $order), "node")); break; default: } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index baefa295c..0f11bec1d 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -332,14 +332,14 @@ function comment_threshold($threshold) { function comment_mode($mode) { global $cmodes; - foreach ($cmodes as $key => $value) $options .= " \n"; + foreach ($cmodes as $key => $value) $options .= " \n"; return "\n"; } function comment_order($order) { global $corder; - foreach ($corder as $key=>$value) $options .= " \n"; + foreach ($corder as $key=>$value) $options .= " \n"; return "\n"; } @@ -418,7 +418,7 @@ function comment_view($comment, $folded = 0) { $theme->comment($comment, $folded); } else { - print l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ." by ". format_name($comment) ."

"; + print l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ." ". t("by") ." ". format_name($comment) ."

"; } } @@ -518,10 +518,10 @@ function comment_render($nid, $cid = 0) { if ($mode == 1) { if (db_result($result)) { print "\n"; - print " \n"; + print " \n"; while ($comment = db_fetch_object($result)) { if (comment_visible($comment, $threshold)) { - print " \n"; + print " \n"; } } print "
SubjectAuthorDateScore
". t("Subject") ."". t("Author") ."". t("Date") ."
". l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ."". format_name($comment) ."". format_date($comment->timestamp, "small") ."$comment->score
". l(check_output($comment->subject), array("id" => $comment->nid, "cid" => $comment->cid), "node", $comment->cid) ."". format_name($comment) ."". format_date($comment->timestamp, "small") ."
\n"; @@ -702,7 +702,7 @@ function comment_page() { case t("Update settings"): global $mode, $order, $threshold; comment_settings(check_query($mode), check_query($order), check_query($threshold)); - drupal_goto(drupal_url(array("id" => $edit["nid"]), "node")); + drupal_goto(drupal_url(array("id" => $edit["nid"], "mode" => $mode, "order" => $order), "node")); break; default: } diff --git a/modules/forum.module b/modules/forum.module index e5b487f09..79a3363c7 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -59,7 +59,7 @@ function forum_form(&$node, &$help, &$error) { $output = implode("", taxonomy_node_form("forum", $node)); } - $output .= form_textarea("Body", "body", $node->body, 60, 10); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 10); return $output; } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index e5b487f09..79a3363c7 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -59,7 +59,7 @@ function forum_form(&$node, &$help, &$error) { $output = implode("", taxonomy_node_form("forum", $node)); } - $output .= form_textarea("Body", "body", $node->body, 60, 10); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 10); return $output; } diff --git a/modules/jabber.module b/modules/jabber.module index 0a15cc2de..98ddd7480 100644 --- a/modules/jabber.module +++ b/modules/jabber.module @@ -162,11 +162,11 @@ function jabber_user($type, $edit, $user) { switch ($type) { case "view_private": $result = user_get_authname($user, $module); - $output .= form_item("$name ID", $result); + $output .= form_item(t("$name ID"), $result); return $output; case "edit_form": $result = user_get_authname($user, $module); - $output .= form_textfield("$name ID", "authname_" . $module, $result, 30, 55, t("You may login to %s using a valid %id.", array("%s" => variable_get("site_name", "this web site"), "%id" => lm("$name ID", array("mod" => "user", "op" => "help"), $module)))); + $output .= form_textfield(t("$name ID"), "authname_" . $module, $result, 30, 55, t("You may login to %s using a valid %id.", array("%s" => variable_get("site_name", "this web site"), "%id" => lm("$name ID", array("mod" => "user", "op" => "help"), $module)))); return $output; case "edit_validate": return user_validate_authmap($user, $edit["authname_$module"], $module); diff --git a/modules/page.module b/modules/page.module index acc4bc6be..3f59513d3 100644 --- a/modules/page.module +++ b/modules/page.module @@ -144,9 +144,9 @@ function page_form(&$node, &$help, &$error) { $output .= implode("", taxonomy_node_form("page", $node)); } - $output .= form_textarea("Body", "body", $node->body, 60, 20); - $output .= form_textfield("Navigation link header", "link", $node->link, 60, 64, "To make the page show up on the navigation links enter the name of the link, otherwise leave blank."); - $output .= form_select("Type", "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 20); + $output .= form_textfield(t("Navigation link header"), "link", $node->link, 60, 64, t("To make the page show up on the navigation links enter the name of the link, otherwise leave blank.")); + $output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); return $output; } diff --git a/modules/page/page.module b/modules/page/page.module index acc4bc6be..3f59513d3 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -144,9 +144,9 @@ function page_form(&$node, &$help, &$error) { $output .= implode("", taxonomy_node_form("page", $node)); } - $output .= form_textarea("Body", "body", $node->body, 60, 20); - $output .= form_textfield("Navigation link header", "link", $node->link, 60, 64, "To make the page show up on the navigation links enter the name of the link, otherwise leave blank."); - $output .= form_select("Type", "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 20); + $output .= form_textfield(t("Navigation link header"), "link", $node->link, 60, 64, t("To make the page show up on the navigation links enter the name of the link, otherwise leave blank.")); + $output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); return $output; } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index ccccd36c4..24d0062fd 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -244,14 +244,15 @@ function taxonomy_form($vocabulary_id, $value = 0) { } else { $verb = "can"; - $blank = ""; + $blank = t(""); } + if ($vocabulary->multiple) { - $description = "You $verb choose one or more terms for this node"; + $description = t("You $verb choose one or more terms for this node."); $multiple = 1; } else { - $description = "You $verb choose one term for this node"; + $description = t("You $verb choose one term for this node."); $multiple = 0; } return _taxonomy_term_select($vocabulary->name, "taxonomy", $value, $vocabulary_id, $description, $multiple, $blank); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index ccccd36c4..24d0062fd 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -244,14 +244,15 @@ function taxonomy_form($vocabulary_id, $value = 0) { } else { $verb = "can"; - $blank = ""; + $blank = t(""); } + if ($vocabulary->multiple) { - $description = "You $verb choose one or more terms for this node"; + $description = t("You $verb choose one or more terms for this node."); $multiple = 1; } else { - $description = "You $verb choose one term for this node"; + $description = t("You $verb choose one term for this node."); $multiple = 0; } return _taxonomy_term_select($vocabulary->name, "taxonomy", $value, $vocabulary_id, $description, $multiple, $blank); diff --git a/modules/tracker.module b/modules/tracker.module index a9d718d42..b88df8ed7 100644 --- a/modules/tracker.module +++ b/modules/tracker.module @@ -43,7 +43,7 @@ function tracker_comments($id = 0) { $output .= "

\n"; } @@ -92,7 +92,7 @@ function tracker_user($type, &$edit, &$user) { case "view_public": case "view_private": if (user_access("access comments")) { - return form_item(t("Comments"), lm(t("View recent comments."), array("mod" => "tracker", "id" => $user->uid))); + return form_item(t("Comments"), lm(t("view recent comments"), array("mod" => "tracker", "id" => $user->uid), "", array("title" => t("View recent comments.")))); } } } diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index a9d718d42..b88df8ed7 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -43,7 +43,7 @@ function tracker_comments($id = 0) { $output .= "\n"; } @@ -92,7 +92,7 @@ function tracker_user($type, &$edit, &$user) { case "view_public": case "view_private": if (user_access("access comments")) { - return form_item(t("Comments"), lm(t("View recent comments."), array("mod" => "tracker", "id" => $user->uid))); + return form_item(t("Comments"), lm(t("view recent comments"), array("mod" => "tracker", "id" => $user->uid), "", array("title" => t("View recent comments.")))); } } } -- cgit v1.2.3