You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/09/03 10:19:36 UTC
svn commit: r1759067 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml
src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
Author: deepak
Date: Sat Sep 3 10:19:36 2016
New Revision: 1759067
URL: http://svn.apache.org/viewvc?rev=1759067&view=rev
Log:
(OFBIZ-7999) Applied patch from jira issue
=====================================
Add UI labels for success / error messages in workeffort component
=====================================
Thanks Tanmay for your contribution.
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1759067&r1=1759066&r2=1759067&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sat Sep 3 10:19:36 2016
@@ -2633,6 +2633,12 @@
<value xml:lang="zh">错误:你没有浏览这个事件的权限。这个事件必须属于你或者你必须是一个管理员</value>
<value xml:lang="zh-TW">錯誤:你沒有檢視這個事件的權限.這個事件必須屬於你或者你必須是一個管理者</value>
</property>
+ <property key="WorkeffortErrorWhileCreatingServiceMapForService">
+ <value xml:lang="en">Error while creating service Map for service : ${serviceName}</value>
+ </property>
+ <property key="WorkeffortErrorWhileInvokingService">
+ <value xml:lang="en">Error while invoking service : ${serviceName}</value>
+ </property>
<property key="WorkEffortEstBudget">
<value xml:lang="en">Est.Budget</value>
<value xml:lang="es">Presupuesto estimado</value>
Modified: ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1759067&r1=1759066&r2=1759067&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java (original)
+++ ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java Sat Sep 3 10:19:36 2016
@@ -463,6 +463,7 @@ public class ICalConverter {
protected static Map<String, Object> invokeService(String serviceName, Map<String, ? extends Object> serviceMap, Map<String, Object> context) {
LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher");
+ Locale locale = (Locale) context.get("locale");
Map<String, Object> localMap = new HashMap<String, Object>();
try {
ModelService modelService = null;
@@ -477,7 +478,7 @@ public class ICalConverter {
}
}
} catch (Exception e) {
- String errMsg = "Error while creating service Map for service " + serviceName + ": ";
+ String errMsg = UtilProperties.getMessage("WorkEffortUiLabels", "WorkeffortErrorWhileCreatingServiceMapForService", UtilMisc.toMap("serviceName", serviceName), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg + e);
}
@@ -488,7 +489,7 @@ public class ICalConverter {
try {
return dispatcher.runSync(serviceName, localMap);
} catch (GenericServiceException e) {
- String errMsg = "Error while invoking service " + serviceName + ": ";
+ String errMsg = UtilProperties.getMessage("WorkEffortUiLabels", "WorkeffortErrorWhileInvokingService", UtilMisc.toMap("serviceName", serviceName), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg + e);
}
Re: svn commit: r1759067 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
Posted by Deepak Dixit <de...@hotwaxsystems.com>.
Thanks Pierre for review,
For workEffort we don't have error UiLabel file and I thought its not good
idea to create new UiLabel file for an single UiLabel :)
Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
On Sat, Sep 3, 2016 at 4:01 PM, Pierre Smits <pi...@gmail.com> wrote:
> Hi Deepak,
>
> Should labels for error messages not go into a ErrorUiLabels.xml file
> instead of the UILabels.xml file for field labels?
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>
> On Sat, Sep 3, 2016 at 12:19 PM, <de...@apache.org> wrote:
>
> > Author: deepak
> > Date: Sat Sep 3 10:19:36 2016
> > New Revision: 1759067
> >
> > URL: http://svn.apache.org/viewvc?rev=1759067&view=rev
> > Log:
> > (OFBIZ-7999) Applied patch from jira issue
> > =====================================
> > Add UI labels for success / error messages in workeffort component
> > =====================================
> > Thanks Tanmay for your contribution.
> >
> > Modified:
> > ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
> > ofbiz/trunk/applications/workeffort/src/main/java/org/
> > apache/ofbiz/workeffort/workeffort/ICalConverter.java
> >
> > Modified: ofbiz/trunk/applications/workeffort/config/
> > WorkEffortUiLabels.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> > workeffort/config/WorkEffortUiLabels.xml?rev=
> > 1759067&r1=1759066&r2=1759067&view=diff
> > ============================================================
> > ==================
> > --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
> > (original)
> > +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
> Sat
> > Sep 3 10:19:36 2016
> > @@ -2633,6 +2633,12 @@
> > <value xml:lang="zh">错误:ä½ æ²¡æœ‰æµ è§ˆè¿™ä¸ªäº‹ä»¶çš„æ ƒé™
> > ã€‚è¿™ä¸ªäº‹ä»¶å¿…é¡»å±žäºŽä½ æˆ–è€…ä½ å¿…é¡»æ˜¯ä¸€ä¸ªç®¡ç †å‘˜</value>
> > <value xml:lang="zh-TW">錯誤:ä½ æ²’æœ‰æª¢è¦–é€™å€‹äº‹ä»¶çš„æ¬
> Šé™
> > .é€™å€‹äº‹ä»¶å¿…é ˆå±¬æ–¼ä½ æˆ–è€…ä½ å¿…é ˆæ˜¯ä¸€å€‹ç®¡ç †è€…</value>
> > </property>
> > + <property key="WorkeffortErrorWhileCreatingServiceMapForService">
> > + <value xml:lang="en">Error while creating service Map for
> service
> > : ${serviceName}</value>
> > + </property>
> > + <property key="WorkeffortErrorWhileInvokingService">
> > + <value xml:lang="en">Error while invoking service :
> > ${serviceName}</value>
> > + </property>
> > <property key="WorkEffortEstBudget">
> > <value xml:lang="en">Est.Budget</value>
> > <value xml:lang="es">Presupuesto estimado</value>
> >
> > Modified: ofbiz/trunk/applications/workeffort/src/main/java/org/
> > apache/ofbiz/workeffort/workeffort/ICalConverter.java
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> > workeffort/src/main/java/org/apache/ofbiz/workeffort/
> > workeffort/ICalConverter.java?rev=1759067&r1=1759066&r2=
> 1759067&view=diff
> > ============================================================
> > ==================
> > --- ofbiz/trunk/applications/workeffort/src/main/java/org/
> > apache/ofbiz/workeffort/workeffort/ICalConverter.java (original)
> > +++ ofbiz/trunk/applications/workeffort/src/main/java/org/
> > apache/ofbiz/workeffort/workeffort/ICalConverter.java Sat Sep 3
> 10:19:36
> > 2016
> > @@ -463,6 +463,7 @@ public class ICalConverter {
> >
> > protected static Map<String, Object> invokeService(String
> > serviceName, Map<String, ? extends Object> serviceMap, Map<String,
> Object>
> > context) {
> > LocalDispatcher dispatcher = (LocalDispatcher)
> > context.get("dispatcher");
> > + Locale locale = (Locale) context.get("locale");
> > Map<String, Object> localMap = new HashMap<String, Object>();
> > try {
> > ModelService modelService = null;
> > @@ -477,7 +478,7 @@ public class ICalConverter {
> > }
> > }
> > } catch (Exception e) {
> > - String errMsg = "Error while creating service Map for
> service
> > " + serviceName + ": ";
> > + String errMsg = UtilProperties.getMessage("
> WorkEffortUiLabels",
> > "WorkeffortErrorWhileCreatingServiceMapForService",
> > UtilMisc.toMap("serviceName", serviceName), locale);
> > Debug.logError(e, errMsg, module);
> > return ServiceUtil.returnError(errMsg + e);
> > }
> > @@ -488,7 +489,7 @@ public class ICalConverter {
> > try {
> > return dispatcher.runSync(serviceName, localMap);
> > } catch (GenericServiceException e) {
> > - String errMsg = "Error while invoking service " +
> serviceName
> > + ": ";
> > + String errMsg = UtilProperties.getMessage("
> WorkEffortUiLabels",
> > "WorkeffortErrorWhileInvokingService", UtilMisc.toMap("serviceName",
> > serviceName), locale);
> > Debug.logError(e, errMsg, module);
> > return ServiceUtil.returnError(errMsg + e);
> > }
> >
> >
> >
>
Re: svn commit: r1759067 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
Posted by Pierre Smits <pi...@gmail.com>.
Hi Deepak,
Should labels for error messages not go into a ErrorUiLabels.xml file
instead of the UILabels.xml file for field labels?
Best regards,
Pierre Smits
ORRTIZ.COM <http://www.orrtiz.com>
OFBiz based solutions & services
OFBiz Extensions Marketplace
http://oem.ofbizci.net/oci-2/
On Sat, Sep 3, 2016 at 12:19 PM, <de...@apache.org> wrote:
> Author: deepak
> Date: Sat Sep 3 10:19:36 2016
> New Revision: 1759067
>
> URL: http://svn.apache.org/viewvc?rev=1759067&view=rev
> Log:
> (OFBIZ-7999) Applied patch from jira issue
> =====================================
> Add UI labels for success / error messages in workeffort component
> =====================================
> Thanks Tanmay for your contribution.
>
> Modified:
> ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
> ofbiz/trunk/applications/workeffort/src/main/java/org/
> apache/ofbiz/workeffort/workeffort/ICalConverter.java
>
> Modified: ofbiz/trunk/applications/workeffort/config/
> WorkEffortUiLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> workeffort/config/WorkEffortUiLabels.xml?rev=
> 1759067&r1=1759066&r2=1759067&view=diff
> ============================================================
> ==================
> --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
> (original)
> +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sat
> Sep 3 10:19:36 2016
> @@ -2633,6 +2633,12 @@
> <value xml:lang="zh">错误:ä½ æ²¡æœ‰æµ è§ˆè¿™ä¸ªäº‹ä»¶çš„æ ƒé™
> ã€‚è¿™ä¸ªäº‹ä»¶å¿…é¡»å±žäºŽä½ æˆ–è€…ä½ å¿…é¡»æ˜¯ä¸€ä¸ªç®¡ç †å‘˜</value>
> <value xml:lang="zh-TW">錯誤:ä½ æ²’æœ‰æª¢è¦–é€™å€‹äº‹ä»¶çš„æ¬Šé™
> .é€™å€‹äº‹ä»¶å¿…é ˆå±¬æ–¼ä½ æˆ–è€…ä½ å¿…é ˆæ˜¯ä¸€å€‹ç®¡ç †è€…</value>
> </property>
> + <property key="WorkeffortErrorWhileCreatingServiceMapForService">
> + <value xml:lang="en">Error while creating service Map for service
> : ${serviceName}</value>
> + </property>
> + <property key="WorkeffortErrorWhileInvokingService">
> + <value xml:lang="en">Error while invoking service :
> ${serviceName}</value>
> + </property>
> <property key="WorkEffortEstBudget">
> <value xml:lang="en">Est.Budget</value>
> <value xml:lang="es">Presupuesto estimado</value>
>
> Modified: ofbiz/trunk/applications/workeffort/src/main/java/org/
> apache/ofbiz/workeffort/workeffort/ICalConverter.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> workeffort/src/main/java/org/apache/ofbiz/workeffort/
> workeffort/ICalConverter.java?rev=1759067&r1=1759066&r2=1759067&view=diff
> ============================================================
> ==================
> --- ofbiz/trunk/applications/workeffort/src/main/java/org/
> apache/ofbiz/workeffort/workeffort/ICalConverter.java (original)
> +++ ofbiz/trunk/applications/workeffort/src/main/java/org/
> apache/ofbiz/workeffort/workeffort/ICalConverter.java Sat Sep 3 10:19:36
> 2016
> @@ -463,6 +463,7 @@ public class ICalConverter {
>
> protected static Map<String, Object> invokeService(String
> serviceName, Map<String, ? extends Object> serviceMap, Map<String, Object>
> context) {
> LocalDispatcher dispatcher = (LocalDispatcher)
> context.get("dispatcher");
> + Locale locale = (Locale) context.get("locale");
> Map<String, Object> localMap = new HashMap<String, Object>();
> try {
> ModelService modelService = null;
> @@ -477,7 +478,7 @@ public class ICalConverter {
> }
> }
> } catch (Exception e) {
> - String errMsg = "Error while creating service Map for service
> " + serviceName + ": ";
> + String errMsg = UtilProperties.getMessage("WorkEffortUiLabels",
> "WorkeffortErrorWhileCreatingServiceMapForService",
> UtilMisc.toMap("serviceName", serviceName), locale);
> Debug.logError(e, errMsg, module);
> return ServiceUtil.returnError(errMsg + e);
> }
> @@ -488,7 +489,7 @@ public class ICalConverter {
> try {
> return dispatcher.runSync(serviceName, localMap);
> } catch (GenericServiceException e) {
> - String errMsg = "Error while invoking service " + serviceName
> + ": ";
> + String errMsg = UtilProperties.getMessage("WorkEffortUiLabels",
> "WorkeffortErrorWhileInvokingService", UtilMisc.toMap("serviceName",
> serviceName), locale);
> Debug.logError(e, errMsg, module);
> return ServiceUtil.returnError(errMsg + e);
> }
>
>
>