[LON-CAPA-cvs] cvs: loncom(version_2_6_X) /interface lonprintout.pm

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Mon, 24 Mar 2008 00:03:11 -0000


raeburn		Sun Mar 23 20:03:11 2008 EDT

  Modified files:              (Branch: version_2_6_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - backport 1.522
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.519.2.1 loncom/interface/lonprintout.pm:1.519.2.2
--- loncom/interface/lonprintout.pm:1.519.2.1	Sun Mar 23 19:48:45 2008
+++ loncom/interface/lonprintout.pm	Sun Mar 23 20:03:05 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.519.2.1 2008/03/23 23:48:45 raeburn Exp $
+# $Id: lonprintout.pm,v 1.519.2.2 2008/03/24 00:03:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2090,27 +2090,25 @@
     #
 
     if ($ssi_error) {
-	my $end_page = &Apache::loncommon::end_page();
-	$r->print(<<ERROR_END);
+
+        my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+        my $end_page = &Apache::loncommon::end_page();
+        $r->print('
 <br />
-<h2>An unrecoverable error occured:</h2>
+<h2>'.&mt('An unrecoverable error occured:').'</h2>
 <p>
-  I was not able to render one of the print resources ($ssi_last_error_resource) 
-due to an unrecoverable error communicating with a server:
-<br />
-$ssi_last_error;
+  '.&mt('One of the resources ([_1]) you chose to print could not be rendered due to an unrecoverable error when communicating with a server:',$ssi_last_error_resource).'
 <br />
+'.$ssi_last_error.'
 </p>
-<p>
-I recommend that you try printing again later as this may mean the server was just 
-temporarily unavailable, or is down for maintenance.  If this error persists, then
-please contact your LonCAPA support folks for assistance and diagnosis. 
-<br />
-<br />
-We apologize for the inconvenience.
-</p>
-$end_page
-ERROR_END
+<p>'.
+&mt('It is recommended that you try printing again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'<br />'.
+&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
+'</p><p>'.
+&mt('We apologize for the inconvenience.').
+'</p>'.
+$end_page);
+
     } else {
 
 #-- writing .tex file in prtspool