From 8f1996c2ea9a81227618373eb548ebfdbea9ba72 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 22 Apr 2015 10:49:22 -0500
Subject: [PATCH] IDEMPIERE-2585 Sessiontimeout button text is not translated
 users language / integrate patch from Flemming Birch (sjeffen)

---
 .../src/org/adempiere/webui/panel/LoginPanel.java     |  6 ++++--
 org.adempiere.ui.zk/sessiontimeout.zul                | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
index 01da1dedd1..32ab2d0bf8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
@@ -621,12 +621,14 @@ public class LoginPanel extends Window implements EventListener<Event>
     }
 
 	private String getUpdateTimeoutTextScript() {
-		String msg = Msg.getMsg(Env.getCtx(), "SessionTimeoutText");
+		String msg = Msg.getMsg(Env.getCtx(), "SessionTimeoutText").trim();  //IDEMPIERE-847
+		String continueNsg = Msg.getMsg(Env.getCtx(), "continue").trim();   //IDEMPIERE-847
 		if (msg == null || msg.equals("SessionTimeoutText")) {
 			return null;
 		}
 		msg = Strings.escape(msg, "\"");
-		String s = "adempiere.store.set(\"zkTimeoutText\", \"" + msg + "\")";
+		String s = "adempiere.store.set(\"zkTimeoutText\", \"" + msg + "\");";//IDEMPIERE-847
+		s = s + " adempiere.store.set(\"zkContinueText\", \"" + continueNsg + "\");"; //IDEMPIERE-847
 		return s;
 	}
 	
diff --git a/org.adempiere.ui.zk/sessiontimeout.zul b/org.adempiere.ui.zk/sessiontimeout.zul
index 77380fb579..8a5e1a5625 100644
--- a/org.adempiere.ui.zk/sessiontimeout.zul
+++ b/org.adempiere.ui.zk/sessiontimeout.zul
@@ -7,7 +7,6 @@
 	import org.compiere.util.Msg;
 	import org.compiere.util.Env;
 	import org.adempiere.webui.theme.ThemeManager;
-	var continueText = Msg.getMsg(Env.getCtx(),"continue");
 	self.setTitle(ThemeManager.getBrowserTitle());
 ]]>
 </zscript>
@@ -16,7 +15,7 @@
 
 <div id="timeoutText"></div>
 <div style="margin-top: 10px">
-	<toolbarbutton href="/index.zul" label="${continueText}"/>
+	<toolbarbutton id="continueText" href="/index.zul" label="Continue"/>
 </div>
 </vbox>
 <script defer="true">
@@ -27,8 +26,14 @@
 			document.getElementById("${timeoutText.uuid}").innerHTML = val;
 		}
 	};
-    
+	var callbackC = function(ok, val) {
+		if (ok && !!val)
+		{
+			document.getElementById("${continueText.uuid}").innerHTML = val;
+		}
+	};
     adempiere.store.get("zkTimeoutText", callback);
+	adempiere.store.get("zkContinueText", callbackC);
 ]]>	
 </script>
 </window>