diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-02 02:59:20 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-02 02:59:20 +0000 |
| commit | 9d0927dda936756f1f5003813f437d714fe481f8 (patch) | |
| tree | fe1b887345b37387ab0ddcfd78bf344f6150b6cc /modules/comment/views | |
| parent | a6f794c20dc3592bcaef17c622413c1b670a20d8 (diff) | |
| parent | 43985ea2fb137aa7d532617271e37d7c20def3c5 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/comment/views')
| -rw-r--r-- | modules/comment/views/admin_block_recent_comments.html.php | 6 | ||||
| -rw-r--r-- | modules/comment/views/comment.html.php | 6 | ||||
| -rw-r--r-- | modules/comment/views/comments.html.php | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index 99f72a30..4017e4f9 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -8,10 +8,16 @@ width="32" height="32" /> <?= gallery::date_time($comment->created) ?> + <? if ($comment->author()->guest): ?> + <?= t('%author_name said <em>%comment_text</em>', + array("author_name" => html::clean($comment->author_name()), + "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?> + <? else: ?> <?= t('<a href="%url">%author_name</a> said <em>%comment_text</em>', array("author_name" => html::clean($comment->author_name()), "url" => user_profile::url($comment->author_id), "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?> + <? endif ?> </li> <? endforeach ?> </ul> diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php index c4cf1ce0..263e5f97 100644 --- a/modules/comment/views/comment.html.php +++ b/modules/comment/views/comment.html.php @@ -8,10 +8,16 @@ width="40" height="40" /> </a> + <? if ($comment->author()->guest): ?> + <?= t("on %date_time, %name said", + array("date_time" => gallery::date_time($comment->created), + "name" => html::clean($comment->author_name()))) ?> + <? else: ?> <?= t("on %date_time, <a href=\"%url\">%name</a> said", array("date_time" => gallery::date_time($comment->created), "url" => user_profile::url($comment->author_id), "name" => html::clean($comment->author_name()))) ?> + <? endif ?> </p> <div> <?= nl2br(html::purify($comment->text)) ?> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index c8236997..0ed07c22 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -22,10 +22,16 @@ width="40" height="40" /> </a> + <? if ($comment->author()->guest): ?> + <?= t('on %date %name said', + array("date" => date("Y-M-d H:i:s", $comment->created), + "name" => html::clean($comment->author_name()))); ?> + <? else: ?> <?= t('on %date <a href="%url">%name</a> said', array("date" => date("Y-M-d H:i:s", $comment->created), "url" => user_profile::url($comment->author_id), "name" => html::clean($comment->author_name()))); ?> + <? endif ?> </p> <div> <?= nl2br(html::purify($comment->text)) ?> |