Thanks for the remainder Jacques. I did it now. Jacopo
On Jun 18, 2009, at 11:06 AM, Jacques Le Roux wrote:
Should we not backport to R9.04 ? Jacques From: <jaco...@apache.org>Author: jacopoc Date: Thu Jun 18 08:36:16 2009 New Revision: 785954 URL: http://svn.apache.org/viewvc?rev=785954&view=rev Log:Applied fix from Marco Risaliti for locale related issue in sub content rendering.Modified:ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ MacroScreenRenderer.javaModified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ MacroScreenRenderer.javaURL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=785954&r1=785953&r2=785954&view=diff= = = = = = = = = ===================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ MacroScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ MacroScreenRenderer.java Thu Jun 18 08:36:16 2009@@ -18,17 +18,13 @@ *******************************************************************************/ package org.ofbiz.widget.screen; -import java.io.File; import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.math.BigDecimal; -import java.net.MalformedURLException; -import java.net.URL; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Locale; import java.util.Map; @@ -38,16 +34,12 @@ import javolution.util.FastMap; -import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; -import org.ofbiz.base.util.FileUtil; -import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.entity.GenericDelegator; @@ -367,7 +359,6 @@ }public void renderContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {- // FIXME: copy those code from HtmlScreenRenderer.java Locale locale = UtilMisc.ensureLocale(context.get("locale")); //Boolean nullThruDatesOnly = Boolean.valueOf(false); String mimeTypeId = "text/html"; @@ -519,8 +510,7 @@ }public void renderSubContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {- // FIXME: copy those code from HtmlScreenRenderer.java - Locale locale = Locale.getDefault();+ Locale locale = UtilMisc.ensureLocale(context.get("locale"));String mimeTypeId = "text/html"; String expandedContentId = content.getContentId(context); String expandedMapKey = content.getMapKey(context);
smime.p7s
Description: S/MIME cryptographic signature