X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fregister.php;h=cad5c2ed708745df0f4daa2c65659fc73966e773;hb=4aedce6864eb27a0c37b3dcae22fee0aa16ae537;hp=cd04865067dfc93e0bf67b0fe2247bc02ce1cdde;hpb=7b244b2a6699977070fc074a179aca6aa63c88b3;p=quix0rs-gnu-social.git

diff --git a/actions/register.php b/actions/register.php
index cd04865067..cad5c2ed70 100644
--- 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)) {
@@ -115,17 +115,30 @@ class RegisterAction extends Action {
 		return $result;
 	}
 
+	function show_top($error=NULL) {
+		if ($error) {
+			common_element('p', 'error', $error);
+		} else {
+			common_element('p', 'instructions', 
+						   _t('You can create a new account to start posting notices.'));
+		}
+	}
+	
 	function show_form($error=NULL) {
 		global $config;
-		
-		common_show_header(_t('Register'));
+
+		common_show_header(_t('Register'), NULL, $error, array($this, 'show_top'));
 		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',