From 931bae1a4a0bf0a6186e6c6ce16d7ceb1d674bf1 Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Sun, 6 Jul 2008 22:37:04 +0000 Subject: [PATCH] [ 2011935 ] Implementing the Locate for MX,VE,EC,DO http://sourceforge.net/tracker/?func=detail&atid=879335&aid=2011935&group_id=176962 --- base/src/org/compiere/util/AmtInWords_ES.java | 33 ++++++++++++++----- looks/src/org/compiere/util/Language.java | 12 +++---- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/base/src/org/compiere/util/AmtInWords_ES.java b/base/src/org/compiere/util/AmtInWords_ES.java index 72a1a5f9ad..3b71f1517c 100644 --- a/base/src/org/compiere/util/AmtInWords_ES.java +++ b/base/src/org/compiere/util/AmtInWords_ES.java @@ -194,21 +194,38 @@ public class AmtInWords_ES implements AmtInWords { if (amount == null) return amount; + + Language lang = Env.getLoginLanguage(Env.getCtx()); // StringBuffer sb = new StringBuffer (); - // int pos = amount.lastIndexOf ('.'); // Old - int pos = amount.lastIndexOf (','); - // int pos2 = amount.lastIndexOf (','); // Old - int pos2 = amount.lastIndexOf ('.'); + int pos = 0; + + if(lang.isDecimalPoint()) + pos = amount.lastIndexOf ('.'); // Old + else + pos = amount.lastIndexOf (','); + + int pos2 = 0; + if(lang.isDecimalPoint()) + pos2 = amount.lastIndexOf (','); // Old + else + pos2 = amount.lastIndexOf ('.'); + if (pos2 > pos) pos = pos2; String oldamt = amount; - // amount = amount.replaceAll (",", ""); // Old - amount = amount.replaceAll( "\\.",""); + if(lang.isDecimalPoint()) + amount = amount.replaceAll (",", ""); // Old + else + amount = amount.replaceAll( "\\.",""); - // int newpos = amount.lastIndexOf ('.'); // Old - int newpos = amount.lastIndexOf (','); + int newpos = 0; + if(lang.isDecimalPoint()) + newpos = amount.lastIndexOf ('.'); // Old + else + newpos = amount.lastIndexOf (','); + int pesos = Integer.parseInt (amount.substring (0, newpos)); sb.append (convert (pesos)); for (int i = 0; i < oldamt.length (); i++) diff --git a/looks/src/org/compiere/util/Language.java b/looks/src/org/compiere/util/Language.java index 35bd39696c..5540d2ff52 100644 --- a/looks/src/org/compiere/util/Language.java +++ b/looks/src/org/compiere/util/Language.java @@ -49,8 +49,6 @@ public class Language implements Serializable private static final String AD_Language_it_IT = "it_IT"; private static final String AD_Language_es_ES = "es_ES"; private static final String AD_Language_es_MX = "es_MX"; - private static final String AD_Language_es_VE = "es_VE"; - private static final String AD_Language_es_EC = "es_EC"; private static final String AD_Language_es_DO = "es_DO"; private static final String AD_Language_fr_FR = "fr_FR"; private static final String AD_Language_bg_BG = "bg_BG"; @@ -110,16 +108,16 @@ public class Language implements Serializable AD_Language_es_ES, new Locale("es","ES"), new Boolean(false), "dd/MM/yyyy", MediaSize.ISO.A4), new Language ("Espa\u00f1ol (MX)", - AD_Language_es_MX, new Locale("es","MX"), new Boolean(false), "dd/MM/yyyy", - MediaSize.ISO.A4), + AD_Language_es_MX, new Locale("es","MX"), new Boolean(true), "dd/MM/yyyy", + MediaSize.NA.LETTER), new Language ("Espa\u00f1ol (VE)", - AD_Language_es_VE, new Locale("es","VE"), new Boolean(false), "dd/MM/yyyy", + AD_Language_es_ES, new Locale("es","ES"), new Boolean(false), "dd/MM/yyyy", MediaSize.ISO.A4), new Language ("Espa\u00f1ol (EC)", - AD_Language_es_EC, new Locale("es","EC"), new Boolean(false), "dd/MM/yyyy", + AD_Language_es_ES, new Locale("es","ES"), new Boolean(false), "dd/MM/yyyy", MediaSize.ISO.A4), new Language ("Espa\u00f1ol (DO)", - AD_Language_es_DO, new Locale("es","DO"), new Boolean(false), "dd/MM/yyyy", + AD_Language_es_DO, new Locale("es","DO"), new Boolean(true), "dd/MM/yyyy", MediaSize.ISO.A4), new Language ("Farsi", AD_Language_fa_IR, new Locale("fa","IR"), new Boolean(false), "dd-MM-yyyy",