Merge remote branch 'statusnet/1.0.x' into idle-irc-plugin

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatusgroup.php

diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php
index 4fcd0eb39a31a305f229a755ed66d19152636a19..1b368de63cd64c37a02d1c8d4d5e35ec47694af2 100644 (file)
--- a/plugins/OStatus/actions/ostatusgroup.php
+++ b/plugins/OStatus/actions/ostatusgroup.php
@@ -72,9 +72,9 @@ class OStatusGroupAction extends OStatusSubAction
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('profile',
-                     _m('Group profile URL'),
+                     _m('Join group'),
                      $this->profile_uri,
-                     _m('Enter the profile URL of a group on another StatusNet site'));
+                     _m("OStatus group's address, like http://example.net/group/nickname"));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -104,7 +104,7 @@ class OStatusGroupAction extends OStatusSubAction
         }
 
         $this->showEntity($group,
-                          $group->getProfileUrl(),
+                          $group->homeUrl(),
                           $group->homepage_logo,
                           $group->description);
         return $ok;