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

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 = "<p class=\"latest_discussion_info\">" . elgg_echo('created') . " " . $forum_created . ", " . elgg_echo('with') . " " . $counter . " " . elgg_echo('posts') . "<br /><span class=\"timestamp\">last updated " . friendly_time($last_time);

-    if ($u = get_user($last_user)) {

-    	$info .= "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>";

-    }

+    //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 = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) .  "<br /><span class=\"timestamp\">";
+    if ($last_time) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>");

+    //if ($u = get_user($last_user)) {

+    //	$info .= "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>";

+    //}

     $info .= '</span></p>';
 	//get the group avatar
 	$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));