LPS-132769 Set an attribute in request to build error forward redirec…

…t using properly i18n locale.
liferay · Jun 23, 2021 · d6b61ef · d6b61ef
1 parent bad87c0
commit d6b61ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/portal-impl/src/com/liferay/portal/servlet/I18nServlet.java b/portal-impl/src/com/liferay/portal/servlet/I18nServlet.java
@@ -162,6 +162,10 @@ protected I18nData getI18nData(HttpServletRequest httpServletRequest)
 
 		String path = GetterUtil.getString(httpServletRequest.getPathInfo());
 
+		Locale i18nLocale = LocaleUtil.fromLanguageId(i18nLanguageId);
+
+		String i18nPath = StringPool.SLASH + i18nLocale.toLanguageTag();
+
 		if (Validator.isNull(path)) {
 			path = "/";
 		}
@@ -178,6 +182,9 @@ protected I18nData getI18nData(HttpServletRequest httpServletRequest)
 					friendlyURL);
 
 				if (siteGroup == null) {
+					httpServletRequest.setAttribute(
+						WebKeys.I18N_ERROR_PATH, i18nPath);
+
 					return null;
 				}
 
@@ -186,10 +193,6 @@ protected I18nData getI18nData(HttpServletRequest httpServletRequest)
 			}
 		}
 
-		Locale i18nLocale = LocaleUtil.fromLanguageId(i18nLanguageId);
-
-		String i18nPath = StringPool.SLASH + i18nLocale.toLanguageTag();
-
 		if (siteDefaultLocale == null) {
 			if (PropsValues.LOCALE_USE_DEFAULT_IF_NOT_AVAILABLE) {
 				siteDefaultLocale = PortalUtil.getSiteDefaultLocale(siteGroup);

diff --git a/portal-kernel/src/com/liferay/portal/kernel/util/WebKeys.java b/portal-kernel/src/com/liferay/portal/kernel/util/WebKeys.java
@@ -204,6 +204,8 @@ public interface WebKeys {
 
 	public static final String HTTPS_INITIAL = "HTTPS_INITIAL";
 
+	public static final String I18N_ERROR_PATH = "I18N_ERROR_PATH";
+
 	public static final String I18N_LANGUAGE_CODE = "I18N_LANGUAGE_CODE";
 
 	public static final String I18N_LANGUAGE_ID = "I18N_LANGUAGE_ID";