Index: JetspeedL10NTag.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedL10NTag.java,v retrieving revision 1.1 diff -u -r1.1 JetspeedL10NTag.java --- JetspeedL10NTag.java 29 Nov 2002 19:26:09 -0000 1.1 +++ JetspeedL10NTag.java 3 Apr 2003 13:38:05 -0000 @@ -66,6 +66,9 @@ import org.apache.turbine.util.Log; import org.apache.turbine.services.jsp.JspService; import org.apache.turbine.services.localization.Localization; +import org.apache.turbine.services.localization.LocalizationService; +import org.apache.turbine.services.TurbineServices; + // ECS support import org.apache.ecs.ConcreteElement; @@ -73,6 +76,9 @@ // Jetspeed support import org.apache.jetspeed.services.rundata.JetspeedRunData; +import org.apache.jetspeed.services.customlocalization.JetspeedLocalizationService; + + /** * Supporting class for the localization (l10n) tag. @@ -117,12 +123,14 @@ { JetspeedRunData data = (JetspeedRunData) pageContext.getAttribute(JspService.RUNDATA, PageContext.REQUEST_SCOPE); + JetspeedLocalizationService jls = (JetspeedLocalizationService) TurbineServices.getInstance().getService(LocalizationService.SERVICE_NAME); + try { ConcreteElement result = null; try { - result = new StringElement(Localization.getString(this.key)); + result = new StringElement(Localization.getString(this.key, jls.getLocale(data))); } catch (MissingResourceException mre) {