Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml Sat Feb 16 09:23:20 2013 @@ -137,6 +137,7 @@ <value xml:lang="it">hh:mm:ss</value> <value xml:lang="ja">hh:mm:ss</value> <value xml:lang="pt_BR">hh:mm:ss</value> + <value xml:lang="zh">HH:mm:ss</value> </property> <property key="TemporalExpressionType"> <value xml:lang="de">Ausdruckstyp</value> @@ -221,6 +222,7 @@ <value xml:lang="es">Intervalo de horas</value> <value xml:lang="ja">æã®ç¯å²</value> <value xml:lang="pt_BR">Intervalo de Hora</value> + <value xml:lang="zh">å°æ¶èå´</value> </property> <property key="TemporalExpression_INTERSECTION"> <value xml:lang="de">Durchschnitt</value> @@ -239,6 +241,7 @@ <value xml:lang="es">Intervalo de minutos</value> <value xml:lang="ja">åã®ç¯å²</value> <value xml:lang="pt_BR">Intervalo de Minutos</value> + <value xml:lang="zh">åéèå´</value> </property> <property key="TemporalExpression_MONTH_RANGE"> <value xml:lang="de">Monatsauswahl</value> @@ -257,6 +260,7 @@ <value xml:lang="es">Sustitución</value> <value xml:lang="ja">代ç¨</value> <value xml:lang="pt_BR">Substituição</value> + <value xml:lang="zh">æ¿æ¢</value> </property> <property key="TemporalExpression_UNION"> <value xml:lang="de">Vereinigung</value>
Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Sat Feb 16 09:23:20 2013 @@ -32,6 +32,7 @@ import org.ofbiz.base.config.GenericConf import org.ofbiz.base.config.MainResourceHandler; import org.ofbiz.base.config.ResourceHandler; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -99,6 +100,11 @@ public class EntityDataLoader { throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)"); } readerName = readerName.trim(); + + // ignore the "tenant" reader if the multitenant property is "N" + if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) { + continue; + } // get all of the main resource model stuff, ie specified in the entityengine.xml file EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName); @@ -200,6 +206,12 @@ public class EntityDataLoader { } else { throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)"); } + + // ignore the "tenant" reader if the multitenant property is "N" + if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) { + continue; + } + readerNames.add(readerName); } return getUrlByComponentList(helperName, components, readerNames); Modified: ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml Sat Feb 16 09:23:20 2013 @@ -23,100 +23,120 @@ <value xml:lang="en">Cannot do Entity Sync Push because entitySyncId [] is set for Pull Only.</value> <value xml:lang="fr">Impossible d'effectuer la synchro (push) avec un configuration en mode esclave seulement (pull only).</value> <value xml:lang="it">Non è possibile fare Entity Sync Push perchè entitySyncId [] è impostato in Pull Only.</value> + <value xml:lang="zh">æ æ³å®ç°å®ä½åæ¥æ¨éå 为å®ä½åæ¥æ è¯ï¼entitySyncId []ï¼è¢«è®¾ç½®ä¸ºäºåªè½æåã</value> </property> <property key="EntityExtCannotFindDelegator"> <value xml:lang="en">Could not find delegator with specified name ${overrideDelegatorName}</value> <value xml:lang="fr">Le delegateur avec le nom ${overrideDelegatorName} n'a pu être trouvé</value> <value xml:lang="it">Could not find delegator with specified name ${overrideDelegatorName}</value> + <value xml:lang="zh">æ æ³æ¾å°å称为${overrideDelegatorName}ç代ç</value> </property> <property key="EntityExtEntitySyncXMLDocumentIsNotValid"> <value xml:lang="en">EntitySync XML document ${fileName} is not valid!</value> <value xml:lang="fr">L'EntitySync XML document ${fileName} n'est pas valide !</value> <value xml:lang="it">EntitySync XML documento ${fileName} non è valido!</value> + <value xml:lang="zh">å®ä½åæ¥ï¼EntitySyncï¼XMLææ¡£${fileName}æ æï¼</value> </property> <property key="EntityExtErrorCallingRemotePull"> <value xml:lang="en">Error calling remote pull and report EntitySync service with name: ${remotePullAndReportEntitySyncDataName}</value> <value xml:lang="fr">Erreur lors de l'appel de l'esclave (remote pull) et de son rapport sur le service nommé : ${remotePullAndReportEntitySyncDataName}</value> <value xml:lang="it">Errore durante la chiamata del pull remoto e report EntitySync servizio con il nome: ${remotePullAndReportEntitySyncDataName}</value> + <value xml:lang="zh">è°ç¨è¿ç¨æååæ¥è¡¨çå®ä½åæ¥ï¼EntitySyncï¼æå¡æ¶åºéï¼æå¡å称ï¼${remotePullAndReportEntitySyncDataName}</value> </property> <property key="EntityExtErrorCallingService"> <value xml:lang="en">Error calling service to store data locally</value> <value xml:lang="fr">Erreur d'appel du service de mise à jour des données locales</value> <value xml:lang="it">Errore durante la chiamata del servizio di registrazione locale dei dati</value> + <value xml:lang="zh">è°ç¨æå¡æ¥æ¬å°åå¨æ°æ®æ¶åºé</value> </property> <property key="EntityExtErrorCleaningEntitySyncRemove"> <value xml:lang="en">Error cleaning out EntitySyncRemove info: ${errorString}</value> <value xml:lang="fr">Erreur lors du nettoyage des EntitySyncRemove, plus d'informations : ${errorString}</value> <value xml:lang="it">Error cleaning out EntitySyncRemove info: ${errorString}</value> + <value xml:lang="zh">æ¸ é¤å®ä½åæ¥å é¤ï¼EntitySyncRemoveï¼ä¿¡æ¯æ¶åºéï¼${errorString}</value> </property> <property key="EntityExtErrorGettingListOfEntityInGroup"> <value xml:lang="en">Error getting list of entities in group: ${errorString}</value> <value xml:lang="fr">Erreur lors de la récupération des entités du group : ${errorString}</value> <value xml:lang="it">Errore ad ottenere la lista delle entità nel gruppo: ${errorString}</value> + <value xml:lang="zh">è·ååç»ä¸çå®ä½å表æ¶åºéï¼${errorString}</value> </property> <property key="EntityExtErrorUnwrappingRecords"> <value xml:lang="en">Error unwrapping ByteWrapper records: ${errorString}</value> <value xml:lang="fr">Erreur lors de l"ouverture du flux des enregistrements : ${errorString}</value> <value xml:lang="it">Errore unwrapping ByteWrapper records: ${errorString}</value> + <value xml:lang="zh">解æByteWrapperè®°å½æ¶åºéï¼${errorString}</value> </property> <property key="EntityExtErrorSavingEntitySyncData"> <value xml:lang="en">Error saving Entity Sync Data for entitySyncId ${entitySyncId}: ${errorString}</value> <value xml:lang="fr">Erreur lors de la synchro de donnée pour la référence ${entitySyncId}: ${errorString}</value> <value xml:lang="it">Errore durante il salvataggio Entity Sync Data per entitySyncId ${entitySyncId}: ${errorString}</value> + <value xml:lang="zh">为å®ä½åæ¥æ è¯ï¼entitySyncIdï¼${entitySyncId}ä¿åå®ä½åæ¥æ°æ®æ¶åºéï¼${errorString}</value> </property> <property key="EntityExtExceptionSavingEntitySyncData"> <value xml:lang="en">Exception saving Entity Sync Data for entitySyncId ${entitySyncId}: ${errorString}</value> <value xml:lang="fr">Exception lors de l'enregistrement de la synchro de donnée pour la référence ${entitySyncId}: ${errorString}</value> <value xml:lang="it">Eccezione durante il salvataggio Entity Sync Data per entitySyncId ${entitySyncId}: ${errorString}</value> + <value xml:lang="zh">为å®ä½åæ¥æ è¯ï¼entitySyncIdï¼${entitySyncId}ä¿åå®ä½åæ¥æ°æ®æ¶åºç°æå¤ï¼${errorString}</value> </property> <property key="EntityExtFileNotFound"> <value xml:lang="en">File not found: ${fileName}</value> <value xml:lang="fr">Fichier ${fileName} non trouvé</value> <value xml:lang="it">File non trovato: ${fileName}</value> + <value xml:lang="zh">没ææ¾å°æ件ï¼${fileName}</value> </property> <property key="EntityExtNoFileAvailableInTheRootDirectory"> <value xml:lang="en">No files available for reading in this root directory: ${rootDirectory}</value> <value xml:lang="fr">Aucun fichier disponible pour la lecture dans le répertoire ${rootDirectory}</value> <value xml:lang="it">Nessun file disponibile da leggere nella directory principale: ${rootDirectory}</value> + <value xml:lang="zh">è¿ä¸ªæ ¹ç®å½ä¸æ²¡æå¯è¯»çæ件ï¼${rootDirectory}</value> </property> <property key="EntityExtOfflineXMLFileNotFound"> <value xml:lang="en">Offline EntitySync XML file not found (${fileName})</value> <value xml:lang="fr">Le fichier hors ligne (${fileName}) n'a pas été trouvé</value> <value xml:lang="it">File Offline EntitySync XML non trovato (${fileName})</value> + <value xml:lang="zh">没ææ¾å°ç¦»çº¿å®ä½åæ¥ï¼EntitySyncï¼XMLæ件ï¼${fileName}ï¼</value> </property> <property key="EntityExtProblemReadingFile"> <value xml:lang="en">Problem reading file: ${fileName}</value> <value xml:lang="fr">Problème lors de la lecture du fichier ${fileName}</value> <value xml:lang="it">Problema durante la lettura del file: ${fileName}</value> + <value xml:lang="zh">读æ件æ¶åºé®é¢ï¼${fileName}</value> </property> <property key="EntityExtRootDirectoryDoesNotExists"> <value xml:lang="en">Root directory does not exist or is not readable.</value> <value xml:lang="fr">Le répertoire racine n'existe pas ou n'est pas lisible</value> <value xml:lang="it">Directory principale non esiste o non è leggibile.</value> + <value xml:lang="zh">æ ¹ç®å½ä¸åå¨æä¸å¯è¯»ã</value> </property> <property key="EntityExtServicePermissionNotGranted"> <value xml:lang="en">You do not have permission to run this service.</value> <value xml:lang="fr">Vous n'avez pas la permission d'exécuter ce service</value> <value xml:lang="it">Tu non hai il permesso di eseguire questo servizio.</value> + <value xml:lang="zh">ä½ æ²¡ææéè¿è¡è¿ä¸ªæå¡ã</value> </property> <property key="EntityExtThisServiceIsNotYetImplemented"> <value xml:lang="en">This service is not implemented yet.</value> <value xml:lang="fr">Ce service n'est pas implémenté actuellement</value> <value xml:lang="it">Questo servizio non è ancora implementato.</value> + <value xml:lang="zh">è¿ä¸ªæå¡å°æªå®ç°ã</value> </property> <property key="EntityExtUnableToLoadXMLDocument"> <value xml:lang="en">Unable to load EntitySync XML ${entitySyncId} - Problem at '${startTime}' Error: ${errorString}</value> <value xml:lang="fr">Impossible de charger l'EntitySync XML ${entitySyncId} - Problème à '${startTime}' , avec l'erreur suivante : ${errorString}</value> <value xml:lang="it">Non è possibile caricare il EntitySync XML ${entitySyncId} - Problema alle '${startTime}' Errore: ${errorString}</value> + <value xml:lang="zh">æ æ³è½½å ¥å®ä½åæ¥ï¼EntitySyncï¼XML ${entitySyncId} - é®é¢åçå¨'${startTime}'ï¼é误ï¼${errorString}</value> </property> <property key="EntityExtUnableToLocateRootDirectory"> <value xml:lang="en">Unable to locate root directory ${rootDirectory}</value> <value xml:lang="fr">Impossible de localiser le répertoire racine ${rootDirectory}</value> <value xml:lang="it">Non è possibile localizzare la directory principale ${rootDirectory}</value> + <value xml:lang="zh">æ æ³å®ä½æ ¹ç®å½${rootDirectory}</value> </property> <property key="EntityExtUnableToLocateRootDirectoryURI"> <value xml:lang="en">Unable to get root directory URI</value> <value xml:lang="fr">Impossible de récupérer le répertoire racine</value> <value xml:lang="it">Non è possibile localizzare la directory principale URI</value> + <value xml:lang="zh">ä¸è½å¾å°æ ¹ç®å½URI</value> </property> </resource> Modified: ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml Sat Feb 16 09:23:20 2013 @@ -25,6 +25,7 @@ <value xml:lang="it">Errore: </value> <value xml:lang="ja">ã¨ã©ã¼:</value> <value xml:lang="nl">Fout: </value> + <value xml:lang="zh">é误ï¼</value> </property> <property key="check.error.suffix"> <value xml:lang="en"> </value> @@ -56,6 +57,7 @@ <value xml:lang="it">Errore: </value> <value xml:lang="ja">ã¨ã©ã¼:</value> <value xml:lang="nl">Fout: </value> + <value xml:lang="zh">é误ï¼</value> </property> <property key="service.error.suffix"> <value xml:lang="en"> </value> Modified: ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml Sat Feb 16 09:23:20 2013 @@ -49,6 +49,7 @@ <value xml:lang="en">calling service ${serviceName} in ${methodName}</value> <value xml:lang="it">eseguendo il servizio ${serviceName} in ${methodName}</value> <value xml:lang="ja">ãµã¼ãã¹ ${serviceName} ã ${methodName} ã§å¼ã³åºã</value> + <value xml:lang="zh">å¨${methodName}ä¸è°ç¨æå¡${serviceName} </value> </property> <property key="simpleMethod.must_logged_process"> <value xml:lang="de">Sie müssen am System angemeldet sein um [${shortDescription}] auszuführen</value> Modified: ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1446859&r1=1446858&r2=1446859&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sat Feb 16 09:23:20 2013 @@ -3028,17 +3028,38 @@ public class ModelForm extends ModelWidg } public void renderStartString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException { - if (modelForm.fieldGroupList.size() > 0) { - formStringRenderer.renderFieldGroupOpen(writer, context, this); + if (!modelForm.fieldGroupList.isEmpty()) { + if (shouldUse(context)) { + formStringRenderer.renderFieldGroupOpen(writer, context, this); + } } formStringRenderer.renderFormatSingleWrapperOpen(writer, context, modelForm); } public void renderEndString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderFormatSingleWrapperClose(writer, context, modelForm); - if (modelForm.fieldGroupList.size() > 0) { - formStringRenderer.renderFieldGroupClose(writer, context, this); + if (!modelForm.fieldGroupList.isEmpty()) { + if (shouldUse(context)) { + formStringRenderer.renderFieldGroupClose(writer, context, this); + } + } + } + + public boolean shouldUse(Map<String, Object> context) { + for (String fieldName : modelForm.fieldGroupMap.keySet()) { + FieldGroupBase group = modelForm.fieldGroupMap.get(fieldName); + if (group instanceof FieldGroup) { + FieldGroup fieldgroup =(FieldGroup) group; + if (this.id.equals(fieldgroup.getId())) { + for (ModelFormField modelField : modelForm.fieldList) { + if (fieldName.equals(modelField.getName()) && modelField.shouldUse(context)) { + return true; + } + } + } + } } + return false; } }
