This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 7096cbc6a6 Use client locale for directory listings
7096cbc6a6 is described below
commit 7096cbc6a69c774611797d5895be844af18d9d85
Author: remm <r...@apache.org>
AuthorDate: Wed Nov 20 16:20:14 2024 +0100
Use client locale for directory listings
---
java/org/apache/catalina/servlets/DefaultServlet.java | 9 ++++-----
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index c5e4c5a2c8..6a4826e7e5 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1661,6 +1661,9 @@ public class DefaultServlet extends HttpServlet {
StringBuilder sb = new StringBuilder();
+ // Get the right strings
+ StringManager sm =
StringManager.getManager(DefaultServlet.class.getPackageName(),
request.getLocales());
+
String directoryWebappPath = resource.getWebappPath();
WebResource[] entries = resources.listResources(directoryWebappPath);
@@ -1669,11 +1672,7 @@ public class DefaultServlet extends HttpServlet {
// Render the page header
sb.append("<!doctype html>\r\n");
- sb.append("<html>\r\n");
- /*
- * TODO Activate this as soon as we use smClient with the request
locales
- * sb.append("<!doctype html><html lang=\"");
sb.append(smClient.getLocale().getLanguage()).append("\">\r\n");
- */
+ sb.append("<html
lang=\"").append(sm.getLocale().getLanguage()).append("\">\r\n");
sb.append("<head>\r\n");
sb.append("<title>");
sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a45429dc1..4cfede5059 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,9 @@
a value set to <code>true</code>. The ETag generated will be a SHA-1
checksum of the resource content. (remm)
</add>
+ <fix>
+ Use client locale for directory listings. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
