Commit 5e3d1e83 authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files

Fixed up various language strings (bug #400)

parent e126bad5
......@@ -47,6 +47,8 @@ $form = array(
'title' => get_string('adminusers', 'admin'),
'defaultvalue' => $adminusers,
'filter' => false,
'lefttitle' => get_string('potentialadmins', 'admin'),
'righttitle' => get_string('currentadmins', 'admin'),
'rules' => array(
'required' => true
)
......
......@@ -45,7 +45,9 @@ $form = array(
'type' => 'userlist',
'title' => get_string('staffusers', 'admin'),
'defaultvalue' => $staffusers,
'filter' => false
'filter' => false,
'lefttitle' => get_string('potentialstaff', 'admin'),
'righttitle' => get_string('currentstaff', 'admin')
),
'submit' => array(
'type' => 'submit',
......
......@@ -33,7 +33,7 @@ $string['typewatchlist'] = 'Watchlist';
$string['typenewview'] = 'New view';
$string['typecontactus'] = 'Contact us';
$string['typeobjectionable'] = 'Objectionable content';
$string['typevirusrepeat'] = 'Virus flat repeat';
$string['typevirusrepeat'] = 'Repeat virus upload';
$string['typevirusrelease'] = 'Virus flag release';
$string['typeadminmessages'] = 'Administration messages';
......
......@@ -77,6 +77,8 @@ $string['adminnotifications'] = 'Admin Notifications';
$string['adminnotificationsdescription'] = 'Configure how administrators receive system notifications';
$string['uploadcsv'] = 'Add Users by CSV';
$string['uploadcsvdescription'] = 'Upload a CSV file containing new users';
$string['usersearch'] = 'User Search';
$string['usersearchdescription'] = 'Search all users and perform administrative actions on them';
$string['pluginadmin'] = 'Plugin Administration';
$string['pluginadmindescription'] = 'Install and configure plugins';
......@@ -165,13 +167,14 @@ $string['uploadcsvusersaddedsuccessfully'] = 'The users in the file have been ad
// Admin Users
$string['adminuserspagedescription'] = '<p>Here you can choose which users are administrators for the site. The current administrators are listed on the right, and potential administrators are on the left.</p><p>The system must have at least one administrator.</p>';
$string['potentialadmins'] = 'Potential Admins';
$string['currentadmins'] = 'Current Admins';
$string['adminusersupdated'] = 'Admin users updated';
$string['usersearch'] = 'User Search';
$string['usersearchdescription'] = 'Search all users and perform administrative actions on them';
// Staff Users
$string['staffuserspagedescription'] = 'Here you can choose which users are staff for the site. The current staff are on the right, and potential staff are on the left.';
$string['potentialstaff'] = 'Potential Staff';
$string['currentstaff'] = 'Current Staff';
$string['staffusersupdated'] = 'Staff users updated';
// Admin Notifications
......@@ -193,6 +196,7 @@ $string['usersunsuspendedsuccessfully'] = 'Users unsuspended successfully';
$string['suspendingadmin'] = 'Suspending Admin';
// Institutions
$string['admininstitutions'] = 'Admininster Institutions';
$string['addinstitution'] = 'Add Institution';
$string['authplugin'] = 'Authentication plugin';
$string['defaultaccountinactiveexpire'] = 'Default account inactivity time';
......
......@@ -124,7 +124,7 @@ $string['login'] = 'Login';
$string['loginfailed'] = 'You have not provided the correct credentials to log in. Please check your username and password are correct.';
$string['loginto'] = 'Log in to %s';
$string['newpassword'] = 'New Password';
$string['oldpassword'] = 'Old Password';
$string['oldpassword'] = 'Current Password';
$string['password'] = 'Password';
$string['passworddescription'] = ' ';
$string['passwordhelp'] = 'The password you use to access the system';
......@@ -143,7 +143,7 @@ $string['yournewpassword'] = 'Your new password';
$string['yournewpasswordagain'] = 'Your new password again';
$string['invalidsesskey'] = 'Invalid session key';
$string['cantremovedefaultemail'] = 'You cannot remove your primary email address';
$string['mustspecifyoldpassword'] = 'You must specify your old password';
$string['mustspecifyoldpassword'] = 'You must specify your current password';
$string['captchatitle'] = 'CAPTCHA Image';
$string['captchadescription'] = 'Enter the characters you see in the picture to the right. Letters are not case sensitive';
$string['captchaincorrect'] = 'Enter the letters as they are shown in the image';
......@@ -163,7 +163,7 @@ $string['registeringdisallowed'] = 'Sorry, you cannot register for this system a
// Forgot password
$string['cantchangepassword'] = 'Sorry, you are unable to change your password through this interface - please use your institution\'s interface instead';
$string['forgotpassword'] = 'Forgotten your password?';
$string['forgotpasswordtext'] = 'Forgot your password? Enter your e-mail address here and we will send you a key you can use to give yourself a new password.';
$string['forgotpasswordtext'] = 'If you have forgotten your password, enter below the primary email address you have listed in your Profile and we will send you a key you can use to give yourself a new password';
$string['passwordreminder'] = 'Password Reminder';
$string['pwchangerequestsent'] = 'You should receive an e-mail shortly with a link you can use to change the password for your account';
$string['forgotpassemailsubject'] = 'Change password request for %s';
......
......@@ -62,6 +62,13 @@ function pieform_element_userlist(Pieform $form, $element) {
$smarty->assign('filter', true);
}
if (!empty($element['lefttitle'])) {
$smarty->assign('lefttitle', $element['lefttitle']);
}
if (!empty($element['righttitle'])) {
$smarty->assign('righttitle', $element['righttitle']);
}
return $smarty->fetch('form/userlist.tpl');
}
......
......@@ -3,7 +3,7 @@
{include file="columnfullstart.tpl"}
<h2>{str tag="adminusers" section="admin"}</h2>
<p>{str tag="adminusersdescription" section="admin"}</p>
<p>{str tag="adminuserspagedescription" section="admin"}</p>
{$adminusersform}
......
......@@ -2,7 +2,7 @@
{include file="columnfullstart.tpl"}
<h2>AdminInstitutions</h2>
<h2>{str tag="admininstitutions" section="admin"}</h2>
{if $delete_form}
<h3>{str tag="deleteinstitution" section="admin"}</h3>
......
......@@ -3,7 +3,7 @@
{include file="columnfullstart.tpl"}
<h2>{str tag="staffusers" section="admin"}</h2>
<p>{str tag="staffusersdescription" section="admin"}</p>
<p>{str tag="staffuserspagedescription" section="admin"}</p>
{$staffusersform}
......
......@@ -92,6 +92,13 @@
</td>
{{/if}}
</tr>
{{if $lefttitle || $righttitle}}
<tr>
<th>{{$lefttitle}}</th>
<th></th>
<th>{{$righttitle}}</th>
</tr>
{{/if}}
<tr>
<td colspan="3" id="{{$name}}_messages">
</td>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment