X-Git-Url: http://jaekl.net/gitweb/?p=frank.git;a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Ffrank%2FErrorHandler.java;fp=prod%2Fnet%2Fjaekl%2Ffrank%2FErrorHandler.java;h=4b253ebd7a42c5b1da8e5e7a82405385c08bfcb1;hp=428925a8b5f5616101c9febfcb75ccac42f3229e;hb=a7583be0d5ac4a95b66293a897a79f53830d222c;hpb=bf5272f3fc7e8f893f16198290230bc297772bea diff --git a/prod/net/jaekl/frank/ErrorHandler.java b/prod/net/jaekl/frank/ErrorHandler.java index 428925a..4b253eb 100644 --- a/prod/net/jaekl/frank/ErrorHandler.java +++ b/prod/net/jaekl/frank/ErrorHandler.java @@ -4,29 +4,40 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.PrintWriter; import java.net.SocketTimeoutException; +import java.text.MessageFormat; import java.util.Locale; import net.jaekl.qd.http.InvalidResponseException; public class ErrorHandler { - static final String JAVASCRIPT = + static final String JAVASCRIPT_PART1 = ""; - void writeScript(PrintWriter pw) { - pw.println(JAVASCRIPT); + void writeScript(PrintWriter pw, FrankBundle bundle) { + String javaScript = JAVASCRIPT_PART1 + + bundle.get(FrankBundle.SHOW_DETAILS) + + JAVASCRIPT_PART2 + + bundle.get(FrankBundle.HIDE_DETAILS) + + JAVASCRIPT_PART3; + + pw.println(javaScript); } void explain(PrintWriter pw, Throwable t, FrankBundle bundle) { @@ -75,7 +86,7 @@ public class ErrorHandler { bundle.get(FrankBundle.ERROR_PAGE) + ""); style.writeStyle(pw); - writeScript(pw); + writeScript(pw, bundle); pw.println(""); pw.println(""); @@ -94,7 +105,9 @@ public class ErrorHandler { // potential information leak in favour of reducing our code complexity // and the administrator's workload. - pw.println("

"); + pw.println("

"); pw.println("

"); pw.println("

");
 		
@@ -103,7 +116,10 @@ public class ErrorHandler {
 		pw.println(stackTrace);
 				
 		pw.println("
\n

\n
"); - pw.println("

Click here to return to the main page.

"); + + String returnToMainFormat = bundle.get(FrankBundle.RETURN_TO_MAIN_PAGE); + String returnToMain = MessageFormat.format(returnToMainFormat, "/"); + pw.println("

" + returnToMain + "

"); pw.println(""); } }