Replies and Conversation noticestreams should only get POSTs by default

[quix0rs-gnu-social.git] / lib / groupeditform.php

diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index c1218ab35450d27a0993e641b4543f4fe7fb5ffa..e943dcd19a8b1425f14547e858e06b50d6f2363b 100644 (file)
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -144,8 +144,8 @@ class GroupEditForm extends Form
             $this->out->elementStart('li');
             $this->out->hidden('groupid', $id);
             // TRANS: Field label on group edit form.
-            $this->out->input('nickname', _('Nickname'),
-                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+            $this->out->input('newnickname', _('Nickname'),
+                              ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
                               // TRANS: Field title on group edit form.
                               _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
             $this->out->elementEnd('li');
@@ -202,10 +202,12 @@ class GroupEditForm extends Form
                 $this->out->elementEnd('li');
             }
             $this->out->elementStart('li');
-            $this->out->checkbox('private', _('Private'), 
+            // TRANS: Checkbox field label on group edit form to mark a group private.
+            $this->out->checkbox('private', _m('LABEL','Private'), 
                                   ($this->out->arg('private')) ? $this->out->arg('private') :
                                  ((!empty($this->group)) ? $this->group->isPrivate() : false),
-                                 _('New members must be approved by admin and all posts are forced to be private'));
+                                 // TRANS: Checkbox field title on group edit form to mark a group private.
+                                 _('New members must be approved by admin and all posts are forced to be private.'));
             $this->out->elementEnd('li');
             Event::handle('EndGroupEditFormData', array($this));
         }