fix #2544 Add lang attribute.

codelibs · Jan 18, 2025 · 568d15a · 568d15a
1 parent 1b5e44f
commit 568d15a
Show file tree

Hide file tree

Showing 24 changed files with 69 additions and 44 deletions.
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -56,6 +56,7 @@
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.util.LdiURLUtil;
+import org.lastaflute.web.LastaWebKey;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
@@ -99,6 +100,18 @@ protected FessFunctions() {
         // nothing
     }
 
+    public static String html(final boolean isOpen) {
+        if (isOpen) {
+            return "<html lang=\"" + LaRequestUtil.getOptionalRequest().map(req -> {
+                if (req.getAttribute(LastaWebKey.USER_LOCALE_KEY) instanceof Locale locale) {
+                    return locale;
+                }
+                return Locale.ENGLISH;
+            }).orElse(Locale.ENGLISH).getLanguage() + "\">";
+        }
+        return "</html>";
+    }
+
     public static Boolean labelExists(final String value) {
         return LaRequestUtil.getOptionalRequest().map(req -> {
             @SuppressWarnings("unchecked")

diff --git a/src/main/webapp/WEB-INF/fe.tld b/src/main/webapp/WEB-INF/fe.tld
@@ -11,6 +11,18 @@
   <short-name>fe</short-name>
   <uri>fess.tags.functions</uri>
 
+  <function>
+    <description>
+      Print HTML tag.
+    </description>
+    <name>html</name>
+    <function-class>org.codelibs.fess.taglib.FessFunctions</function-class>
+    <function-signature>java.lang.String html(boolean)</function-signature>
+    <example>
+      ${fe:html(true)}...${fe:html(false)}
+    </example>
+  </function>
+
   <function>
     <description>
       Returns a label name.

diff --git a/src/main/webapp/WEB-INF/orig/view/advance.jsp b/src/main/webapp/WEB-INF/orig/view/advance.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -323,4 +323,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/advance.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
 <% try{ %>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -31,5 +31,5 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
 <% }catch(Exception e){session.invalidate();} %>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/error.jsp b/src/main/webapp/WEB-INF/orig/view/error/error.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -35,4 +35,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp b/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -33,4 +33,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/error/system.jsp b/src/main/webapp/WEB-INF/orig/view/error/system.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
 <% try{ %>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -31,5 +31,5 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
 <% }catch(Exception e){session.invalidate();} %>
diff --git a/src/main/webapp/WEB-INF/orig/view/help.jsp b/src/main/webapp/WEB-INF/orig/view/help.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -33,4 +33,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -173,4 +173,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/login/index.jsp b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -79,4 +79,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/login.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/login/newpassword.jsp b/src/main/webapp/WEB-INF/orig/view/login/newpassword.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -78,4 +78,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/login.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -89,4 +89,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/profile.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/orig/view/search.jsp b/src/main/webapp/WEB-INF/orig/view/search.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -155,4 +155,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/advance.jsp b/src/main/webapp/WEB-INF/view/advance.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -323,4 +323,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/advance.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/view/error/badRequest.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
 <% try{ %>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -31,5 +31,5 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
 <% }catch(Exception e){session.invalidate();} %>
diff --git a/src/main/webapp/WEB-INF/view/error/error.jsp b/src/main/webapp/WEB-INF/view/error/error.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -35,4 +35,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -33,4 +33,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
 <% try{ %>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -31,5 +31,5 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
 <% }catch(Exception e){session.invalidate();} %>
diff --git a/src/main/webapp/WEB-INF/view/help.jsp b/src/main/webapp/WEB-INF/view/help.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -33,4 +33,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -173,4 +173,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -79,4 +79,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/login.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/login/newpassword.jsp b/src/main/webapp/WEB-INF/view/login/newpassword.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -78,4 +78,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/login.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/profile/index.jsp b/src/main/webapp/WEB-INF/view/profile/index.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -89,4 +89,4 @@
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/profile.js')}"></script>
 </body>
-</html>
+${fe:html(false)}
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
@@ -1,5 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
+${fe:html(true)}
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -155,4 +155,4 @@
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
-</html>
+${fe:html(false)}