[ofbiz-framework] branch trunk updated: Fixed: jquery.ui.datepicker-en.js does not exist (OFBIZ-12071)

[James Yong-2]

This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 283752f  Fixed: jquery.ui.datepicker-en.js does not exist (OFBIZ-12071)
283752f is described below

commit 283752fd265b59a3a007e06780a2c1d580cb0cee
Author: James Yong <[hidden email]>
AuthorDate: Sat Nov 28 21:26:47 2020 +0800

    Fixed: jquery.ui.datepicker-en.js does not exist (OFBIZ-12071)
   
    Default language file specified for DateTime doesn't exist in the project i.e.
    /common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js
   
    Changed to /common/js/jquery/plugins/datetimepicker/i18n/jquery-ui-timepicker-en.js
---
 .../java/org/apache/ofbiz/common/JsLanguageFilesMapping.java | 12 ++++++------
 themes/common-theme/template/JsLanguageFilesMapping.ftl      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
index 2d6b06b..96c858f 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
@@ -31,7 +31,7 @@ public final class JsLanguageFilesMapping {
 
     public static class DateJs {
 
-        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static Map<String, String> localeFiles = new HashMap<>();
         private static String defaultDateJs = "/common/js/jquery/plugins/datejs/date-en-US.js";
 
         static {
@@ -206,7 +206,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class JQuery {
-        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static Map<String, String> localeFiles = new HashMap<>();
         private static String defaultDateJs = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
 
         static {
@@ -381,7 +381,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class Validation {
-        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static Map<String, String> localeFiles = new HashMap<>();
         private static String defaultValidation = "/common/js/jquery/plugins/validate/localization/messages_en.js";
 
         static {
@@ -555,8 +555,8 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class DateTime {
-        private static Map<String, String> localeFiles = new HashMap<String, String>();
-        private static String defaultDateTime = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
+        private static Map<String, String> localeFiles = new HashMap<>();
+        private static String defaultDateTime = "/common/js/jquery/plugins/datetimepicker/i18n/jquery-ui-timepicker-en.js";
 
         static {
             localeFiles.put("sq", "/common/js/jquery/plugins/datetimepicker/i18n/jquery-ui-timepicker-sq.js");
@@ -729,7 +729,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class Select2 {
-        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static Map<String, String> localeFiles = new HashMap<>();
         private static String defaultSelect2 = "/common/js/jquery/plugins/select2/js/i18n/en.js";
 
         static {
diff --git a/themes/common-theme/template/JsLanguageFilesMapping.ftl b/themes/common-theme/template/JsLanguageFilesMapping.ftl
index 8009f32..ab1f3f9 100644
--- a/themes/common-theme/template/JsLanguageFilesMapping.ftl
+++ b/themes/common-theme/template/JsLanguageFilesMapping.ftl
@@ -93,7 +93,7 @@ public final class JsLanguageFilesMapping {
 
     public static class DateTime {
         private static Map<String, String> localeFiles = new HashMap<>();
-        private static String defaultDateTime = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
+        private static String defaultDateTime = "/common/js/jquery/plugins/datetimepicker/i18n/jquery-ui-timepicker-en.js";
 
         static {
             <#list dateTime.keySet() as dateTimeFiles>