diff --git a/migration/360lts-release/oracle/765_FixZkMessage.sql b/migration/360lts-release/oracle/765_FixZkMessage.sql new file mode 100644 index 0000000000..27a636c0a3 --- /dev/null +++ b/migration/360lts-release/oracle/765_FixZkMessage.sql @@ -0,0 +1,85 @@ +-- Dec 16, 2010 1:51:49 PM COT +-- Msg.getMsg: NOT found: Please save changes before closing +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53126,0,TO_DATE('2010-12-16 13:51:48','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Please save changes before closing','I',TO_DATE('2010-12-16 13:51:48','YYYY-MM-DD HH24:MI:SS'),100,'SaveBeforeClose') +; + +-- Dec 16, 2010 1:51:49 PM COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53126 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Dec 16, 2010 1:52:09 PM COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Por favor guarde los cambios antes de cerrar la ventana',Updated=TO_DATE('2010-12-16 13:52:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53126 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:08:27 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53127,0,TO_DATE('2010-12-16 14:08:26','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Credit','I',TO_DATE('2010-12-16 14:08:26','YYYY-MM-DD HH24:MI:SS'),100,'Credits') +; + +-- 16-dic-2010 14:08:27 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53127 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:08:34 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Créditos',Updated=TO_DATE('2010-12-16 14:08:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53127 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:33:48 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,53128,0,TO_DATE('2010-12-16 14:33:47','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Date/Time',' ','I',TO_DATE('2010-12-16 14:33:47','YYYY-MM-DD HH24:MI:SS'),100,'DateTime') +; + +-- 16-dic-2010 14:33:48 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53128 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:33:56 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Fecha/Hora',Updated=TO_DATE('2010-12-16 14:33:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:00 COT +UPDATE AD_Message SET MsgTip=NULL,Updated=TO_DATE('2010-12-16 14:34:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 +; + +-- 16-dic-2010 14:34:00 COT +UPDATE AD_Message_Trl SET IsTranslated='N' WHERE AD_Message_ID=53128 +; + +-- 16-dic-2010 14:34:11 COT +UPDATE AD_Message_Trl SET MsgTip=NULL,Updated=TO_DATE('2010-12-16 14:34:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:30 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53129,0,TO_DATE('2010-12-16 14:34:29','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Class.Method','I',TO_DATE('2010-12-16 14:34:29','YYYY-MM-DD HH24:MI:SS'),100,'Class.Method') +; + +-- 16-dic-2010 14:34:30 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53129 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:34:40 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Clase.Método',Updated=TO_DATE('2010-12-16 14:34:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53129 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:56 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53130,0,TO_DATE('2010-12-16 14:34:55','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Message','I',TO_DATE('2010-12-16 14:34:55','YYYY-MM-DD HH24:MI:SS'),100,'Message') +; + +-- 16-dic-2010 14:34:56 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:35:01 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Mensaje',Updated=TO_DATE('2010-12-16 14:35:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53130 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:35:30 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53131,0,TO_DATE('2010-12-16 14:35:30','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Trace','I',TO_DATE('2010-12-16 14:35:30','YYYY-MM-DD HH24:MI:SS'),100,'Trace') +; + +-- 16-dic-2010 14:35:30 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53131 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:35:35 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Seguimiento',Updated=TO_DATE('2010-12-16 14:35:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53131 AND AD_Language LIKE 'es_%' +; + diff --git a/migration/360lts-release/postgresql/765_FixZkMessage.sql b/migration/360lts-release/postgresql/765_FixZkMessage.sql new file mode 100644 index 0000000000..8861de7752 --- /dev/null +++ b/migration/360lts-release/postgresql/765_FixZkMessage.sql @@ -0,0 +1,87 @@ +SET CLIENT_ENCODING TO 'UTF8'; + +-- Dec 16, 2010 1:51:49 PM COT +-- Msg.getMsg: NOT found: Please save changes before closing +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53126,0,TO_TIMESTAMP('2010-12-16 13:51:48','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Please save changes before closing','I',TO_TIMESTAMP('2010-12-16 13:51:48','YYYY-MM-DD HH24:MI:SS'),100,'SaveBeforeClose') +; + +-- Dec 16, 2010 1:51:49 PM COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53126 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Dec 16, 2010 1:52:09 PM COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Por favor guarde los cambios antes de cerrar la ventana',Updated=TO_TIMESTAMP('2010-12-16 13:52:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53126 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:08:27 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53127,0,TO_TIMESTAMP('2010-12-16 14:08:26','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Credit','I',TO_TIMESTAMP('2010-12-16 14:08:26','YYYY-MM-DD HH24:MI:SS'),100,'Credits') +; + +-- 16-dic-2010 14:08:27 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53127 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:08:34 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Créditos',Updated=TO_TIMESTAMP('2010-12-16 14:08:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53127 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:33:48 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,53128,0,TO_TIMESTAMP('2010-12-16 14:33:47','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Date/Time',' ','I',TO_TIMESTAMP('2010-12-16 14:33:47','YYYY-MM-DD HH24:MI:SS'),100,'DateTime') +; + +-- 16-dic-2010 14:33:48 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53128 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:33:56 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Fecha/Hora',Updated=TO_TIMESTAMP('2010-12-16 14:33:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:00 COT +UPDATE AD_Message SET MsgTip=NULL,Updated=TO_TIMESTAMP('2010-12-16 14:34:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 +; + +-- 16-dic-2010 14:34:00 COT +UPDATE AD_Message_Trl SET IsTranslated='N' WHERE AD_Message_ID=53128 +; + +-- 16-dic-2010 14:34:11 COT +UPDATE AD_Message_Trl SET MsgTip=NULL,Updated=TO_TIMESTAMP('2010-12-16 14:34:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53128 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:30 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53129,0,TO_TIMESTAMP('2010-12-16 14:34:29','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Class.Method','I',TO_TIMESTAMP('2010-12-16 14:34:29','YYYY-MM-DD HH24:MI:SS'),100,'Class.Method') +; + +-- 16-dic-2010 14:34:30 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53129 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:34:40 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Clase.Método',Updated=TO_TIMESTAMP('2010-12-16 14:34:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53129 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:34:56 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53130,0,TO_TIMESTAMP('2010-12-16 14:34:55','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Message','I',TO_TIMESTAMP('2010-12-16 14:34:55','YYYY-MM-DD HH24:MI:SS'),100,'Message') +; + +-- 16-dic-2010 14:34:56 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:35:01 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Mensaje',Updated=TO_TIMESTAMP('2010-12-16 14:35:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53130 AND AD_Language LIKE 'es_%' +; + +-- 16-dic-2010 14:35:30 COT +INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53131,0,TO_TIMESTAMP('2010-12-16 14:35:30','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Trace','I',TO_TIMESTAMP('2010-12-16 14:35:30','YYYY-MM-DD HH24:MI:SS'),100,'Trace') +; + +-- 16-dic-2010 14:35:30 COT +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53131 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- 16-dic-2010 14:35:35 COT +UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Seguimiento',Updated=TO_TIMESTAMP('2010-12-16 14:35:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=53131 AND AD_Language LIKE 'es_%' +; + diff --git a/org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java b/org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java index be128dce28..e3864866d1 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java +++ b/org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java @@ -250,14 +250,14 @@ public class CLogErrorBuffer extends Handler public Vector getColumnNames(Properties ctx) { Vector cn = new Vector(); - cn.add("Time"); - cn.add("Level"); + cn.add(Msg.getMsg(ctx, "DateTime")); + cn.add(Msg.getMsg(ctx, "Level")); // - cn.add("Class.Method"); - cn.add("Message"); + cn.add(Msg.getMsg(ctx, "Class.Method")); + cn.add(Msg.getMsg(ctx, "Message")); //2 - cn.add("Parameter"); - cn.add("Trace"); + cn.add(Msg.getMsg(ctx, "Parameter")); + cn.add(Msg.getMsg(ctx, "Trace")); // return cn; } // getColumnNames diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java index 27a294fe76..ef0c297522 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java @@ -24,7 +24,6 @@ import java.util.Properties; import java.util.logging.Level; import org.adempiere.util.ServerContext; -import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.BusyDialog; import org.adempiere.webui.apps.ProcessDialog; import org.adempiere.webui.apps.graph.WGraph; @@ -52,6 +51,7 @@ import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.Msg; +import org.compiere.util.Util; import org.zkoss.zk.au.out.AuScript; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; @@ -139,7 +139,7 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria w.setWidth("300px"); w.setCollapsible(true); w.setSplittable(true); - w.setTitle("Menu"); + w.setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Menu"))); w.setFlex(true); w.addEventListener(Events.ON_OPEN, new EventListener() { @Override @@ -199,7 +199,7 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria windowContainer.createPart(windowArea); homeTab = new Tabpanel(); - windowContainer.addWindow(homeTab, Msg.getMsg(Env.getCtx(), "Home").replaceAll("&", ""), false); + windowContainer.addWindow(homeTab, Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Home")), false); BusyDialog busyDialog = new BusyDialog(); busyDialog.setShadow(false); homeTab.appendChild(busyDialog); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java index 828b6a86ea..5362150322 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java @@ -912,7 +912,7 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To */ public boolean onExit() { - String message = "Please save changes before closing"; + String message = Msg.getMsg(ctx, "SaveBeforeClose"); if (!boolChanges) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java index e514004871..62dc8b2100 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java @@ -153,7 +153,7 @@ public class UserPanel extends Vbox implements EventListener { String roleInfo = MRole.getDefault().toStringX(Env.getCtx()); roleInfo = roleInfo.replace(Env.NL, "
"); - Messagebox.showDialog(roleInfo, "Role Info", Messagebox.OK, Messagebox.INFORMATION); + Messagebox.showDialog(roleInfo, Msg.getMsg(ctx, "RoleInfo"), Messagebox.OK, Messagebox.INFORMATION); } else if (preference == event.getTarget()) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java index fccc34e8e4..6ed0fb0ffe 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java @@ -81,7 +81,8 @@ public class AboutWindow extends Window implements EventListener { private Button btnDownload; private Button btnErrorEmail; private Button btnViewLog; - + private Tab tabLog; + private Button btnAdempiereLog; private Button btnServerLog; @@ -121,28 +122,29 @@ public class AboutWindow extends Window implements EventListener { //about Tab tab = new Tab(); - tab.setLabel("About"); + tab.setLabel(Msg.getMsg(Env.getCtx(), "About")); tab.setParent(tabs); Tabpanel tabPanel = createAbout(); tabPanel.setParent(tabPanels); //Credit tab = new Tab(); - tab.setLabel("Credit"); + tab.setLabel(Msg.getMsg(Env.getCtx(), "Credits")); tab.setParent(tabs); tabPanel = createCredit(); tabPanel.setParent(tabPanels); //Info tab = new Tab(); - tab.setLabel("Info"); + tab.setLabel(Msg.getMsg(Env.getCtx(), "Info")); tab.setParent(tabs); tabPanel = createInfo(); tabPanel.setParent(tabPanels); //Trace tab = new Tab(); - tab.setLabel("Logs"); + tab.setLabel("Errors"); + tabLog = tab; tab.setParent(tabs); tabPanel = createTrace(); tabPanel.setParent(tabPanels); @@ -272,6 +274,10 @@ public class AboutWindow extends Window implements EventListener { model.setMaxLength(new int[]{0, 0, 0, 200, 0, 200}); logTable.setItemRenderer(model); logTable.setModel(model); + if (bErrorsOnly.isSelected()) + tabLog.setLabel(Msg.getMsg(Env.getCtx(), "Errors") + " (" + data.size() + ")"); + else + tabLog.setLabel(Msg.getMsg(Env.getCtx(), "TraceInfo") + " (" + data.size() + ")"); } private Tabpanel createInfo() {