From db8a3d5b90e2c9fe089985cebd1276d344948cca Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 6 Oct 2016 14:04:02 +0000 Subject: [PATCH] Susimail: Add console translate method so strings don't get tagged in susimail bundle --- .../src/src/i2p/susi/webmail/WebMail.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index d7ac88ca8..edf94936f 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -1657,12 +1657,12 @@ public class WebMail extends HttpServlet if (nonce == null || !sessionObject.isValidNonce(nonce)) { // These two strings are already in the router console FormHandler, // so translate with that bundle. - sessionObject.error = Translate.getString( + sessionObject.error = consoleGetString( "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.", - ctx, CONSOLE_BUNDLE_NAME) + ctx) + '\n' + - Translate.getString("If the problem persists, verify that you have cookies enabled in your browser.", - ctx, CONSOLE_BUNDLE_NAME); + consoleGetString("If the problem persists, verify that you have cookies enabled in your browser.", + ctx); isPOST = false; } } @@ -1834,6 +1834,14 @@ public class WebMail extends HttpServlet } } + /** + * Translate with the console bundle. + * @since 0.9.27 + */ + private static String consoleGetString(String s, I2PAppContext ctx) { + return Translate.getString(s, ctx, CONSOLE_BUNDLE_NAME); + } + /** * @param sessionObject * @param response