aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/group.php8
-rw-r--r--include/items.php2
-rw-r--r--include/notifier.php2
3 files changed, 8 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php
index bca369cd1..848db43bd 100644
--- a/include/group.php
+++ b/include/group.php
@@ -125,18 +125,22 @@ function group_side($every="contacts",$each="group") {
if(! local_user())
return;
+
+$createtext = t('Create a new group');
+$linktext= t('Everybody');
+
$o .= <<< EOT
<div id="group-sidebar">
<h3>Groups</h3>
<div id="sidebar-new-group">
-<a href="group/new">Create a new group</a>
+<a href="group/new">$createtext</a>
</div>
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
- <li class="sidebar-group-li" ><a href="$every">Everybody</a></li>
+ <li class="sidebar-group-li" ><a href="$every" >$linktext</a></li>
EOT;
diff --git a/include/items.php b/include/items.php
index a0804bcbe..d160ff131 100644
--- a/include/items.php
+++ b/include/items.php
@@ -110,7 +110,7 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
'$owner_profile_page' => xmlify($item['owner-link']),
'$owner_thumb' => xmlify($item['owner-avatar']),
'$item_id' => xmlify($item['uri']),
- '$title' => xmlify($item['name']),
+ '$title' => xmlify($item['title']),
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$content' =>xmlify($item['body']),
diff --git a/include/notifier.php b/include/notifier.php
index d8e066583..6986deb96 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -163,7 +163,7 @@ if($argc < 3)
'$owner_profile_page' => xmlify($item['owner-link']),
'$owner_thumb' => xmlify($item['owner-avatar']),
'$item_id' => xmlify($item['uri']),
- '$title' => xmlify($contact['name']),
+ '$title' => xmlify($item['title']),
'$published' => xmlify(datetime_convert('UTC', 'UTC',
$item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$updated' => xmlify(datetime_convert('UTC', 'UTC',