aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-04-15 09:26:47 +0000
committerMario <mario@mariovavti.com>2021-04-15 09:26:47 +0000
commit4d3a555b53f3fdd710d7d502bb812d9a565a35f4 (patch)
tree1784b3145dcc892f7256a26cae179bdf7386466a /Zotlabs/Module
parente35ab97b7ecbd96e11883bc194bfe9fb5a72e7f2 (diff)
downloadvolse-hubzilla-4d3a555b53f3fdd710d7d502bb812d9a565a35f4.tar.gz
volse-hubzilla-4d3a555b53f3fdd710d7d502bb812d9a565a35f4.tar.bz2
volse-hubzilla-4d3a555b53f3fdd710d7d502bb812d9a565a35f4.zip
register: minor fixes and template cleanup
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Admin/Accounts.php3
-rw-r--r--Zotlabs/Module/Register.php13
2 files changed, 7 insertions, 9 deletions
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php
index 0c0725bd2..32029eb00 100644
--- a/Zotlabs/Module/Admin/Accounts.php
+++ b/Zotlabs/Module/Admin/Accounts.php
@@ -299,7 +299,7 @@ class Accounts {
'$sel_deny' => t('Deny selected'),
'$sel_aprv' => t('Approve selected'),
'$h_pending' => t('Verified registrations waiting for approval'),
- '$th_pending' => array(t('Request date'), 'dId2', t('Email'), 'IP', t('IP Count')),
+ '$th_pending' => array(t('Request date'), 'dId2', t('Email'), 'IP', t('Requests')),
'$no_pending' => t('No verified registrations.'),
'$approve' => t('Approve'),
'$deny' => t('Deny'),
@@ -330,6 +330,7 @@ class Accounts {
'$tao' => $tao,
'$pending' => $pending,
'$users' => $users,
+ '$msg' => t('Message')
));
$o .= paginate($a);
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 1cbea663a..1188651bd 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -532,17 +532,13 @@ class Register extends Controller {
$invite_code = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : ""));
- $name = array('name', t('Your name'),
- ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.'));
+ $name = array('name', t('Your name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real name is preferred'), '', '', $duty['atform']);
$nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl'));
- $nickname = array('nickname', t('Choose a short nickname'),
- ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''),
- sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'),
- $nickhub));
+ $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), t('Your nickname will be used to create an easy to remember channel address'), '', '', $duty['atform']);
- $tos = array('tos', $label_tos, '', '', array(t('no'),t('yes')));
+ $tos = array('tos', $label_tos, ((x($_REQUEST,'tos')) ? $_REQUEST['tos'] : ''), '', [t('no'),t('yes')], $duty['atform']);
- $register_msg = ['register_msg', t('Why do you want to join this hub?')];
+ $register_msg = ['register_msg', t('Why do you want to join this hub?'), ((x($_REQUEST,'register_msg')) ? $_REQUEST['register_msg'] : '')];
require_once('include/bbcode.php');
@@ -571,6 +567,7 @@ class Register extends Controller {
'$pass1' => $password,
'$pass2' => $password2,
'$submit' => t('Register'),
+ '$nickhub' => $nickhub
));