diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java index f6041eca7f..0649f5fae3 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java @@ -26,6 +26,8 @@ import java.util.logging.Level; import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.event.ToolbarListener; import org.compiere.util.CLogger; +import org.compiere.util.Env; +import org.compiere.util.Msg; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -78,111 +80,126 @@ public class CWindowToolbar extends FToolbar implements EventListener btnIgnore = new ToolBarButton(); btnIgnore.setName("btnIgnore"); btnIgnore.setImage("/images/Ignore16.gif"); - btnIgnore.setTooltiptext("Ignore Changes"); + btnIgnore.setTooltiptext(Msg.getMsg(Env.getCtx(),"Ignore")); // -- btnHelp = new ToolBarButton(""); btnHelp.setName("btnHelp"); btnHelp.setImage("/images/Help24.gif"); - btnHelp.setTooltiptext("Help"); + btnHelp.setTooltiptext(Msg.getMsg(Env.getCtx(),"Help")); btnNew = new ToolBarButton(""); btnNew.setName("btnNew"); btnNew.setImage("/images/New24.gif"); - btnNew.setTooltiptext("New Record"); + btnNew.setTooltiptext(Msg.getMsg(Env.getCtx(),"New")); btnDelete = new ToolBarButton(""); btnDelete.setName("btnDelete"); btnDelete.setImage("/images/Delete24.gif"); - btnDelete.setTooltiptext("Delete current record"); + btnDelete.setTooltiptext(Msg.getMsg(Env.getCtx(),"Delete")); btnSave = new ToolBarButton(""); btnSave.setName("btnSave"); btnSave.setImage("/images/Save24.gif"); - btnSave.setTooltiptext("Save changes"); + btnSave.setTooltiptext(Msg.getMsg(Env.getCtx(),"Save")); // -- btnRefresh = new ToolBarButton(""); btnRefresh.setName("btnRefresh"); btnRefresh.setImage("/images/Refresh24.gif"); - btnRefresh.setTooltiptext("Refresh Data"); + btnRefresh.setTooltiptext(Msg.getMsg(Env.getCtx(),"Refresh")); btnFind = new ToolBarButton(""); btnFind.setName("btnFind"); btnFind.setImage("/images/Find24.gif"); - btnFind.setTooltiptext("Find Records"); + btnFind.setTooltiptext(Msg.getMsg(Env.getCtx(),"Find")); btnAttachment = new ToolBarButton(""); btnAttachment.setName("btnAttachment"); btnAttachment.setImage("/images/Attachment24.gif"); - btnAttachment.setTooltiptext("Attachments"); + btnAttachment.setTooltiptext(Msg.getMsg(Env.getCtx(),"Attachment")); // -- btnGridToggle = new ToolBarButton(""); btnGridToggle.setName("btnGridToggle"); btnGridToggle.setImage("/images/ZoomAcross24.gif"); - btnGridToggle.setTooltiptext("Grid Toggle"); + btnGridToggle.setTooltiptext(Msg.getMsg(Env.getCtx(),"Multi")); btnHistoryRecords = new ToolBarButton(""); btnHistoryRecords.setName("btnHistoryRecords"); btnHistoryRecords.setImage("/images/HistoryX24.gif"); - btnHistoryRecords.setTooltiptext("History Records"); + btnHistoryRecords.setTooltiptext(Msg.getMsg(Env.getCtx(),"History")); btnMenu = new ToolBarButton(""); btnMenu.setName("btnHome"); btnMenu.setImage("/images/Home24.gif"); - btnMenu.setTooltiptext("Home"); + btnMenu.setTooltiptext(Msg.getMsg(Env.getCtx(),"Home")); btnParentRecord = new ToolBarButton(""); btnParentRecord.setName("btnParentRecord"); btnParentRecord.setImage("/images/Parent24.gif"); + btnParentRecord.setTooltip(Msg.getMsg(Env.getCtx(),"Parent")); btnDetailRecord = new ToolBarButton(""); btnDetailRecord.setName("btnDetailRecord"); btnDetailRecord.setImage("/images/Detail24.gif"); + btnDetailRecord.setTooltip(Msg.getMsg(Env.getCtx(),"Detail")); // -- btnFirst = new ToolBarButton(""); btnFirst.setName("btnFirst"); btnFirst.setImage("/images/First24.gif"); - + btnFirst.setTooltip(Msg.getMsg(Env.getCtx(),"First")); + btnPrevious = new ToolBarButton(""); btnPrevious.setName("btnPrevious"); btnPrevious.setImage("/images/Previous24.gif"); - + btnPrevious.setTooltip(Msg.getMsg(Env.getCtx(),"Previous")); + btnNext = new ToolBarButton(""); btnNext.setName("btnNext"); btnNext.setImage("/images/Next24.gif"); - + btnNext.setTooltip(Msg.getMsg(Env.getCtx(),"Next")); + btnLast = new ToolBarButton(""); btnLast.setName("btnLast"); btnLast.setImage("/images/Last24.gif"); + btnLast.setTooltip(Msg.getMsg(Env.getCtx(),"Last")); + // -- btnReport = new ToolBarButton(""); btnReport.setName("btnReport"); btnReport.setImage("/images/Report24.gif"); - + btnReport.setTooltip(Msg.getMsg(Env.getCtx(),"Report")); + btnArchive = new ToolBarButton(""); btnArchive.setName("btnArchive"); btnArchive.setImage("/images/Archive24.gif"); - + btnArchive.setTooltip(Msg.getMsg(Env.getCtx(),"Archive")); + btnPrint = new ToolBarButton(""); btnPrint.setName("btnPrint"); btnPrint.setImage("/images/Print24.gif"); + btnPrint.setTooltip(Msg.getMsg(Env.getCtx(),"Print")); + // -- btnZoomAcross = new ToolBarButton(""); btnZoomAcross.setName("btnZoomAcross"); btnZoomAcross.setImage("/images/ZoomAcross24.gif"); - + btnZoomAcross.setTooltip(Msg.getMsg(Env.getCtx(),"ZoomAcross")); + btnActiveWorkflows = new ToolBarButton(""); btnActiveWorkflows.setName("btnActiveWorkflows"); btnActiveWorkflows.setImage("/images/WorkFlow24.gif"); - + btnActiveWorkflows.setTooltip(Msg.getMsg(Env.getCtx(),"WorkFlow")); + btnRequests = new ToolBarButton(""); btnRequests.setName("btnRequests"); btnRequests.setImage("/images/Request24.gif"); - + btnRequests.setTooltip(Msg.getMsg(Env.getCtx(),"Request")); + btnProductInfo = new ToolBarButton(""); btnProductInfo.setName("btnProductInfo"); btnProductInfo.setImage("/images/Product24.gif"); - + btnProductInfo.setTooltip(Msg.getMsg(Env.getCtx(),"InfoProduct")); + // btnExit = new ToolBarButton(""); // btnExit.setName("btnExit"); // btnExit.setImage("/images/End24.gif"); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java index 3365950bef..a0db89c67f 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java @@ -22,6 +22,8 @@ import java.util.TreeMap; import org.adempiere.webui.component.AutoComplete; import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Panel; +import org.compiere.util.Env; +import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; @@ -58,7 +60,7 @@ public class MenuSearchPanel extends Panel implements EventListener private void init() { lblSearch = new Label(); - lblSearch.setValue("Search:"); + lblSearch.setValue(Msg.getMsg(Env.getCtx(),"Lookup") + ":"); cmbSearch = new AutoComplete(); cmbSearch.setAutodrop(true); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java index 9145c10c29..3fa4331f29 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java @@ -23,8 +23,10 @@ import org.adempiere.webui.component.WConfirmPanel; import org.adempiere.webui.component.Window; import org.adempiere.webui.exception.ApplicationException; import org.adempiere.webui.window.LoginWindow; +import org.compiere.util.Env; import org.compiere.util.KeyNamePair; import org.compiere.util.Login; +import org.compiere.util.Msg; import org.zkoss.zk.au.out.AuFocus; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -141,19 +143,19 @@ public class RolePanel extends Window implements EventListener lblRole = new Label(); lblRole.setId("lblRole"); - lblRole.setValue("Role: "); + lblRole.setValue(Msg.getMsg(Env.getCtx(),"Role")+ ":"); lblClient = new Label(); lblClient.setId("lblClient"); - lblClient.setValue("Client: "); + lblClient.setValue(Msg.getMsg(Env.getCtx(),"Client")+ ":"); lblOrganisation = new Label(); lblOrganisation.setId("lblOrganisation"); - lblOrganisation.setValue("Organisation: "); + lblOrganisation.setValue(Msg.getMsg(Env.getCtx(),"Organization")+ " :"); lblWarehouse = new Label(); lblWarehouse.setId("lblWarehouse"); - lblWarehouse.setValue("Warehouse: "); + lblWarehouse.setValue(Msg.getMsg(Env.getCtx(),"Warehouse")+ " :"); lstRole = new Listbox(); lstRole.setId("lstRole"); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java index 78fda30b82..152c28eab0 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java @@ -29,6 +29,7 @@ import org.compiere.model.MOrg; import org.compiere.model.MRole; import org.compiere.model.MUser; import org.compiere.util.Env; +import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; @@ -81,7 +82,7 @@ public class UserPanel extends Vbox implements EventListener sep.setBar(true); sep.setParent(hbox); - logout.setLabel("Logout"); + logout.setLabel(Msg.getMsg(Env.getCtx(),"Logout")); logout.addEventListener(Events.ON_CLICK, this); logout.setStyle("text-align:right"); logout.setSclass("headerFont");