[LON-CAPA-cvs] cvs: loncom /interface createaccount.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 01 Jul 2008 16:41:58 -0000
This is a MIME encoded message
--bisitz1214930518
Content-Type: text/plain
bisitz Tue Jul 1 12:41:58 2008 EDT
Modified files:
/loncom/interface createaccount.pm
Log:
Wording and optimized &mt() calls:
e.g., same text for same function; use already existing phrases; links as parameters; no html inside mt(), etc.
--bisitz1214930518
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20080701124158.txt"
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.6 loncom/interface/createaccount.pm:1.7
--- loncom/interface/createaccount.pm:1.6 Fri Jun 27 12:08:42 2008
+++ loncom/interface/createaccount.pm Tue Jul 1 12:41:57 2008
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.6 2008/06/27 16:08:42 bisitz Exp $
+# $Id: createaccount.pm,v 1.7 2008/07/01 16:41:57 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -106,7 +106,7 @@
if (@cancreate == 0) {
&print_header($r,$start_page);
- my $output = &mt('Creation of a new user account using an e-mail address as username or a loginID from your institution is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);
+ my $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -245,7 +245,7 @@
sub javascript_checkpass {
my ($now) = @_;
- my $nopass = &mt('You must enter a password');
+ my $nopass = &mt('You must enter a password.');
my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.
&mt('Please try again.');
my $js = <<"ENDSCRIPT";
@@ -284,7 +284,7 @@
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
$output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by your institution').'</h3>';
- $output .= &mt('If you already have a Log-in ID at your institution, you may be able to use it[_1] for LON-CAPA.','<br />').' '.&mt('Type in your Log-in ID and password to find out.').'<br /><br />';
+ $output .= &mt('If you already have a log-in ID at your institution, you may be able to use it for LON-CAPA.').'<br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -314,7 +314,7 @@
if (grep(/^email$/,@{$cancreate})) {
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
if (grep(/^login$/,@{$cancreate})) {
- $output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have [_1] a log-in ID at your institution.','<br />').'<br /><br />';
+ $output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have a log-in ID at your institution.').'<br /><br />';
} else {
$output .= '<br />';
}
@@ -341,7 +341,7 @@
}
}
if ($output eq '') {
- $output = &mt('Creation of a new user account using either an e-mail address or institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
+ $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);
} else {
$output .= '<div class="LC_clear_float_footer"></div>';
}
@@ -436,17 +436,20 @@
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).' '.
- &mt('To complete this process please open a web browser and enter the following ".
- "URL in the address/location box: ').&Apache::lonnet::absolute_url()."/adm/createaccount?token=$esc_token";
+ &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');
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
$contact_email);
if ($result eq 'ok') {
$msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
} else {
- $msg .= &mt('An error occurred when sending a message to the e-mail address you provided. 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. 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;
}
@@ -458,7 +461,8 @@
my %data = &Apache::lonnet::tmpget($token);
my $now = time;
if (keys(%data) == 0) {
- $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/createaccount">new request</a> for account creation and follow the link to the new URL included in the e-mail that will be sent to you.');
+ $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
return $msg;
}
if (($data{'time'} =~ /^\d+$/) &&
@@ -486,7 +490,10 @@
$nostart = 1;
$noend = 1;
} else {
- $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account').'<br />'.$output.&mt('Please contact the [_1] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);
+ $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
+ .'<br />'.$output
+# .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
+ .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
my $delete = &Apache::lonnet::tmpdel($token);
} else {
@@ -495,10 +502,12 @@
$nostart = 1;
}
} else {
- $msg = &mt('Sorry, the token generated when you requested creation of an account has expired. Please submit a <a href="/adm/createaccount">new request</a>, and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to create the account.');
+ $msg = &mt('Sorry, the token generated when you requested creation of an account has expired.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
}
} else {
- $msg .= &mt('Sorry, the URL generated when you requested creation of an account contained incomplete information. Please submit a <a href="/adm/createaccount">new request</a> for creation of an account, and use the new URL that will be sent to your e-mail address to complete the process.');
+ $msg .= &mt('Sorry, the URL generated when you requested creation of an account contained incomplete information.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
}
return ($msg,$nostart,$noend);
}
@@ -618,7 +627,7 @@
'<input type="button" name="createaccount" value="'.
$submit_text.'" onclick="javascript:checkpass();" /></form></div>';
} else {
- $output = &mt('Could not load javascript file [_1]','londes.js');
+ $output = &mt('Could not load javascript file [_1]','<tt>londes.js</tt>');
}
return $output;
}
@@ -628,7 +637,7 @@
my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
$env{'form.serverid'});
# Error messages
- my $error = '<span class="LC_error">'.&mt('Error').': ';
+ my $error = '<span class="LC_error">'.&mt('Error:').' ';
my $end = '</span><br /><br />';
my $rtnlink = '<a href="javascript:history.back();" />'.
&mt('Return to previous page').'</a>'.
@@ -651,9 +660,9 @@
'internal',$upass,$env{'form.cfirstname'},
$env{'form.cmiddlename'},$env{'form.clastname'},
$env{'form.cgeneration'},undef,undef,$username);
- $output = &mt('Generating user').': '.$result;
+ $output = &mt('Generating user: [_1]',$result);
my $uhome = &Apache::lonnet::homeserver($username,$domain);
- $output .= '<br />'.&mt('Home server').': '.$uhome.' '.
+ $output .= '<br />'.&mt('Home server: [_1]',$uhome).' '.
&Apache::lonnet::hostname($uhome).'<br /><br />';
return ('ok',$output);
}
@@ -741,7 +750,7 @@
sub username_activation {
my ($r,$username,$domain,$domdesc,$lonhost,$courseid) = @_;
my $output;
- my $error = '<span class="LC_error">'.&mt('Error').': ';
+ my $error = '<span class="LC_error">'.&mt('Error:').' ';
my $end = '</span><br /><br />';
my $rtnlink = '<a href="javascript:history.back();" />'.
&mt('Return to previous page').'</a>'.
@@ -776,7 +785,7 @@
return ('fail',$output);
}
} else {
- $output = &mt("User account creation is not available for the current default authentication type.\n");
+ $output = &mt('User account creation is not available for the current default authentication type.')."\n";
return('fail',$output);
}
}
@@ -831,9 +840,9 @@
}
if ($contact_email ne '') {
my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
- $msg .= '<br />'.&mt(' You may wish to contact the <a href="/adm/helpdesk?origurl=[_1]">LON-CAPA helpdesk</a> for the [_2] domain.',$escuri,$domdesc);
+ $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);
} else {
- $msg .= '<br />'.&mt(' You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+ $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
}
return $msg;
}
@@ -894,7 +903,8 @@
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
my ($retrieved,$output,$upass);
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
- $output = &mt('Information needed to retrieve your log-in information is missing, inaccessible or expired.').'<br />'.&mt('You may need to reload the previous page to obtain a new token.');
+ $output = &mt('Information needed to verify your login information is missing, inaccessible or expired.')
+ .'<br />'.&mt('You may need to reload the previous page to obtain a new token.');
return ($retrieved,$output,$upass);
} else {
my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$lonhost);
@@ -939,7 +949,7 @@
$format_msg = '<br />'.&mt("Your e-mail address uses the same internet domain as your institution's LON-CAPA service.").'<br />'.&mt('Creation of a LON-CAPA account with this type of e-mail address as username is not permitted.').'<br />';
if (ref($cancreate) eq 'ARRAY') {
if (grep(/^login$/,@{$cancreate})) {
- $format_msg .= &mt('You should request creation of a LON-CAPA account for a Log-in ID of "[_1]" at your institution instead.',$login).'<br />';
+ $format_msg .= &mt('You should request creation of a LON-CAPA account for a log-in ID of "[_1]" at your institution instead.',$login).'<br />';
}
}
}
--bisitz1214930518--