Updated label and note text for user and group remote subscribe forms

diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php
index 4fcd0eb39a31a305f229a755ed66d19152636a19..f325ba05321c95d97f118b57d3d8427c9d061c4a 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');
 

diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 542f7e20ca8a08e5b8786aba12700eed40e44f08..7ca8a7869a2ffc4f4bd67ff2abed36a34422480c 100644 (file)
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -62,9 +62,9 @@ class OStatusSubAction extends Action
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('profile',
-                     _m('Address or profile URL'),
+                     _m('Subscribe to'),
                      $this->profile_uri,
-                     _m('Enter the profile URL of a PubSubHubbub-enabled feed'));
+                     _m("OStatus user's address, like nickname@example.com or http://example.net/user/nickname"));
         $this->elementEnd('li');
         $this->elementEnd('ul');