midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1628 Route and Map button are not always correctly translated

This commit is contained in:
Nicolas Micoud 2013-12-13 13:01:17 -05:00
parent 853d0727a5
commit 1d1b72c2f1
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
View File

@ -209,11 +209,6 @@ public class VLocationDialog extends CDialog
private boolean inCountryAction; private boolean inCountryAction;
private boolean inOKAction; private boolean inOKAction;
/** The "route" key */
private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
/** The "to link" key */
private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
private JButton toLink = new JButton(); private JButton toLink = new JButton();
private JButton toRoute = new JButton(); private JButton toRoute = new JButton();
//END //END
@ -235,14 +230,14 @@ public class VLocationDialog extends CDialog
southPanel.add(confirmPanel, BorderLayout.NORTH); southPanel.add(confirmPanel, BorderLayout.NORTH);
//BEGIN fernandinho/ricardo //BEGIN fernandinho/ricardo
toLink.setText(TO_LINK); toLink.setText(Msg.getMsg(Env.getCtx(), "Map"));
toLink.addActionListener(this); toLink.addActionListener(this);
toLink.setMargin(ConfirmPanel.s_insets); toLink.setMargin(ConfirmPanel.s_insets);
confirmPanel.addComponent(toLink); confirmPanel.addComponent(toLink);
if (MLocation.LOCATION_MAPS_URL_PREFIX == null) if (MLocation.LOCATION_MAPS_URL_PREFIX == null)
toLink.setVisible(false); toLink.setVisible(false);
toRoute.setText(TO_ROUTE); toRoute.setText(Msg.getMsg(Env.getCtx(), "Route"));
toRoute.addActionListener(this); toRoute.addActionListener(this);
toRoute.setMargin(ConfirmPanel.s_insets); toRoute.setMargin(ConfirmPanel.s_insets);
confirmPanel.addComponent(toRoute); confirmPanel.addComponent(toRoute);

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
View File

@ -130,11 +130,6 @@ public class WLocationDialog extends Window implements EventListener<Event>
private boolean inCountryAction; private boolean inCountryAction;
private boolean inOKAction; private boolean inOKAction;
/** The "route" key */
private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
/** The "to link" key */
private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
private Button toLink; private Button toLink;
private Button toRoute; private Button toRoute;
private GridField m_GridField = null; private GridField m_GridField = null;
@ -263,10 +258,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
confirmPanel = new ConfirmPanel(true); confirmPanel = new ConfirmPanel(true);
confirmPanel.addActionListener(this); confirmPanel.addActionListener(this);
toLink = new Button(TO_LINK); toLink = new Button(Msg.getMsg(Env.getCtx(), "Map"));
LayoutUtils.addSclass("txt-btn", toLink); LayoutUtils.addSclass("txt-btn", toLink);
toLink.addEventListener(Events.ON_CLICK,this); toLink.addEventListener(Events.ON_CLICK,this);
toRoute = new Button(TO_ROUTE); toRoute = new Button(Msg.getMsg(Env.getCtx(), "Route"));
LayoutUtils.addSclass("txt-btn", toRoute); LayoutUtils.addSclass("txt-btn", toRoute);
toRoute.addEventListener(Events.ON_CLICK,this); toRoute.addEventListener(Events.ON_CLICK,this);