diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java index b1ac82934..25f69b9e9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java @@ -39,7 +39,6 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; -import org.lastaflute.web.util.LaRequestUtil; /** * @author shinsuke @@ -274,7 +273,7 @@ public class AdminFileauthAction extends FessAdminAction { protected void registerProtocolSchemeItems(final RenderData data) { final List> itemList = new ArrayList<>(); - final Locale locale = LaRequestUtil.getRequest().getLocale(); + final Locale locale = ComponentUtil.getRequestManager().getUserLocale(); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_samba"), Constants.SAMBA)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_ftp"), Constants.FTP)); RenderDataUtil.register(data, "protocolSchemeItems", itemList); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java index a3ae52600..c49bb1a2c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java @@ -132,7 +132,7 @@ public class ListForm implements SearchRequestParams { @Override public Locale getLocale() { - return LaRequestUtil.getRequest().getLocale(); + return ComponentUtil.getRequestManager().getUserLocale(); } @Override diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java index d5bf12954..e3b2da713 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java @@ -39,7 +39,6 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; -import org.lastaflute.web.util.LaRequestUtil; /** * @author shinsuke @@ -275,7 +274,7 @@ public class AdminWebauthAction extends FessAdminAction { protected void registerProtocolSchemeItems(final RenderData data) { final List> itemList = new ArrayList<>(); - final Locale locale = LaRequestUtil.getRequest().getLocale(); + final Locale locale = ComponentUtil.getRequestManager().getUserLocale(); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_ntlm"), Constants.NTLM)); diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java index 2e5c0f3cf..49369cf65 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java @@ -41,6 +41,7 @@ import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.helper.UserInfoHelper; import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.thumbnail.ThumbnailManager; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.optional.OptionalThing; import org.lastaflute.web.login.LoginManager; import org.lastaflute.web.response.ActionResponse; @@ -118,7 +119,7 @@ public abstract class FessSearchAction extends FessBaseAction { runtime.registerData("labelTypeItems", labelTypeItems); runtime.registerData("displayLabelTypeItems", labelTypeItems != null && !labelTypeItems.isEmpty()); - Locale locale = request.getLocale(); + Locale locale = ComponentUtil.getRequestManager().getUserLocale(); if (locale == null) { locale = Locale.ENGLISH; } diff --git a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java index 5bcee9909..a397372f6 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java @@ -129,7 +129,7 @@ public class SearchForm implements SearchRequestParams { @Override public Locale getLocale() { - return LaRequestUtil.getRequest().getLocale(); + return ComponentUtil.getRequestManager().getUserLocale(); } @Override diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java index 9af946513..7c7b9aaac 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java @@ -21,7 +21,6 @@ import org.codelibs.fess.es.config.bsentity.BsCrawlingInfoParam; import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.optional.OptionalEntity; -import org.lastaflute.web.util.LaRequestUtil; /** * @author ESFlute (using FreeGen) @@ -59,7 +58,7 @@ public class CrawlingInfoParam extends BsCrawlingInfoParam { } public String getKeyMsg() { - final Locale locale = LaRequestUtil.getRequest().getLocale(); + final Locale locale = ComponentUtil.getRequestManager().getUserLocale(); final String message = ComponentUtil.getMessageManager().getMessage(locale, "labels.crawling_info_" + getKey()); if (message == null || message.startsWith("???")) { return getKey(); diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 655483640..aebc60804 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -50,7 +50,6 @@ import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.TypicalAction; import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.servlet.request.RequestManager; -import org.lastaflute.web.util.LaRequestUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -176,19 +175,15 @@ public class SystemHelper { public String getHelpLink(final String name) { final String url = ComponentUtil.getFessConfig().getOnlineHelpBaseLink() + name + "-guide.html"; - return LaRequestUtil - .getOptionalRequest() - .map(request -> { - final Locale locale = request.getLocale(); - if (locale != null) { - final String lang = locale.getLanguage(); - if (ComponentUtil.getFessConfig().isOnlineHelpSupportedLang(lang)) { - return url.replaceFirst("\\{lang\\}", lang).replaceFirst("\\{version\\}", - Constants.MAJOR_VERSION + "." + Constants.MINOR_VERSION); - } - } - return getDefaultHelpLink(url); - }).orElse(getDefaultHelpLink(url)); + final Locale locale = ComponentUtil.getRequestManager().getUserLocale(); + if (locale != null) { + final String lang = locale.getLanguage(); + if (ComponentUtil.getFessConfig().isOnlineHelpSupportedLang(lang)) { + return url.replaceFirst("\\{lang\\}", lang).replaceFirst("\\{version\\}", + Constants.MAJOR_VERSION + "." + Constants.MINOR_VERSION); + } + } + return getDefaultHelpLink(url); } protected String getDefaultHelpLink(final String url) { diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index e272bfc11..19e9878e2 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -317,7 +317,7 @@ public class ViewHelper { } public String getPagePath(final String page) { - final Locale locale = LaRequestUtil.getRequest().getLocale(); + final Locale locale = ComponentUtil.getRequestManager().getUserLocale(); final String lang = locale.getLanguage(); final String country = locale.getCountry(); @@ -378,7 +378,7 @@ public class ViewHelper { final FileTemplateLoader loader = new FileTemplateLoader(ResourceUtil.getViewTemplatePath().toFile()); final Handlebars handlebars = new Handlebars(loader); - Locale locale = LaRequestUtil.getRequest().getLocale(); + Locale locale = ComponentUtil.getRequestManager().getUserLocale(); if (locale == null) { locale = Locale.ENGLISH; }