[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm loncreateuser.pm lonmenu.pm lonpreferences.pm resetpw.pm /localize/localize de.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Wed, 29 Apr 2009 16:57:36 -0000
This is a MIME encoded message
--bisitz1241024256
Content-Type: text/plain
bisitz Wed Apr 29 16:57:36 2009 EDT
Modified files:
/loncom/interface loncommon.pm loncreateuser.pm lonmenu.pm
lonpreferences.pm resetpw.pm
/loncom/localize/localize de.pm zh.pm
Log:
Banned HTML tags (<a>) from translation files
and adjusted corresponding translation phrases
(more to do)
--bisitz1241024256
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090429165736.txt"
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.798 loncom/interface/loncommon.pm:1.799
--- loncom/interface/loncommon.pm:1.798 Tue Apr 28 21:54:57 2009
+++ loncom/interface/loncommon.pm Wed Apr 29 16:57:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.798 2009/04/28 21:54:57 tempelho Exp $
+# $Id: loncommon.pm,v 1.799 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7469,12 +7469,17 @@
if ($cancreate) {
$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
} else {
- my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+ my $helplink = 'javascript:helpMenu('."'display'".')';
my %usertypetext = (
official => 'institutional',
unofficial => 'non-institutional',
);
- $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+ $new_user_create = '<p class="LC_warning">'
+ .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+ .' '
+ .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+ ,'<a href="'.$helplink.'">','</a>')
+ .'</p><br />';
}
}
}
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.291 loncom/interface/loncreateuser.pm:1.292
--- loncom/interface/loncreateuser.pm:1.291 Wed Apr 22 17:19:10 2009
+++ loncom/interface/loncreateuser.pm Wed Apr 29 16:57:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.291 2009/04/22 17:19:10 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.292 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -631,7 +631,7 @@
&Apache::lonuserutils::can_create_user($ccdomain,$context,
$usertype);
if (!$cancreate) {
- my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+ my $helplink = 'javascript:helpMenu('."'display'".')';
my %usertypetext = (
official => 'institutional',
unofficial => 'non-institutional',
@@ -641,7 +641,12 @@
$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
'</span><br />';
}
- $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+ $response .= '<p class="LC_warning">'
+ .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+ .' '
+ .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+ ,'<a href="'.$helplink.'">','</a>')
+ .'</p><br />';
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response);
return;
@@ -2494,8 +2499,11 @@
} else {
$r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
}
- $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
- &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
+ my $helplink = 'javascript:helpMenu('."'display'".')';
+ $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'
+ .&mt('Please contact your [_1]helpdesk[_2] for more information.'
+ ,'<a href="'.$helplink.'">','</a>')
+ .'<br />');
}
$r->print('<span class="LC_warning">'
.$no_forceid_alert
@@ -5370,7 +5378,7 @@
.&mt("You are not authorized to create new users in your current role's domain - [_1]."
,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
.'<br />'
- .&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.'
+ .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
,' <a'.$helplink.'>'
,'</a>')
.'<br /><br />';
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.260 loncom/interface/lonmenu.pm:1.261
--- loncom/interface/lonmenu.pm:1.260 Thu Apr 23 17:28:59 2009
+++ loncom/interface/lonmenu.pm Wed Apr 29 16:57:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.260 2009/04/23 17:28:59 bisitz Exp $
+# $Id: lonmenu.pm,v 1.261 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -989,8 +989,9 @@
($env{'environment.remote'} eq 'off')) { return ''; }
my $esclowerurl=&escape($lowerurl);
- my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
- "/adm/remote?action=collapse&url=$esclowerurl");
+ my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
+ ,'<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">'
+ ,'</a>');
return(<<ENDREMOTEFORM);
<p>
<form name="wheel">
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.154 loncom/interface/lonpreferences.pm:1.155
--- loncom/interface/lonpreferences.pm:1.154 Sat Apr 25 20:22:07 2009
+++ loncom/interface/lonpreferences.pm Wed Apr 29 16:57:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.154 2009/04/25 20:22:07 www Exp $
+# $Id: lonpreferences.pm,v 1.155 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1206,7 +1206,9 @@
$defdom = $r->dir_config('lonDefDomain');
my %data = &Apache::lonnet::tmpget($mailtoken);
if (keys(%data) == 0) {
- $r->print(&mt('Sorry, the URL you provided to complete the reset of your password 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/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+ $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+ ,'<a href="/adm/resetpw">','</a>')
+ );
return;
}
if (defined($data{time})) {
Index: loncom/interface/resetpw.pm
diff -u loncom/interface/resetpw.pm:1.16 loncom/interface/resetpw.pm:1.17
--- loncom/interface/resetpw.pm:1.16 Sat Apr 4 21:47:41 2009
+++ loncom/interface/resetpw.pm Wed Apr 29 16:57:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Allow access to password changing via a token sent to user's e-mail.
#
-# $Id: resetpw.pm,v 1.16 2009/04/04 21:47:41 bisitz Exp $
+# $Id: resetpw.pm,v 1.17 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -234,7 +234,8 @@
my %data = &Apache::lonnet::tmpget($token);
my $now = time;
if (keys(%data) == 0) {
- $msg = &mt('Sorry, the URL you provided to complete the reset of your password 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/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.');
+ $msg = &mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+ ,'<a href="/adm/resetpw">','</a>');
return $msg;
}
if (($data{'time'} =~ /^\d+$/) &&
@@ -260,9 +261,12 @@
} else {
$msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'});
}
- $msg .= '<br /><br />'.&mt('<a href="/adm/login">Go to the login page</a>.');
+ $msg .= '<br /><br />'
+ .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';
} else {
- $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);
+ $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.'
+ ,$contact_name
+ ,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
}
} else {
$r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br /><br />');
@@ -270,10 +274,12 @@
&Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
}
} else {
- $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a <a href="/adm/resetpw">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 enter a new password.');
+ $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
+ ,'<a href="/adm/resetpw">','</a>');
}
} else {
- $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.');
+ $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'
+ ,'<a href="/adm/resetpw">','</a>');
}
return $msg;
}
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.284 loncom/localize/localize/de.pm:1.285
--- loncom/localize/localize/de.pm:1.284 Tue Apr 21 19:46:18 2009
+++ loncom/localize/localize/de.pm Wed Apr 29 16:57:35 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.284 2009/04/21 19:46:18 droeschl Exp $
+# $Id: de.pm,v 1.285 2009/04/29 16:57:35 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5448,8 +5448,8 @@
'"Waiting for Remote Control window to load: "+[_1]'
=> '"Warte auf das Laden der Fernbedienung: "+[_1]',
- '<a href="[_1]">Continue</a> on in Inline Menu mode'
-=> '<a href="[_1]">Weiter</a> im Kopfzeilenmenü-Modus',
+ '[_1]Continue[_2] on in Inline Menu mode'
+=> '[_1]Weiter[_2] im Kopfzeilenmenü-Modus',
'All posts'
=> 'Alle Diskussionsbeiträge',
@@ -12630,8 +12630,8 @@
'No such user: '
=> 'Dieser Benutzer existiert nicht: ',
- 'Sorry, the URL you provided to complete the reset of your password 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/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
-=> 'Tut mir leid, aber die von Ihnen angegebene URL zum Beenden des Zurücksetzens Ihres Passworts ist ungültig. Entweder wurde der in der URL eingebundene Authentifizierungscode gelöscht oder die von Ihnen angegebene URL ist nicht gültig. Bitte schicken Sie eine <a href="/adm/resetpw">neue Anfrage</a> zum Zurücksetzen des Passworts und folgen dem Link der neuen URL, die in der Ihnen zugesandten E-Mail angegeben ist, damit Sie ein neues Passwort eingeben dürfen.',
+ 'Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+=> 'Tut mir leid, aber die von Ihnen angegebene URL zum Beenden des Zurücksetzens Ihres Passworts ist ungültig. Entweder wurde der in der URL eingebundene Authentifizierungscode gelöscht oder die von Ihnen angegebene URL ist nicht gültig. Bitte schicken Sie eine [_1]neue Anfrage[_2] zum Zurücksetzen des Passworts und folgen dem Link der neuen URL, die in der Ihnen zugesandten E-Mail angegeben ist, damit Sie ein neues Passwort eingeben dürfen.',
'Sorry, the token generated when you requested a password reset has expired.'
=> 'Tut mir leid, der erzeugte Authentifizierungscode zum Zurücksetzen Ihres Passworts ist bereits abgelaufen und daher nicht mehr gültig.',
@@ -13173,9 +13173,6 @@
'No match was found for the username ([_1]) in LON-CAPA domain: [_2]'
=> 'Für die Benutzerkennung [_1] in der LON-CAPA-Domäne [_2] wurde kein Treffer gefunden.',
- 'Contact the <a[_1]>helpdesk</a> for assistance.'
-=> 'Kontaktieren Sie das <a[_1]>Helpdesk</a> für Unterstützung.',
-
'Submit a request to the LON-CAPA [_1]helpdesk[_2] for [_3] if you require assistance.'
=> 'Kontaktieren Sie das [_1]LON-CAPA-Helpdesk[_2] ([_3]), falls Sie Unterstützung benötigen.',
@@ -15571,8 +15568,8 @@
"You do not have the authority to change these fields given the user's current set of active/future [_1] roles:"
=> 'Sie haben nicht die Berechtigung, um diese Felder angesichts der aktuellen aktiven/zukünftigen [_1] Rollen des Benutzers zu ändern:',
- 'Contact your <a href="[_1]">helpdesk</a> for more information.'
-=> 'Kontaktieren Sie das <a href="[_1]">Helpdesk</a> für weitere Informationen.',
+ 'Please contact your [_1]helpdesk[_2] for more information.'
+=> 'Bitte kontaktieren Sie das [_1]Helpdesk[_2] für weitere Informationen.',
'<b>[_1]</b> enrolled'
=> '<b>[_1]</b> eingetragen',
@@ -15652,8 +15649,8 @@
'the institutional directory for domain: '
=> 'das institutionelle Verzeichnis für die Domäne: ',
- 'Contact the [_1]helpdesk[_2] if you need to create a new user.'
-=> 'Kontaktieren Sie das [_1]Helpdesk[_2], falls Sie einen neuen Benutzer erstellen möchten.',
+ 'Please contact the [_1]helpdesk[_2] if you need to create a new user.'
+=> 'Bitte kontaktieren Sie das [_1]Helpdesk[_2], falls Sie einen neuen Benutzer erstellen möchten.',
'Section for self-enrolled users unchanged as the proposed section is a group'
=> 'Sektion für selbst eingetragene Benutzer nicht geändert, da die vorgeschlagene Sektion eine Gruppe ist',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.48 loncom/localize/localize/zh.pm:1.49
--- loncom/localize/localize/zh.pm:1.48 Tue Apr 21 13:28:26 2009
+++ loncom/localize/localize/zh.pm Wed Apr 29 16:57:35 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.48 2009/04/21 13:28:26 bisitz Exp $
+# $Id: zh.pm,v 1.49 2009/04/29 16:57:35 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5512,8 +5512,8 @@
'"Waiting for Remote Control window to load: "+[_1]'
=> '"等待加载远程控制窗口: "+[_1]',
- '<a href="[_1]">Continue</a> on in Inline Menu mode'
-=> '<a href="[_1]">继续</a> 在内置菜单模式下',
+ '[_1]Continue[_2] on in Inline Menu mode'
+=> '[_1]继续[_2] 在内置菜单模式下',
'All posts'
=> '所有的讨论',
@@ -12727,8 +12727,8 @@
'No such user: '
=> '此用户不存在： ',
- 'Sorry, the URL you provided to complete the reset of your password 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/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
-=> 'Tut mir leid, aber die von Ihnen angegebene URL zum Beenden des Zurücksetzens Ihres Passworts ist ungültig. Entweder wurde das in der URL eingebundene Merkzeichen gelöscht oder die von Ihnen angegebene URL ist nicht gültig. Bitte schicken Sie eine <a href="/adm/resetpw">neue Anfrage</a> zum Zurücksetzen des Passworts und folgen dem Link der neuen URL, die in der Ihnen zugesandten E-Mail angegeben ist, damit Sie ein neues Passwort eingeben dürfen.',
+ 'Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+=> 'Tut mir leid, aber die von Ihnen angegebene URL zum Beenden des Zurücksetzens Ihres Passworts ist ungültig. Entweder wurde das in der URL eingebundene Merkzeichen gelöscht oder die von Ihnen angegebene URL ist nicht gültig. Bitte schicken Sie eine [_1]neue Anfrage[_2] zum Zurücksetzen des Passworts und folgen dem Link der neuen URL, die in der Ihnen zugesandten E-Mail angegeben ist, damit Sie ein neues Passwort eingeben dürfen.',
'Sorry, the token generated when you requested a password reset has expired.'
=> 'Tut mir leid, das erzeugte Merkzeichen zum Zurücksetzen Ihres Passworts ist bereits abgelaufen und daher nicht mehr gültig.',
@@ -13264,9 +13264,6 @@
'No match was found for the username ([_1]) in LON-CAPA domain: [_2]'
=> 'Für die Benutzerkennung [_1] in der LON-CAPA-Domäne [_2] wurde kein Treffer gefunden.',
- 'Contact the <a[_1]>helpdesk</a> for assistance.'
-=> 'Kontaktieren Sie das <a[_1]>Helpdesk</a> für Unterstützung.',
-
'Submit a request to the LON-CAPA [_1]helpdesk[_2] for [_3] if you require assistance.'
=> 'Kontaktieren Sie das [_1]LON-CAPA-Helpdesk[_2] ([_3]), falls Sie Unterstützung benötigen.',
@@ -15641,8 +15638,8 @@
"You do not have the authority to change these fields given the user's current set of active/future [_1] roles:"
=> 'Sie haben nicht die Berechtigung, um diese Felder angesichts der aktuellen aktiven/zukünftigen [_1] Rollen des Benutzers zu ändern:',
- 'Contact your <a href="[_1]">helpdesk</a> for more information.'
-=> 'Kontaktieren Sie das <a href="[_1]">Helpdesk</a> für weitere Informationen.',
+ 'Please contact your [_1]helpdesk[_2] for more information.'
+=> 'Bitte kontaktieren Sie das [_1]Helpdesk[_2] für weitere Informationen.',
'<b>[_1]</b> enrolled'
=> '<b>[_1]</b> eingetragen',
@@ -15722,8 +15719,8 @@
'the institutional directory for domain: '
=> 'das institutionelle Verzeichnis für die Domäne: ',
- 'Contact the [_1]helpdesk[_2] if you need to create a new user.'
-=> 'Kontaktieren Sie das [_1]Helpdesk[_2], falls Sie einen neuen Benutzer erstellen möchten.',
+ 'Please contact the [_1]helpdesk[_2] if you need to create a new user.'
+=> 'Bitte kontaktieren Sie das [_1]Helpdesk[_2], falls Sie einen neuen Benutzer erstellen möchten.',
'Section for self-enrolled users unchanged as the proposed section is a group'
=> 'Sektion für selbst eingetragene Benutzer nicht geändert, da die vorgeschlagene Sektion eine Gruppe ist',
--bisitz1241024256--