diff options
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 15 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.xtmpl | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 62d67efa2..432ff4a15 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -35,6 +35,9 @@ function xtemplate_node($node, $main = 0, $page = 0) { global $xtemplate; $xtemplate->template->assign(array( + "submitted" => t("Submitted by %a on %b.", + array("%a" => format_name($node), + "%b" => format_date($node->created))), "link" => url("node/view/$node->nid"), "title" => $node->title, "author" => format_name($node), @@ -66,10 +69,14 @@ function xtemplate_comment($comment, $links = 0) { global $xtemplate; $xtemplate->template->assign(array ( - "title" => $comment->subject, - "author" => format_name($comment), - "date" => format_date($comment->timestamp), - "content" => $comment->comment + "new" => t("new"), + "submitted" => t("Submitted by %a on %b.", + array("%a" => format_name($comment), + "%b" => format_date($comment->timestamp))), + "title" => $comment->subject, + "author" => format_name($comment), + "date" => format_date($comment->timestamp), + "content" => $comment->comment )); if ($comment->new) { diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl index d34a5c193..b82f6f38d 100644 --- a/themes/xtemplate/xtemplate.xtmpl +++ b/themes/xtemplate/xtemplate.xtmpl @@ -59,7 +59,7 @@ <!-- BEGIN: title --> <h2 class="title"><a href="{link}">{title}</a></h2> <!-- END: title --> - <span class="submitted">Submitted by {author} on {date}.</span> + <span class="submitted">{submitted}</span> <!-- BEGIN: taxonomy --> <span class="taxonomy">{taxonomy}</span> <!-- END: taxonomy --> @@ -72,8 +72,8 @@ <!-- BEGIN: comment --> <div class="comment"> - <h3 class="title">{title}</h3><!-- BEGIN: new --><span class="new">new</span><!-- END: new --> - <div class="submitted">Submitted by {author} on {date}.</div> + <h3 class="title">{title}</h3><!-- BEGIN: new --><span class="new">{new}</span><!-- END: new --> + <div class="submitted">{submitted}</div> <div class="content">{content}</div> <!-- BEGIN: links --> <div class="links">» {links}</div> |