From c9dfe4059a3ee6ac91de6efc5476a46e8d2a10d9 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 9 Jan 2009 17:16:52 +0000 Subject: Closes #544: Logged out view now shows correct dates, also tidied up some translation issues. git-svn-id: https://code.elgg.org/elgg/trunk@2556 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/languages/en.php | 5 ++- .../views/default/object/groupforumtopic.php | 36 +++++++++++++--------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index 04b644cc2..675e4e32e 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -62,7 +62,10 @@ 'groups:enableforum' => 'Enable group forum', 'groups:enablefiles' => 'Enable group files', 'groups:yes' => 'yes', - 'groups:no' => 'no', + 'groups:no' => 'no', + + 'group:created' => 'Created %s with %d posts', + 'groups:lastupdated' => 'Last updated %s by %s', /* Group forum strings diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 011655706..bac4f991c 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -15,20 +15,28 @@ $description = autop($vars['entity']->description); $group = get_entity($vars['entity']->container_guid); $forum_created = friendly_time($vars['entity']->time_created); - if (isloggedin()) { - $counter = $vars['entity']->countAnnotations("group_topic_post"); - $last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc"); - } - //get the time and user - foreach($last_post as $last){ - $last_time = $last->time_created; - $last_user = $last->owner_guid; - } - - $info = "

" . elgg_echo('created') . " " . $forum_created . ", " . elgg_echo('with') . " " . $counter . " " . elgg_echo('posts') . "
last updated " . friendly_time($last_time); - if ($u = get_user($last_user)) { - $info .= "
by getURL() . "\">" . $u->username . ""; - } + //if (isloggedin()) { + $counter = $vars['entity']->countAnnotations("group_topic_post"); + $last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc"); + + //} + + //get the time and user + if ($last_post) { + foreach($last_post as $last) + { + $last_time = $last->time_created; + $last_user = $last->owner_guid; + } + } + + $u = get_user($last_user); + + $info = "

" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "
"; + if ($last_time) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), "
by getURL() . "\">" . $u->username . ""); + //if ($u = get_user($last_user)) { + // $info .= "
by getURL() . "\">" . $u->username . ""; + //} $info .= '

'; //get the group avatar $icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small')); -- cgit v1.2.3