[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface mydesk.tab /localize/localize de.pm
www
lon-capa-cvs@mail.lon-capa.org
Thu, 18 Sep 2003 20:10:18 -0000
This is a MIME encoded message
--www1063915818
Content-Type: text/plain
www Thu Sep 18 16:10:18 2003 EDT
Modified files:
/loncom/auth lonroles.pm
/loncom/interface mydesk.tab
/loncom/localize/localize de.pm
Log:
Internationalization and German localization
--www1063915818
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030918161018.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.71 loncom/auth/lonroles.pm:1.72
--- loncom/auth/lonroles.pm:1.71 Wed Sep 17 14:16:39 2003
+++ loncom/auth/lonroles.pm Thu Sep 18 16:10:18 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.71 2003/09/17 18:16:39 albertel Exp $
+# $Id: lonroles.pm,v 1.72 2003/09/18 20:10:18 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,6 +51,7 @@
use Apache::lonmenu;
use Apache::loncommon;
use Apache::lonannounce;
+use Apache::lonlocal;
sub redirect_user {
my ($r,$title,$url,$msg) = @_;
@@ -164,7 +165,7 @@
'request.role.adv' => $tadv,
'request.role.domain' => $cdom,
'request.course.sec' => $csec);
- my $msg='Entering course ...';
+ my $msg=&mt('Entering course ...');
if (($cnum) && ($role ne 'ca')) {
my ($furl,$ferr)=
@@ -183,7 +184,9 @@
"request.course.id" => $cdom.'_'.$cnum);
$furl='/adm/roles?tryagain=1';
$msg=
- '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>'.$ferr;
+ '<h1><font color=red>'.
+ &mt('Could not initialize course at this time.').
+ '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
}
# Check to see if the user is a CC entering a course
@@ -274,34 +277,35 @@
} else {
if ($ENV{'user.error.msg'}) {
$r->print(
- '<h3><font color=red>You need to choose another user role or '.
- 'enter a specific course for this function</font></h3>');
+ '<h3><font color=red>'.
+ &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
}
}
# -------------------------------------------------------- Choice or no choice?
if ($nochoose) {
if ($advanced) {
- $r->print("<h2>Assigned User Roles</h2>\n");
+ $r->print("<h2>".&mt('Assigned User Roles')."</h2>\n");
} else {
- $r->print("<h2>Sorry ...</h2>\nThis resource might be part of");
+ $r->print("<h2>".&mt('Sorry ...')."</h2>\n".
+ &mt('This resource might be part of'));
if ($ENV{'request.course.id'}) {
- $r->print(' another');
+ $r->print(&mt(' another'));
} else {
- $r->print(' a certain');
+ $r->print(&mt(' a certain'));
}
- $r->print(' course.</body></html>');
+ $r->print(&mt(' course.').'</body></html>');
return OK;
}
} else {
if ($advanced) {
- $r->print("Your home server is ".
+ $r->print(&mt("Your home server is ").
$Apache::lonnet::hostname{&Apache::lonnet::homeserver
($ENV{'user.name'},$ENV{'user.domain'})}.
"<br />\n");
- $r->print("Author and Co-Author roles may not be available on ".
- "servers other than your home server.");
+ $r->print(&mt(
+ "Author and Co-Author roles may not be available on servers other than your home server."));
} else {
- $r->print("<h2>Select a Course to Enter</h2>\n");
+ $r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
}
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -312,15 +316,16 @@
}
if ($ENV{'user.adv'}) {
$r->print(
- '<br />Show all roles: <input type="checkbox" name="showall"');
+ '<br />'.&mt('Show all roles').': <input type="checkbox" name="showall"');
if ($ENV{'form.showall'}) { $r->print(' checked'); }
- $r->print('><input type=submit value="Display">');
+ $r->print('><input type=submit value="'.&mt('Display').'">');
}
# ----------------------------------------------------------------------- Table
$r->print('<br /><table><tr>');
unless ($nochoose) { $r->print('<th> </th>'); }
- $r->print('<th>User Role</th><th colspan=2>Extent</th>'.
- '<th>Start</th><th>End</th><th>Remark</th></tr>'."\n");
+ $r->print('<th>'.&mt('User Role').'</th><th colspan=2>'.&mt('Extent').
+ '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
+ &mt('Remark').'</th></tr>'."\n");
foreach $envkey (sort keys %ENV) {
my $button = 1;
@@ -365,23 +370,24 @@
$button=0;
} elsif ($tstatus eq 'will') {
$tbg='#FFAA77';
- $tremark.='Active at next login. ';
+ $tremark.=&mt('Active at next login. ');
} elsif ($tstatus eq 'expired') {
$tbg='#FF7777';
$tfont='#330000';
$button=0;
} elsif ($tstatus eq 'will_not') {
$tbg='#AAFF77';
- $tremark.='Expired after logout. ';
+ $tremark.=&mt('Expired after logout. ');
} elsif ($tstatus eq 'selected') {
$tbg='#11CC55';
$tfont='#002200';
- $tremark.='Currently selected. ';
+ $tremark.=&mt('Currently selected. ');
}
my $trole;
if ($role =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
- $tremark.='<br>Defined by '.$rauthor.' at '.$rdomain.'.';
+ $tremark.='<br>'.&mt('Defined by ').$rauthor.
+ &mt(' at ').$rdomain.'.';
$trole=$rrole;
} else {
$trole=Apache::lonnet::plaintext($role);
@@ -403,9 +409,10 @@
}
#next if ($home eq 'no_host');
$home = $Apache::lonnet::hostname{$home};
- $ttype='Construction Space';
- $twhere='User: '.$trest.'<br />Domain: '.$tdom.'<br />'.
- ' Server: '.$home;
+ $ttype=&mt('Construction Space');
+ $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
+ ': '.$tdom.'<br />'.
+ ' '.&mt('Server').': '.$home;
$ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
} elsif ($role eq 'au') {
# Authors
@@ -421,20 +428,21 @@
}
#next if ($home eq 'no_host');
$home = $Apache::lonnet::hostname{$home};
- $ttype='Construction Space';
- $twhere='Domain: '.$tdom.'<br />Server: '.$home;
+ $ttype=&mt('Construction Space');
+ $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
+ ': '.$home;
$ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
} elsif ($trest) {
- $ttype='Course';
+ $ttype=&mt('Course');
if ($tsection) {
- $ttype.='<br>Section/Group: '.$tsection;
+ $ttype.='<br>'.&mt('Section/Group').': '.$tsection;
}
my $tcourseid=$tdom.'_'.$trest;
if ($ENV{'course.'.$tcourseid.'.description'}) {
$twhere=$ENV{'course.'.$tcourseid.'.description'};
- unless ($twhere eq 'Currently not available') {
+ unless ($twhere eq &mt('Currently not available')) {
$twhere.=' <font size="-2">'.
- &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+ &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
'</font>';
}
} else {
@@ -443,20 +451,20 @@
if (%newhash) {
$twhere=$newhash{'description'}.
' <font size="-2">'.
- &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
+ &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
'</font>';
} else {
- $twhere='Currently not available';
+ $twhere=&mt('Currently not available');
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
}
}
- if ($role ne 'st') { $twhere.="<br />Domain:".$tdom; }
+ if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
} elsif ($tdom) {
- $ttype='Domain';
+ $ttype=&mt('Domain');
$twhere=$tdom;
} else {
- $ttype='System';
- $twhere='system wide';
+ $ttype=&mt('System');
+ $twhere=&mt('system wide');
}
$r->print('<tr bgcolor='.$tbg.'>');
@@ -464,21 +472,22 @@
if (!$button) {
if ($switchserver) {
$r->print('<td><a href="/adm/logout?handover='.
- $switchserver.'">Switch Server</a></td>');
+ $switchserver.'">'.&mt('Switch Server').'</a></td>');
} else {
$r->print('<td> </td>');
}
} elsif ($tstatus eq 'is') {
- $r->print('<td><input type=submit value=Select name="'.
+ $r->print('<td><input type=submit value="'.
+ &mt('Select').'" name="'.
$trolecode.'"></td>');
} elsif ($tryagain) {
$r->print
- ('<td><input type=submit value="Try Selecting Again"'.
- ' name="'.$trolecode.'"></td>');
+ ('<td><input type=submit value="'.
+ &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>');
} elsif ($advanced) {
$r->print
- ('<td><input type=submit value="Re-Initialize"'.
- ' name="'.$trolecode.'"></td>');
+ ('<td><input type=submit value="'.
+ &mt('Re-Initialize').'" name="'.$trolecode.'"></td>');
} else {
$r->print('<td> </td>');
}
@@ -500,19 +509,20 @@
my $tfont='#003300';
if ($ENV{'request.role'} eq 'cm') {
$r->print('<tr bgcolor="#11CC55">');
- $tremark='Currently selected.';
+ $tremark=&mt('Currently selected. ');
$tfont='#002200';
} else {
$r->print('<tr bgcolor="#77FF77">');
}
unless ($nochoose) {
if ($ENV{'request.role'} ne 'cm') {
- $r->print('<td><input type=submit value=Select name="cm"></td>');
+ $r->print('<td><input type=submit value="'.
+ &mt('Select').'" name="cm"></td>');
} else {
$r->print('<td> </td>');
}
}
- $r->print('<td colspan=5><font color="'.$tfont.'">No role specified'.
+ $r->print('<td colspan=5><font color="'.$tfont.'">'.&mt('No role specified').
'</font></td><td><font color="'.$tfont.'">'.$tremark.
' </font></td></tr>'."\n");
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.46 loncom/interface/mydesk.tab:1.47
--- loncom/interface/mydesk.tab:1.46 Tue Sep 9 15:39:04 2003
+++ loncom/interface/mydesk.tab Thu Sep 18 16:10:18 2003
@@ -40,7 +40,7 @@
5:2:pmau:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Create a user or modify the roles and privileges of a user
5:3:clear
5:3:pccc:$requested_domain:ccrs.gif:create:course:go('/adm/createcourse');:Create a new course
-5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set deadlines and other assessment parameters, as well as modify course environment
+5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set deadlines and other assessment parameters, as well as modify course environment
6:1:clear
6:1:author:rau:cstr.gif:con-:struct:go('/priv/$uname/');:Enter my resource construction space
6:1:author:rca:cstr.gif:co con-:struct:go('/priv/$caname/');:Enter construction space as a co-author
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.11 loncom/localize/localize/de.pm:1.12
--- loncom/localize/localize/de.pm:1.11 Wed Sep 17 19:50:18 2003
+++ loncom/localize/localize/de.pm Thu Sep 18 16:10:18 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.11 2003/09/17 23:50:18 www Exp $
+# $Id: de.pm,v 1.12 2003/09/18 20:10:18 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -81,6 +81,51 @@
'course'
=> 'kurs',
+ 'Course'
+=> 'Kurs',
+
+ 'Section/Group'
+=> 'Gruppe',
+
+ 'Create a user or modify the roles and privileges of a user'
+=> 'Benutzeraccounts erzeugen und Ändern von Benutzerprivilegien',
+
+ 'View course assessment statistics'
+=> 'Aufgabenstatistiken erzeugen',
+
+ 'Set deadlines and other assessment parameters, as well as modify course environment'
+=> 'Setzen von Fälligkeitsdatums und anderen Aufgabenparameters, sowie Ändern der Kursumgebung',
+
+ 'New Folder'
+=> 'Neuer Ordner',
+
+ 'Simple Page'
+=> 'Einfache Seite',
+
+ 'Simple Problem'
+=> 'Einfache Aufgabe',
+
+ 'Upload Document'
+=> 'Dokument hochladen',
+
+ 'Search'
+=> 'Suchen',
+
+ 'Import'
+=> 'Importieren',
+
+ 'Main Course Documents'
+=> 'Hauptdokumente des Kurses',
+
+ 'Supplemental Course Documents'
+=> 'Zusätzliche Kursdokumente',
+
+ 'Bulletin Board'
+=> 'Schwarzes Brett',
+
+ 'Special Documents'
+=> 'Spezielle Dokumente',
+
'create'
=> 'erstelle',
@@ -102,6 +147,9 @@
'contents'
=> 'verzeich',
+ 'Navigate Contents'
+=> 'Inhaltsverzeichnis',
+
'Announcements and Calendar'
=> 'Bekanntmachungen und Kalender',
@@ -391,7 +439,50 @@
=> 'Neue Diskussion seit',
'Goodbye'
-=> 'Auf Wiedersehen'
+=> 'Auf Wiedersehen',
+
+ 'Select'
+=> 'Auswählen',
+
+ 'Re-Initialize'
+=> 'Neu initialisieren',
+
+ 'Currently selected. '
+=> 'Derzeit ausgewählt. ',
+
+ 'Switch Server'
+=> 'Server wechseln',
+
+ 'system wide'
+=> 'systemweit',
+
+ 'Currently not available'
+=> 'Derzeit nicht verfügbar',
+
+ 'No role specified'
+=> 'Keine bestimmte Rolle',
+
+ 'Remark'
+=> 'Bemerkung',
+
+ 'Extent'
+=> 'Bereich',
+
+ 'User Role'
+=> 'Benutzerrolle',
+
+ 'Start'
+=> 'Anfang',
+
+ 'End'
+=> 'Ende',
+
+ 'System'
+=> 'System',
+
+ 'Display'
+=> 'Anzeigen',
+
);
1;
--www1063915818--