svn commit: r1678911 - /ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java

[Deepak Dixit-5]

Author: deepak
Date: Tue May 12 11:02:42 2015
New Revision: 1678911

URL: http://svn.apache.org/r1678911
Log:
Used UtilHttp.getLocale() to get the locale instead request.getLocale()

Modified:
    ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1678911&r1=1678910&r2=1678911&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Tue May 12 11:02:42 2015
@@ -342,7 +342,7 @@ public class CommonEvents {
             Debug.logError("No resource and labels found in JSON string: " + jsonString, module);
             return "error";
         }
-        Locale locale = request.getLocale();
+        Locale locale = UtilHttp.getLocale(request);
         Map<String, List<String>> uiLabelMap = new HashMap<String, List<String>>();
         Set<Map.Entry<String, List<String>>> entrySet = uiLabelObject.entrySet();
         for (Map.Entry<String, List<String>> entry : entrySet) {
@@ -376,7 +376,7 @@ public class CommonEvents {
             Debug.logError("More than one resource found, please use the method: getJSONuiLabelArray", module);
             return "error";
         }
-        Locale locale = request.getLocale();
+        Locale locale = UtilHttp.getLocale(request);
         Map<String, String> uiLabelMap = new HashMap<String, String>();
         Set<Map.Entry<String, String>> entrySet = uiLabelObject.entrySet();
         for (Map.Entry<String, String> entry : entrySet) {