debugging for addopenid problem

[quix0rs-gnu-social.git] / actions / register.php

diff --git a/actions/register.php b/actions/register.php
index cd04865067dfc93e0bf67b0fe2247bc02ce1cdde..d2c87f7bb33ff77196bc2d377105d401ab766bf9 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -54,7 +54,7 @@ class RegisterAction extends Action {
                } else if (!Validate::string($nickname, array('min_length' => 1,
                                                                                                          'max_length' => 64,
                                                                                                          'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-                       $this->show_form(_t('Nickname must have only letters and numbers and no spaces.'));
+                       $this->show_form(_t('Nickname must have only lowercase letters and numbers and no spaces.'));
                } else if ($this->nickname_exists($nickname)) {
                        $this->show_form(_t('Nickname already exists.'));
                } else if ($this->email_exists($email)) {
@@ -117,15 +117,25 @@ class RegisterAction extends Action {
 
        function show_form($error=NULL) {
                global $config;
-               
+
                common_show_header(_t('Register'));
+               if ($error) {
+                       common_element('div', 'error', $error);
+               } else {
+                       common_element('div', 'instructions', 
+                                                  _t('You can create a new account to start posting notices. '));
+               }
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('register')));
-               common_input('nickname', _t('Nickname'));
-               common_password('password', _t('Password'));
-               common_password('confirm', _t('Confirm'));
-               common_input('email', _t('Email'));
+               common_input('nickname', _t('Nickname'), NULL,
+                                        _t('1-64 lowercase letters or numbers, no punctuation or spaces'));
+               common_password('password', _t('Password'),                                             
+                                               _t('6 or more characters'));
+               common_password('confirm', _t('Confirm'),
+                                               _t('Same as password above'));
+               common_input('email', _t('Email'), NULL,
+                                        _t('Used only for updates, announcements, and password recovery'));
                common_element_start('p');
                common_element('input', array('type' => 'checkbox',
                                                                          'id' => 'license',