svn commit: r891929 - in /ofbiz/trunk/framework/minilang: config/MiniLangErrorUiLabels.xml src/org/ofbiz/minilang/method/callops/CallService.java

[mrisaliti]

Author: mrisaliti
Date: Thu Dec 17 21:41:00 2009
New Revision: 891929

URL: http://svn.apache.org/viewvc?rev=891929&view=rev
Log:
Internazionalization of an error messages of MiniLang (OFBIZ-3360)

Modified:
    ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java

Modified: ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml?rev=891929&r1=891928&r2=891929&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml (original)
+++ ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml Thu Dec 17 21:41:00 2009
@@ -41,6 +41,10 @@
         <value xml:lang="th">Error : ผิดพลาด ! ในการรัน simple-method</value>
         <value xml:lang="zh">运行这个简单方法时出错</value>
     </property>
+    <property key="simpleMethod.error_show_service_name">
+        <value xml:lang="en">calling service ${serviceName} in ${methodName}</value>
+        <value xml:lang="it">eseguendo il servizio ${serviceName} in ${methodName}</value>
+    </property>
     <property key="simpleMethod.must_logged_process">
         <value xml:lang="de">Sie müssen am System angemeldet sein um [${shortDescription}] auszuführen</value>
         <value xml:lang="en">You must be logged in to complete the [${shortDescription}] process</value>

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=891929&r1=891928&r2=891929&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java Thu Dec 17 21:41:00 2009
@@ -27,6 +27,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleServletAccessor;
@@ -55,7 +56,8 @@
     }
 
     public static final String module = CallService.class.getName();
-
+    public static final String resource = "MiniLangErrorUiLabels";
+    
     protected String serviceName;
     protected ContextAccessor<Map<String, Object>> inMapAcsr;
     protected String includeUserLoginStr;
@@ -314,10 +316,10 @@
         String successSuffixStr = successSuffix.getMessage(methodContext.getLoader(), methodContext);
         String messagePrefixStr = messagePrefix.getMessage(methodContext.getLoader(), methodContext);
         String messageSuffixStr = messageSuffix.getMessage(methodContext.getLoader(), methodContext);
-
+        
         String errorMessage = ServiceUtil.makeErrorMessage(result, messagePrefixStr, messageSuffixStr, errorPrefixStr, errorSuffixStr);
         if (UtilValidate.isNotEmpty(errorMessage)) {
-            errorMessage += " calling service " + serviceName + " in " + simpleMethod.getMethodName();
+            errorMessage += UtilProperties.getMessage(resource, "simpleMethod.error_show_service_name", UtilMisc.toMap("serviceName", serviceName, "methodName", simpleMethod.getMethodName()), locale);
             if (methodContext.getMethodType() == MethodContext.EVENT) {
                 methodContext.putEnv(simpleMethod.getEventErrorMessageName(), errorMessage);
             } else if (methodContext.getMethodType() == MethodContext.SERVICE) {