svn commit: r1792899 - in /ofbiz/ofbiz-plugins/trunk/bir
Locked
svn commit: r1792899 - in /ofbiz/ofbiz-plugins/trunk/bir
 
|
Author: jleroux
Date: Thu Apr 27 14:06:30 2017 New Revision: 1792899 URL: http://svn.apache.org/viewvc?rev=1792899&view=rev Log: No functional changes: Fixes a label Adds an error label Uses the error label Adds the word service in not yet labelised error msg Modified: ofbiz/ofbiz-plugins/trunk/birt/config/BirtErrorUiLabels.xml ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java Modified: ofbiz/ofbiz-plugins/trunk/birt/config/BirtErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/config/BirtErrorUiLabels.xml?rev=1792899&r1=1792898&r2=1792899&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/config/BirtErrorUiLabels.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/config/BirtErrorUiLabels.xml Thu Apr 27 14:06:30 2017 @@ -57,6 +57,10 @@ <value xml:lang="en">No view entity name found</value> <value xml:lang="fr">Aucun nom de vue/entité n'a été trouvé</value> </property> + <property key="BirtErrorInuploadRptDesignNoFile"> + <value xml:lang="en">Error in uploadRptDesign service. Check you have selected a .rptdesign file to upload.</value> + <value xml:lang="fr">Erreur dans le service uploadRptDesign. Vérifiez que vous avez sélectionné un fichier .rptdesign à télécharger vers le serveur.</value> + </property> <property key="BirtErrorNoAttributeFound"> <value xml:lang="en">Master workflow attribute not found</value> <value xml:lang="fr">L'attribut de workflow du master n'as pas pu être trouvé</value> Modified: ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml?rev=1792899&r1=1792898&r2=1792899&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/config/BirtUiLabels.xml Thu Apr 27 14:06:30 2017 @@ -162,8 +162,8 @@ <value xml:lang="fr">Gérer les rapports</value> </property> <property key="BirtNoKnownFlexibleReport"> - <value xml:lang="en">You have no report yet</value> - <value xml:lang="fr">Vous n'avez aucun rapport pour l'instant</value> + <value xml:lang="en">You have no Flexible Reports yet</value> + <value xml:lang="fr">Vous n'avez aucun rapport flexible pour l'instant</value> </property> <property key="BirtNote1"> <value xml:lang="en">BIRT is an open source Eclipse-based (EPL v1 license) reporting system.</value> Modified: ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java?rev=1792899&r1=1792898&r2=1792899&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java (original) +++ ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java Thu Apr 27 14:06:30 2017 @@ -319,7 +319,7 @@ public class BirtServices { "userLogin", userLogin, "locale", locale)); } catch (GeneralException | SAXException | ParserConfigurationException | IOException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in overrideReportForm"); //TODO labelise + return ServiceUtil.returnError("Error in overrideReportForm service."); //TODO labelise } return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtSearchFormSuccessfullyOverridde", locale)); } @@ -382,7 +382,7 @@ public class BirtServices { } } catch (GeneralException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in createFlexibleReportFromMasterEntityWorkflow"); //TODO labelise + return ServiceUtil.returnError("Error in createFlexibleReportFromMasterEntityWorkflow service"); //TODO labelise } result.put("contentId", contentId); return result; @@ -536,7 +536,7 @@ public class BirtServices { textData = electronicText.getString("textData"); } catch (GenericEntityException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in createFormForDisplay"); //TODO labelise + return ServiceUtil.returnError("Error in createFormForDisplay service."); //TODO labelise } if (Debug.infoOn()) Debug.logInfo(textData, module); @@ -567,7 +567,7 @@ public class BirtServices { listContent = EntityQuery.use(delegator).from("Content").where(entityConditionContent).select("contentId").queryList(); } catch (GenericEntityException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in deleteAllReports"); //TODO labelise + return ServiceUtil.returnError("Error in deleteAllReports service."); //TODO labelise } if (UtilValidate.isEmpty(listContent)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorNoFlexibleReportToDelete", locale)); @@ -581,7 +581,7 @@ public class BirtServices { } } catch (GenericServiceException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in deleteAllReports"); //TODO labelise + return ServiceUtil.returnError("Error in deleteAllReports service."); //TODO labelise } return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtFlexibleReportsSuccessfullyDeleted", locale)); } @@ -612,7 +612,7 @@ public class BirtServices { .queryList(); } catch (GenericEntityException e1) { Debug.logError(e1, module); - return ServiceUtil.returnError("Error in deleteFlexibleReport"); //TODO labelise + return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise } if (listRptDesignFileGV.size() > 1) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorUnexpectedNumberReportToDelete", locale)); @@ -626,7 +626,7 @@ public class BirtServices { } } catch (IOException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in deleteFlexibleReport"); //TODO labelise + return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise } try { delegator.removeByAnd("ContentAttribute", UtilMisc.toMap("contentId", contentId)); @@ -634,7 +634,7 @@ public class BirtServices { dispatcher.runSync("removeContentAndRelated", UtilMisc.toMap("contentId", contentIdRpt, "userLogin", userLogin, "locale", locale)); } catch (GenericServiceException | GenericEntityException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in deleteFlexibleReport"); //TODO labelise + return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise } return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtFlexibleReportSuccessfullyDeleted", locale)); } @@ -659,7 +659,7 @@ public class BirtServices { engine = factory.createDesignEngine(config); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } SessionHandle session = engine.newSessionHandle(ULocale.forLocale(locale)); @@ -674,7 +674,7 @@ public class BirtServices { dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne(); } catch (GenericEntityException e1) { Debug.logError(e1, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } String rptDesignName = dataResource.getString("objectInfo"); // start Birt API platfrom @@ -691,7 +691,7 @@ public class BirtServices { designStored = session.openDesign(rptDesignName); } catch (DesignFileException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } // check if design stored already has a body and delete it to avoid conflicts (taking into account only newly designed body) @@ -705,7 +705,7 @@ public class BirtServices { iter.remove(); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } } } @@ -727,7 +727,7 @@ public class BirtServices { Files.deleteIfExists(path); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorInuploadRptDesignNoFile", locale)); } //copy cube @@ -742,7 +742,7 @@ public class BirtServices { designStored.getCubes().add(copy); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } } @@ -758,7 +758,7 @@ public class BirtServices { designStored.getBody().add(copy); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } } @@ -782,7 +782,7 @@ public class BirtServices { } } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } // page variables @@ -792,7 +792,7 @@ public class BirtServices { designStored.setPageVariable(pageVariable.getName(), pageVariable.getPropertyBindingExpression(pageVariable.getName())); } catch (SemanticException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } } @@ -821,7 +821,7 @@ public class BirtServices { designStored.getStyles().add(copy); } catch (Exception e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } } } @@ -830,7 +830,7 @@ public class BirtServices { designStored.saveAs(rptDesignName); } catch (IOException e) { Debug.logError(e, module); - return ServiceUtil.returnError("Error in uploadRptDesign"); //TODO labelise + return ServiceUtil.returnError("Error in uploadRptDesign service."); //TODO labelise } designFromUser.close(); designStored.close(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |