Fixed: Time zone display for JDK17+ (OFBIZ-12721) (#676)

Use ZoneId API to get time zone display name Thanks Ioan Eugen jleroux: I did not find any timeZone.getDisplayName in in Java and Groovy files so I guess it's OK to close.
apache · Dec 5, 2023 · ca0433d · ca0433d
1 parent 9935270
commit ca0433d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,7 +86,7 @@ application {
             ? jvmArgs.tokenize()
             : ['-Xms128M','-Xmx1024M',
             '-Djdk.serialFilter=maxarray=100000;maxdepth=20;maxrefs=1000;maxbytes=500000', // OFBIZ-12592 and OFBIZ-12716
-            '--add-exports=java.base/sun.util.calendar=ALL-UNNAMED', // OFBIZ-12721
+//            '--add-exports=java.base/sun.util.calendar=ALL-UNNAMED', // OFBIZ-12721
             '--add-opens=java.base/java.util=ALL-UNNAMED' // OFBIZ-12726
             ]
 }

diff --git a/themes/flatgrey/template/Footer.ftl b/themes/flatgrey/template/Footer.ftl
@@ -18,20 +18,20 @@ under the License.
 -->
 <div id="footer">
     <ul>
-        <li class="first">${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></li>
+        <li class="first">${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.toZoneId().getDisplayName(Static["java.time.format.TextStyle"].FULL_STANDALONE, locale)}</a></li>
         <li><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${locale.getDisplayName(locale)}</a></li>
         <li class="last"><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
     </ul>
   <p>
-    <div class="poweredBy"><span class="footerTextColour">${uiLabelMap.CommonPoweredBy} 
-        <a href="http://ofbiz.apache.org" class="noicon">OFBiz </a></span><span class="footerTextColour">Copyright 2001-${nowTimestamp?string("yyyy")} 
-        <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span> 
+    <div class="poweredBy"><span class="footerTextColour">${uiLabelMap.CommonPoweredBy}
+        <a href="http://ofbiz.apache.org" class="noicon">OFBiz </a></span><span class="footerTextColour">Copyright 2001-${nowTimestamp?string("yyyy")}
+        <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span>
         <span class="footerTextColour">
             ${uiLabelMap.CommonRelease} <#include "ofbizhome://VERSION" ignore_missing=true/>
             <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
         </span>
     </div>
-  
+
   </p>
 </div>
 </div>

diff --git a/themes/helveticus/template/includes/Footer.ftl b/themes/helveticus/template/includes/Footer.ftl
@@ -18,8 +18,8 @@ under the License.
 -->
 <div id="footer-offset"></div>
 <div id="footer">
-    <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></span>
-    <span>${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} 
+    <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.toZoneId().getDisplayName(Static["java.time.format.TextStyle"].FULL_STANDALONE, locale)}</a></span>
+    <span>${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")}
         <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy}
         <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> ${uiLabelMap.CommonRelease}
         <#include "ofbizhome://VERSION" ignore_missing=true/>

diff --git a/themes/rainbowstone/template/includes/Footer.ftl b/themes/rainbowstone/template/includes/Footer.ftl
@@ -18,8 +18,8 @@ under the License.
 -->
 <div id="footer-offset"></div>
 <div id="footer">
-    <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></span>
-    <span>${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} 
+    <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.toZoneId().getDisplayName(Static["java.time.format.TextStyle"].FULL_STANDALONE, locale)}</a></span>
+    <span>${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")}
         <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy}
         <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> ${uiLabelMap.CommonRelease}
         <#include "ofbizhome://VERSION" ignore_missing=true/>

diff --git a/themes/tomahawk/template/Footer.ftl b/themes/tomahawk/template/Footer.ftl
@@ -28,7 +28,7 @@ under the License.
        <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
-  <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>
+  <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.toZoneId().getDisplayName(Static["java.time.format.TextStyle"].FULL_STANDALONE, locale)}</a>
     </li>
   </ul>
 </div>