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

revert revision 12034 on VLocationDialog - found a better solution on MCountry - Fix [2856097] The "Enter new Location/Address" countries are not translate 

Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2856097
This commit is contained in:
Carlos Ruiz 2010-04-19 22:20:51 +00:00
parent 00005787b9
commit 1d539373ab
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MCountry.java
View File

@ -219,7 +219,7 @@ public final class MCountry extends X_C_Country
*/ */
public String getTrlName() public String getTrlName()
{ {
if (m_trlName != null && s_AD_Language != null) if (m_trlName == null && s_AD_Language != null)
{ {
m_trlName = get_Translation(COLUMNNAME_Name, s_AD_Language); m_trlName = get_Translation(COLUMNNAME_Name, s_AD_Language);
if (m_trlName == null) if (m_trlName == null)

15
client/src/org/compiere/grid/ed/VLocationDialog.java
View File

@ -17,7 +17,6 @@
package org.compiere.grid.ed; package org.compiere.grid.ed;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Frame; import java.awt.Frame;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@ -33,9 +32,7 @@ import java.util.logging.Level;
import javax.swing.Box; import javax.swing.Box;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.ListCellRenderer;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import org.compiere.apps.ADialog; import org.compiere.apps.ADialog;
@ -83,8 +80,6 @@ public class VLocationDialog extends CDialog
private int m_WindowNo = 0; private int m_WindowNo = 0;
private JLabel m_label = new JLabel();
/** /**
* Constructor * Constructor
* *
@ -120,16 +115,6 @@ public class VLocationDialog extends CDialog
// Current Country // Current Country
MCountry.setDisplayLanguage(Env.getAD_Language(Env.getCtx())); MCountry.setDisplayLanguage(Env.getAD_Language(Env.getCtx()));
fCountry = new CComboBox(MCountry.getCountries(Env.getCtx())); fCountry = new CComboBox(MCountry.getCountries(Env.getCtx()));
ListCellRenderer renderer = new ListCellRenderer()
{
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus)
{
String text = ((MCountry)value).get_Translation(MCountry.COLUMNNAME_Name, Env.getAD_Language(Env.getCtx()));
m_label.setText(text);
return m_label;
}
};
fCountry.setRenderer(renderer);
fCountry.setSelectedItem(m_location.getCountry()); fCountry.setSelectedItem(m_location.getCountry());
m_origCountry_ID = m_location.getC_Country_ID(); m_origCountry_ID = m_location.getC_Country_ID();
// Current Region // Current Region