';
- $output .= &mt('If you already have a log-in ID at your institution,[_1] you may be able to use it for LON-CAPA.','
'.&mt('Create account with a username provided by this institution').'
';
+ $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','
').'
'.&mt('Type in your log-in ID and password to find out.').'
';
my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -372,7 +386,7 @@ sub print_username_form {
}
}
if ($output eq '') {
- $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
+ $output = &mt('Creation of a new LON-CAPA user account using an e-mail address or an institutional log-in ID as your username is not permitted at [_1].',$domdesc);
} else {
$output .= '';
}
@@ -456,7 +470,9 @@ sub process_email_request {
sub send_token {
my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
- my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'
';
+ my $msg = '
'.&mt('Account creation status').'
'.
+ &mt('Thank you for your request to create a new LON-CAPA account.').
+ '
';
my $now = time;
my %info = ('ip' => $ENV{'REMOTE_ADDR'},
'time' => $now,
@@ -466,7 +482,7 @@ sub send_token {
my $token = &Apache::lonnet::tmpput(\%info,$server);
if ($token !~ /^error/ && $token ne 'no_such_host') {
my $esc_token = &escape($token);
- my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '.
+ my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account at the following institution: [_2].',localtime(time),$domdesc).' '.
&mt('To complete this process please open a web browser and enter the following'
.' URL in the address/location box: [_1]'
,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
@@ -475,12 +491,14 @@ sub send_token {
if ($result eq 'ok') {
$msg .= &mt('A message has been sent to the e-mail address you provided.').'
'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'
'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'
','');
} else {
- $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')
- .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= '
'.
+ &mt('An error occurred when sending a message to the e-mail address you provided.').''.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
} else {
- $msg .= &mt('An error occurred creating a token required for the account creation process.')
- .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= '
'.
+ &mt('An error occurred creating a token required for the account creation process.').''.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
return $msg;
}
@@ -507,7 +525,7 @@ sub process_mailtoken {
if ($result eq 'ok') {
$msg = $output;
my $shownow = localtime($now);
- my $mailmsg = &mt('A LON-CAPA account in the [_1] domain has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+ my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
$mailmsg,$contact_name,
$contact_email);
@@ -889,20 +907,21 @@ sub check_id {
sub invalid_state {
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
- my $msg;
+ my $msg = '
'.&mt('Account creation unavailable').'
';
if ($error eq 'baduseremail') {
$msg = &mt('The e-mail address you provided does not appear to be a valid address.');
} elsif ($error eq 'existinguser') {
- $msg = &mt('The e-mail address you provided is already in use as a username in this LON-CAPA domain.');
+ $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
} elsif ($error eq 'userrules') {
- $msg = &mt('Username rules for this LON-CAPA domain do not allow the e-mail address you provided to be used as a username.');
+ $msg = &mt('Username rules for this LON-CAPA at this institution do not allow the e-mail address you provided to be used as a username.');
} elsif ($error eq 'userformat') {
- $msg = &mt('The e-mail address you provided may not be used as a username in this LON-CAPA domain.');
+ $msg = &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
} elsif ($error eq 'captcha') {
$msg = &mt('Validation of the code your entered failed.');
} elsif ($error eq 'noemails') {
- $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');
+ $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
}
+ $msg .= '';
if ($msgtext) {
$msg .= '
'.$msgtext;
}
@@ -915,9 +934,9 @@ sub linkto_email_help {
my $msg;
if ($contact_email ne '') {
my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
- $msg .= '
'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.','
','',$domdesc);
+ $msg .= '
'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','
','',$domdesc);
} else {
- $msg .= '
'.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+ $msg .= '
'.&mt('You may wish to send an e-mail to the LON-CAPA server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
}
return $msg;
}