--- loncom/html/res/adm/pages/annotator/admannotations.pm	2006/04/10 23:32:53	1.22
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	2006/04/11 15:52:33	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # This will take annotations and then plug them into a page.
 #
-# $Id: admannotations.pm,v 1.22 2006/04/10 23:32:53 albertel Exp $
+# $Id: admannotations.pm,v 1.25 2006/04/11 15:52:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,13 +33,14 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonnet;
+use Apache::lonlocal;
 
 # --------------------------------------------------------------Put annotation
 
 sub write_annotation {
     my ($urlold, $annotation) = @_;
     if ($annotation) { 
-       &Apache::lonnet::put('nohist_annotations',{$urlold => $annotation});
+	&Apache::lonnet::put('nohist_annotations',{$urlold => $annotation});
     }
     return;
 }
@@ -58,7 +59,7 @@ sub construct_editor {
     my ($annotation,$urlnew) = @_;
     if ($annotation=~/^error:/) { $annotation=''; }
 
-    my $js = << ENDJS;
+    my $js = <<ENDJS;
 <script type="text/javascript">
 var timeout;
 
@@ -82,6 +83,11 @@ ENDJS
 
     my $end_page =
         &Apache::loncommon::end_page();
+    
+    my %lt = ( 'close no save' => "Close (no save)",
+	       'save'          => "Save and Update",);
+    %lt = &Apache::lonlocal::texthash(%lt);
+	 
     return(<<END_HTML)
 $start_page
  <center>
@@ -89,9 +95,9 @@ $start_page
     <textarea name="annotation" wrap="on" rows="12" cols="36">$annotation</textarea><br />
     <input type="hidden" name="urlold" value="$urlnew" />
     <input type="hidden" name="urlnew" value="" />
-    <input type="button" name="send" value="Save and Update"
+    <input type="button" name="send" value="$lt{'save'}"
            onclick="javascript:this.form.urlnew.value=window.opener.clientwindow.location.href;this.form.submit();" />
-    <input type="button" name="close" value="Close (no save)" 
+    <input type="button" name="close" value="$lt{'close no save'}" 
            onclick="javascript:window.close();" />
   </form>
  </center>
@@ -107,6 +113,10 @@ sub construct_error {
 						    {'only_body'   => 1,});
     my $end_page =  &Apache::loncommon::end_page();
 
+    my %lt = ( 'close'  => "Close",
+	       'button' => $button_name,);
+    %lt = &Apache::lonlocal::texthash(%lt);
+
     return(<<END_HTML2)
 $start_page
  <center>
@@ -120,9 +130,9 @@ $annot_error
 </table>
     <input type="hidden" name="urlold" value="" />
     <input type="hidden" name="urlnew" value="" />
-    <input type="button" name="send" value="$button_name"
+    <input type="button" name="send" value="$lt{'button'}"
            onclick="javascript:this.form.urlnew.value=window.opener.clientwindow.location.href;this.form.submit();" />
-    <input type="button" name="close" value="Close" 
+    <input type="button" name="close" value="$lt{'close'}" 
            onclick="javascript:window.close();" />
   </form>
  </center>
@@ -133,9 +143,9 @@ END_HTML2
 # ---------------------------------------------------------------Main Handler
 
 sub handler {
-    my $r=shift;
-  
-    $r->content_type('text/html');
+    my ($r) = @_;
+
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -158,7 +168,7 @@ sub handler {
     }
     if (exists($env{'form.urlnew'})) {
 	unless ($urlnew) {
-	    $page=&construct_error("Cannot annotate current window. Please point your browser to a LON-CAPA page and then 'continue'.","continue");
+	    $page=&construct_error(&mt("Cannot annotate current window. Please point your browser to a LON-CAPA page and then 'continue'."),"continue");
 	} else {
 	    if ($urlold eq $urlnew) {
 		$annot_hash{$urlnew}=$annotation;