Fix up Twitter JSON formatting to be consistent between the polling and streaming...

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

diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index a649c2ee3b258cecdecc67eb6bd2dea69064fab4..433f6a13871ccec4de2ad2d01837e95412df59ed 100644 (file)
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -150,27 +150,33 @@ class GroupEditForm extends Form
         $this->out->elementStart('li');
         $this->out->hidden('groupid', $id);
         $this->out->input('nickname', _('Nickname'),
-                     ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
-                     _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+                          ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+                          _('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
         $this->out->input('fullname', _('Full name'),
-                     ($this->out->arg('fullname')) ? $this->out->arg('fullname') : $fullname);
+                          ($this->out->arg('fullname')) ? $this->out->arg('fullname') : $fullname);
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
         $this->out->input('homepage', _('Homepage'),
-                     ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
-                     _('URL of the homepage or blog of the group or topic'));
+                          ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
+                          _('URL of the homepage or blog of the group or topic'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
+        $desclimit = User_group::maxDescription();
+        if ($desclimit == 0) {
+            $descinstr = _('Describe the group or topic');
+        } else {
+            $descinstr = sprintf(_('Describe the group or topic in %d characters'), $desclimit);
+        }
         $this->out->textarea('description', _('Description'),
-                        ($this->out->arg('description')) ? $this->out->arg('description') : $description,
-                        _('Describe the group or topic in 140 chars'));
+                             ($this->out->arg('description')) ? $this->out->arg('description') : $description,
+                             $descinstr);
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
         $this->out->input('location', _('Location'),
-                     ($this->out->arg('location')) ? $this->out->arg('location') : $location,
-                     _('Location for the group, if any, like "City, State (or Region), Country"'));
+                          ($this->out->arg('location')) ? $this->out->arg('location') : $location,
+                          _('Location for the group, if any, like "City, State (or Region), Country"'));
         $this->out->elementEnd('li');
         if (common_config('group', 'maxaliases') > 0) {
             $aliases = (empty($this->group)) ? array() : $this->group->getAliases();