Adds support to use Struts' Locale
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a42a1731 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a42a1731 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a42a1731 Branch: refs/heads/master Commit: a42a1731f301a712da3d61f43291c5e1126c50ff Parents: f645c91 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Fri Jan 15 10:12:15 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Fri Jan 15 10:12:15 2016 +0100 ---------------------------------------------------------------------- .../tiles/StrutsTilesContainerFactory.java | 4 ++ .../tiles/StrutsTilesLocaleResolver.java | 54 ++++++++++++++++++++ 2 files changed, 58 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/a42a1731/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java index 8403610..0cb14f3 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java @@ -161,6 +161,10 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory { return resolver; } + protected LocaleResolver createLocaleResolver(ApplicationContext applicationContext) { + return new StrutsTilesLocaleResolver(); + } + @Override protected List<ApplicationResource> getSources(ApplicationContext applicationContext) { Collection<ApplicationResource> resources = applicationContext.getResources(getTilesDefinitionPattern(applicationContext.getInitParams())); http://git-wip-us.apache.org/repos/asf/struts/blob/a42a1731/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java new file mode 100644 index 0000000..2c0ef9d --- /dev/null +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.struts2.tiles; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.LocaleProvider; +import com.opensymphony.xwork2.config.ConfigurationException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.struts2.ServletActionContext; +import org.apache.tiles.locale.LocaleResolver; +import org.apache.tiles.request.Request; +import org.apache.tiles.request.servlet.ServletUtil; + +import javax.servlet.http.HttpServletRequest; +import java.util.Locale; + +public class StrutsTilesLocaleResolver implements LocaleResolver { + + private static Logger LOG = LogManager.getLogger(StrutsTilesLocaleResolver.class); + + @Override + public Locale resolveLocale(Request request) { + HttpServletRequest httpRequest = ServletUtil.getServletRequest(request).getRequest(); + ActionContext ctx = ServletActionContext.getActionContext(httpRequest); + + if (ctx == null) { + LOG.error("Cannot obtain HttpServletRequest from [{}]", request.getClass().getName()); + throw new ConfigurationException("There is no ActionContext for current request!"); + } + + LocaleProvider provider = ctx.getInstance(LocaleProvider.class); + + return provider.getLocale(); + } + +}
