[LON-CAPA-cvs] cvs: loncom /auth lonlogout.pm /interface groupsort.pm loncommunicate.pm lonindexer.pm lonmanagekeys.pm /localize/localize de.pm

www lon-capa-cvs@mail.lon-capa.org
Tue, 23 Sep 2003 00:26:10 -0000


This is a MIME encoded message

--www1064276770
Content-Type: text/plain

www		Mon Sep 22 20:26:10 2003 EDT

  Modified files:              
    /loncom/auth	lonlogout.pm 
    /loncom/interface	groupsort.pm loncommunicate.pm lonindexer.pm 
                     	lonmanagekeys.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Internationalizing.
  
  
--www1064276770
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030922202610.txt"

Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.11 loncom/auth/lonlogout.pm:1.12
--- loncom/auth/lonlogout.pm:1.11	Wed Sep 17 19:50:18 2003
+++ loncom/auth/lonlogout.pm	Mon Sep 22 20:26:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.11 2003/09/17 23:50:18 www Exp $
+# $Id: lonlogout.pm,v 1.12 2003/09/23 00:26:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@
                                  $sessionhash{'user.name'},
                                  $sessionhash{'user.home'},
                                  "Logout $ENV{'REMOTE_ADDR'}");
-            $r->content_type('text/html');
+            &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
             return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.22 loncom/interface/groupsort.pm:1.23
--- loncom/interface/groupsort.pm:1.22	Tue Aug 26 01:44:11 2003
+++ loncom/interface/groupsort.pm	Mon Sep 22 20:26:10 2003
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.22 2003/08/26 05:44:11 albertel Exp $
+# $Id: groupsort.pm,v 1.23 2003/09/23 00:26:10 www Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@
 use Apache::Constants qw(:common);
 use GDBM_File;
 use Apache::loncommon;
+use Apache::lonlocal;
 
 my %hash; # variable to tie to user specific database
 my $iconpath; # variable to be accessible to multiple subroutines
@@ -61,7 +62,7 @@
     my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';
 
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -290,9 +291,19 @@
     my $ctr = 0;
     my $clen = scalar(keys %shash);
     if ($clen > 1) {
+	my %lt=&Apache::lonlocal::texthash(
+		'fin'=> 'Finalize order of resources',
+		'gb' => 'Go Back',
+		'ns' => 'New Search',
+		'fi' => 'Finish Import',
+		'ca' => 'Cancel',
+		'co' => 'Change Order',
+		'ti' => 'Title',
+		'pa' => 'Path'
+		);
 	$r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
 	$r->print(<<END);
-<b><font color="#888888">Finalize order of resources</font></b>
+<b><font color="#888888">$lt{'fin'}</font></b>
 <form method='post' action='/adm/groupsort' name='groupsort'
       enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />
@@ -304,28 +315,28 @@
         # --- Expand here if "GO BACK" button desired
         if ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $r->print(<<END);
-<input type="button" name="alter" value="GO BACK"
+<input type="button" name="alter" value="$lt{'gb'}"
  onClick="window.location='/res/?catalogmode=groupimport'" />&nbsp;
 END
         }
 	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
 	    $r->print(<<END);
-<input type="button" name="alter" value="New Search"
+<input type="button" name="alter" value="$lt{'ns'}"
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
 END
         }
         # ---
 
 	$r->print(<<END);
-<input type="button" name="alter" value="FINISH IMPORT"
+<input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
-<input type="button" name="alter" value="CANCEL" onClick="self.close()" />
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
 	$r->print("<table border=0><tr>\n");
-	$r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>\n");
-	$r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
-	$r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
+	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n");
+	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
+	$r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
     } else {
 	$r->print(<<END);
 <body>
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.15 loncom/interface/loncommunicate.pm:1.16
--- loncom/interface/loncommunicate.pm:1.15	Mon Dec 30 09:10:58 2002
+++ loncom/interface/loncommunicate.pm	Mon Sep 22 20:26:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.15 2002/12/30 14:10:58 www Exp $
+# $Id: loncommunicate.pm,v 1.16 2003/09/23 00:26:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,10 +42,11 @@
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
 use Apache::loncommon;
+use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 #
@@ -57,30 +58,46 @@
 <title>The LearningOnline Network with CAPA</title>
 </head>
 END
+   my %lt=&Apache::lonlocal::texthash(
+'vam' => 'View All Messages',
+'vcm' => 'View Critical Messages',
+'smu' => 'Send Message to User(s)',
+'bmc' => 'Broadcast Message to Course',
+'dmu' => 'Distribute Messages from Uploaded File to Course',
+'unr' => 
+     'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
+'nm' => 'New Messages',
+'su' => 'Subject',
+'da' => 'Date',
+'us' => 'Username',
+'op' => 'Open',
+'do' => 'Domain'
+);
+
    $r->print(&Apache::loncommon::bodytag("Communication and Messages"));
    $r->print(<<END);
 <table cellspacing="10" cellpadding="2">
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email/">View All Messages</a></b>
+  <b><a href="/adm/email/">$lt{'vam'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?critical=display">View Critical Messages</a></b>
+  <b><a href="/adm/email?critical=display">$lt{'vcm'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=individual">Send message to user(s)</a></b>
+  <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
 </td></tr>
 END
     if (($ENV{'request.course.id'}) && 
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
         $r->print(<<END);
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=group">Broadcast message to course</a></b>
+  <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=upload">Distribute messages from uploaded file to course</a></b>
+  <b><a href="/adm/email?compose=upload">$lt{'dmu'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?recordftf=query">User notes, records of face-to-face discussions, and critical messages</a></b>
+  <b><a href="/adm/email?recordftf=query">$lt{'unr'}</a></b>
 </td></tr>
 
 END
@@ -109,14 +126,14 @@
     }
     if ($#newmsgs >= 0) {
         $r->print(<<TABLEHEAD);
-<h3>New Messages</h3>
+<h3>$lt{'nm'}</h3>
 <table border=2><tr><th>&nbsp</th>
-<th>Date</th><th>Username</th><th>Domain</th><th>Subject</th></tr>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
 TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
 <tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">Open</a></td>
+<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach ('sendtime','from','fromdom','shortsub') {
                 $r->print("<td>$msg->{$_}</td>");
@@ -125,7 +142,7 @@
         }
         $r->print('</table></body></html>');
     } else {
-        $r->print("<h3>You have no unread messages</h3>");
+        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
     }
     return OK;
 }
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.75 loncom/interface/lonindexer.pm:1.76
--- loncom/interface/lonindexer.pm:1.75	Thu Aug 21 17:57:36 2003
+++ loncom/interface/lonindexer.pm	Mon Sep 22 20:26:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.75 2003/08/21 21:57:36 albertel Exp $
+# $Id: lonindexer.pm,v 1.76 2003/09/23 00:26:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@
 sub handler {
     my $r = shift;
     my $c = $r->connection();
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
Index: loncom/interface/lonmanagekeys.pm
diff -u loncom/interface/lonmanagekeys.pm:1.12 loncom/interface/lonmanagekeys.pm:1.13
--- loncom/interface/lonmanagekeys.pm:1.12	Sun Sep 21 17:40:06 2003
+++ loncom/interface/lonmanagekeys.pm	Mon Sep 22 20:26:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.12 2003/09/21 21:40:06 www Exp $
+# $Id: lonmanagekeys.pm,v 1.13 2003/09/23 00:26:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -257,16 +257,16 @@
 	}
     } else {
 	# Start page no course id
-	$r->content_type('text/html');
+	&Apache::loncommon::content_type($r,'text/html');
 	$r->send_http_header;
 	$r->print(&header().&Apache::loncommon::coursebrowser_javascript());
         $r->print(
-   'Course ID: <input input type="text" size="25" name="course" value="" />');
-        $r->print('Domain: '.&Apache::loncommon::select_dom_form(
+   &mt('Course ID').': <input input type="text" size="25" name="course" value="" />');
+        $r->print(&mt('Domain').': '.&Apache::loncommon::select_dom_form(
                $ENV{'request.role.domain'},'domain'));
         $r->print(&Apache::loncommon::selectcourse_link(
 					        'keyform','course','domain'));
-        $r->print('<br /><input type="submit" value="Manage Access Keys" />');
+        $r->print('<br /><input type="submit" value="'.&mt('Manage Access Keys').'" />');
 	$r->print('</form></body></html>');
     }
     return OK;
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.20 loncom/localize/localize/de.pm:1.21
--- loncom/localize/localize/de.pm:1.20	Mon Sep 22 18:53:21 2003
+++ loncom/localize/localize/de.pm	Mon Sep 22 20:26:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.20 2003/09/22 22:53:21 www Exp $
+# $Id: de.pm,v 1.21 2003/09/23 00:26:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -505,6 +505,9 @@
    'Go To My First Homework Problem'
 => 'Springe zum ersten Hausübungsproblem',
 
+   'Cancel'
+=> 'Abbrechen',
+
    'Discussions'
 => 'Diskussion',
 
@@ -663,6 +666,33 @@
 
    'is not analyzable at this time'
 => 'ist derzeit nicht analysierbar',
+
+   'Title'
+=> 'Titel',
+
+   'Path'
+=> 'Pfad',
+
+   'New Search'
+=> 'Neue Suche',
+
+   'Go Back'
+=> 'Zurück',
+
+   'File'
+=> 'Datei',
+
+   'Date'
+=> 'Datum',
+
+   'You have no unread messages'
+=> 'Sie haben keine ungelesenen Nachrichten',
+
+   'New Messages'
+=> 'Neue Nachrichten',
+
+   'View All Messages'
+=> 'Alle Nachrichten',
 
 );
 

--www1064276770--