From d5b8ad7d0e4454c656d6d0278a435b8dca59ad98 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 4 Sep 2009 02:05:01 +0000 Subject: [PATCH] FR [1786994] - 2Pack can handle translations now https://sourceforge.net/tracker/?func=detail&atid=883808&aid=1786994&group_id=176962 --- .../adempiere/pipo/AbstractElementHandler.java | 17 +++-------------- base/src/org/adempiere/pipo/PackOut.java | 3 ++- .../pipo/handler/CommonTranslationHandler.java | 3 ++- migration/353a-trunk/oracle/557_FR1786994.sql | Bin 0 -> 510 bytes .../353a-trunk/postgresql/557_FR1786994.sql | Bin 0 -> 520 bytes 5 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 migration/353a-trunk/oracle/557_FR1786994.sql create mode 100644 migration/353a-trunk/postgresql/557_FR1786994.sql diff --git a/base/src/org/adempiere/pipo/AbstractElementHandler.java b/base/src/org/adempiere/pipo/AbstractElementHandler.java index 0d82629034..b87fa6f139 100644 --- a/base/src/org/adempiere/pipo/AbstractElementHandler.java +++ b/base/src/org/adempiere/pipo/AbstractElementHandler.java @@ -1,6 +1,6 @@ /****************************************************************************** * Product: Adempiere ERP & CRM Smart Business Solution * - * Copyright (C) 1999-2006 Adempiere, Inc. All Rights Reserved. * + * Copyright (C) 1999-2006 Adempiere, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * * by the Free Software Foundation. This program is distributed in the hope * @@ -10,7 +10,7 @@ * You should have received a copy of the GNU General Public License along * * with this program; if not, write to the Free Software Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * - * + * * * Copyright (C) 2005 Robert Klein. robeklein@hotmail.com * * Contributor(s): Low Heng Sin hengsin@avantz.com * *****************************************************************************/ @@ -26,10 +26,9 @@ import java.util.logging.Level; import javax.xml.transform.sax.TransformerHandler; -import org.compiere.model.MSequence; import org.compiere.model.PO; import org.compiere.model.POInfo; -import org.compiere.model.X_AD_Package_Imp_Detail; +import org.compiere.model.X_AD_Package_Imp_Detail; import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; @@ -391,14 +390,4 @@ public abstract class AbstractElementHandler implements ElementHandler { return ("".equals(s) ? null : s); } - /** - * Returns option - Is export-import of AD translations is needed - * @param ctx - * @param entityType - * @return boolean - */ - protected boolean isHandleTranslations(Properties ctx) { - - return "true".equalsIgnoreCase(Env.getContext(ctx, "isHandleTranslations")); - } } diff --git a/base/src/org/adempiere/pipo/PackOut.java b/base/src/org/adempiere/pipo/PackOut.java index 93c33dc399..1bdc3b7551 100644 --- a/base/src/org/adempiere/pipo/PackOut.java +++ b/base/src/org/adempiere/pipo/PackOut.java @@ -60,6 +60,7 @@ import org.adempiere.pipo.handler.TableElementHandler; import org.adempiere.pipo.handler.TaskElementHandler; import org.adempiere.pipo.handler.WindowElementHandler; import org.adempiere.pipo.handler.WorkflowElementHandler; +import org.compiere.model.MSysConfig; import org.compiere.model.X_AD_Element; import org.compiere.model.X_AD_FieldGroup; import org.compiere.model.X_AD_Package_Exp; @@ -785,7 +786,7 @@ public class PackOut extends SvrProcess */ public void createTranslations (String parentTableName, int parentID, TransformerHandler packOutDocument) throws SAXException { - if("true".equals(getCtx().getProperty("isHandleTranslations"))){ + if (MSysConfig.getBooleanValue("2PACK_HANDLE_TRANSLATIONS", false)) { Env.setContext(getCtx(), CommonTranslationHandler.CONTEXT_KEY__PARENT_TABLE, parentTableName); diff --git a/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java b/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java index e43f0e654a..354f9f2909 100644 --- a/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java +++ b/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java @@ -13,6 +13,7 @@ import org.adempiere.pipo.AbstractElementHandler; import org.adempiere.pipo.AttributeFiller; import org.adempiere.pipo.Element; import org.adempiere.pipo.ElementHandler; +import org.compiere.model.MSysConfig; import org.compiere.util.DB; import org.compiere.util.Env; import org.xml.sax.Attributes; @@ -32,7 +33,7 @@ public class CommonTranslationHandler extends AbstractElementHandler implements public void startElement(Properties ctx, Element element) throws SAXException { - if(! isHandleTranslations(ctx)){ + if(! MSysConfig.getBooleanValue("2PACK_HANDLE_TRANSLATIONS", false)){ return;//translation import option is disabled } diff --git a/migration/353a-trunk/oracle/557_FR1786994.sql b/migration/353a-trunk/oracle/557_FR1786994.sql new file mode 100644 index 0000000000000000000000000000000000000000..d8cfac8b8d484bdc314741f799ae8a9b10b2f2b3 GIT binary patch literal 510 zcmbtQ(Qbk;6zwx#(Kj?{lY%-Ydt#JDG6W-NvM16&RU#{dRu}(%7v}Z@YucW3?mf4+ zxs+lyqgr;Olrf!wS zs{OK}Bnx*rj*>jZJ}T5^29Q^-YpQd`hzKs}Au{o0Hh-#z& zG2jty7j;OW5?z3wfhkm>X3QJZk6MEk$bi3vtOj2T84SFIDD>n*UpVg858jKlpYS*= V@|~Y#v7bk2^3Pu<_SAZ@tZ(bRi9i4V literal 0 HcmV?d00001 diff --git a/migration/353a-trunk/postgresql/557_FR1786994.sql b/migration/353a-trunk/postgresql/557_FR1786994.sql new file mode 100644 index 0000000000000000000000000000000000000000..c589704e41e5a342e59abbd1a9b8f74711d96494 GIT binary patch literal 520 zcmb_YU2lRg6zwy=qHk!@CIxj)_QZfiGCqt{lRc3JsuEctP+j=-#?D}~&^j@P*)fvw~d37a~&O@JoNW1fc{h3DnW50FNn~}WBns}WQ zT9&`~IuKv>MOU?BTM{T;>46WeBw_Csy1Gk}h)+olZ8?=a5Xz3CzR5X0y3rxX@Qe{g zR*WqyVrC}cY0kqq$haHtX685uI_|||9M;+-<_9bq$JF=nc55%4ICQeioD+*NV){s; z6RMB`#DFKbZPX%x3Umd20j5xi>M5^LH|ZX