Author: jleroux Date: Fri Sep 21 14:39:49 2007 New Revision: 578282 URL: http://svn.apache.org/viewvc?rev=578282&view=rev Log: To complete rev. 578278 where applications\ecommerce\webapp\ecommerce\includes\language.ftl framework\common\webcommon\includes\language.ftl
Have slipped in (I guess because of a previous merge which partially failed) This correspond to rev. 572375 in trunk without framework/common/webcommon/includes/listLocales.ftl which was newly added This fix a bug see https://issues.apache.org/jira/browse/OFBIZ-1223 Hope it's clear enough (merging is sometimes a bit vaudou) Modified: ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonEvents.java Modified: ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=578282&r1=578281&r2=578282&view=diff ============================================================================== --- ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonEvents.java Fri Sep 21 14:39:49 2007 @@ -164,9 +164,10 @@ return "success"; } - /** Simple event to set the users per-session locale setting */ + /** Simple event to set the users per-session locale setting. The user's locale + * setting should be passed as a "newLocale" request parameter. */ public static String setSessionLocale(HttpServletRequest request, HttpServletResponse response) { - String localeString = request.getParameter("locale"); + String localeString = request.getParameter("newLocale"); if (UtilValidate.isNotEmpty(localeString)) { UtilHttp.setLocale(request, localeString);
