1 files changed, 20 insertions, 17 deletions

diff --git a/actions/newgroup.php b/actions/newgroup.php
index 05520223c..95af6415e 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -43,25 +43,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class NewgroupAction extends Action
 {
     var $msg;
 
     function title()
     {
+        // TRANS: Title for form to create a group.
         return _('New group');
     }
 
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to create a group while not logged in.
             $this->clientError(_('You must be logged in to create a group.'));
             return false;
         }
@@ -78,7 +78,6 @@ class NewgroupAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -107,42 +106,45 @@ class NewgroupAction extends Action
             $this->element('p', 'error', $this->msg);
         } else {
             $this->element('p', 'instructions',
+                           // TRANS: Form instructions for group create form.
                            _('Use this form to create a new group.'));
         }
     }
 
     function trySave()
     {
-        $nickname    = $this->trimmed('nickname');
+        try {
+            $nickname = Nickname::normalize($this->trimmed('nickname'));
+        } catch (NicknameException $e) {
+            $this->showForm($e->getMessage());
+        }
         $fullname    = $this->trimmed('fullname');
         $homepage    = $this->trimmed('homepage');
         $description = $this->trimmed('description');
         $location    = $this->trimmed('location');
         $aliasstring = $this->trimmed('aliases');
 
-        if (!Validate::string($nickname, array('min_length' => 1,
-                                               'max_length' => 64,
-                                               'format' => NICKNAME_FMT))) {
-            $this->showForm(_('Nickname must have only lowercase letters '.
-                              'and numbers and no spaces.'));
-            return;
-        } else if ($this->nicknameExists($nickname)) {
+        if ($this->nicknameExists($nickname)) {
+            // TRANS: Group create form validation error.
             $this->showForm(_('Nickname already in use. Try another one.'));
             return;
         } else if (!User_group::allowedNickname($nickname)) {
+            // TRANS: Group create form validation error.
             $this->showForm(_('Not a valid nickname.'));
             return;
         } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
                    !Validate::uri($homepage,
                                   array('allowed_schemes' =>
                                         array('http', 'https')))) {
+            // TRANS: Group create form validation error.
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
         } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+            // TRANS: Group create form validation error.
             $this->showForm(_('Full name is too long (maximum 255 characters).'));
             return;
         } else if (User_group::descriptionTooLong($description)) {
-            // TRANS: Form validation error creating a new group because the description is too long.
+            // TRANS: Group create form validation error.
             // TRANS: %d is the maximum number of allowed characters.
             $this->showForm(sprintf(_m('Description is too long (maximum %d character).',
                                        'Description is too long (maximum %d characters).',
@@ -150,6 +152,7 @@ class NewgroupAction extends Action
                                     User_group::maxDescription()));
             return;
         } else if (!is_null($location) && mb_strlen($location) > 255) {
+            // TRANS: Group create form validation error.
             $this->showForm(_('Location is too long (maximum 255 characters).'));
             return;
         }
@@ -161,7 +164,7 @@ class NewgroupAction extends Action
         }
 
         if (count($aliases) > common_config('group', 'maxaliases')) {
-            // TRANS: Client error shown when providing too many aliases during group creation.
+            // TRANS: Group create form validation error.
             // TRANS: %d is the maximum number of allowed aliases.
             $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.',
                                        'Too many aliases! Maximum %d allowed.',
@@ -171,19 +174,20 @@ class NewgroupAction extends Action
         }
 
         foreach ($aliases as $alias) {
-            if (!Validate::string($alias, array('min_length' => 1,
-                                                'max_length' => 64,
-                                                'format' => NICKNAME_FMT))) {
+            if (!Nickname::isValid($alias)) {
+                // TRANS: Group create form validation error.
                 $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
                 return;
             }
             if ($this->nicknameExists($alias)) {
+                // TRANS: Group create form validation error.
                 $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
                                         $alias));
                 return;
             }
             // XXX assumes alphanum nicknames
             if (strcmp($alias, $nickname) == 0) {
+                // TRANS: Group create form validation error.
                 $this->showForm(_('Alias can\'t be the same as nickname.'));
                 return;
             }
@@ -227,4 +231,3 @@ class NewgroupAction extends Action
         return false;
     }
 }
-