diff --git a/pom.xml b/pom.xml index 2bc44116..a3775a8a 100644 --- a/pom.xml +++ b/pom.xml @@ -57,8 +57,8 @@ UTF-8 - 11 - 11 + 17 + 17 10.0.0-M2 2.16.1 diff --git a/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-in.js b/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-in.js deleted file mode 100644 index 17082e9b..00000000 --- a/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-in.js +++ /dev/null @@ -1,41 +0,0 @@ -/* Indonesian initialisation for the jQuery UI date picker plugin. */ -/* Written by Deden Fathurahman (dedenf@gmail.com). */ -/* Fixed by Denny Septian Panggabean (xamidimura@gmail.com) */ -( function( factory ) { - "use strict"; - - if ( typeof define === "function" && define.amd ) { - - // AMD. Register as an anonymous module. - define( [ "../widgets/datepicker" ], factory ); - } else { - - // Browser globals - factory( jQuery.datepicker ); - } -} )( function( datepicker ) { -"use strict"; - -datepicker.regional.id = { - closeText: "Tutup", - prevText: "Mundur", - nextText: "Maju", - currentText: "Hari ini", - monthNames: [ "Januari", "Februari", "Maret", "April", "Mei", "Juni", - "Juli", "Agustus", "September", "Oktober", "Nopember", "Desember" ], - monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "Mei", "Jun", - "Jul", "Agus", "Sep", "Okt", "Nop", "Des" ], - dayNames: [ "Minggu", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu" ], - dayNamesShort: [ "Min", "Sen", "Sel", "Rab", "Kam", "Jum", "Sab" ], - dayNamesMin: [ "Mg", "Sn", "Sl", "Rb", "Km", "Jm", "Sb" ], - weekHeader: "Mg", - dateFormat: "dd/mm/yy", - firstDay: 0, - isRTL: false, - showMonthAfterYear: false, - yearSuffix: "" }; -datepicker.setDefaults( datepicker.regional.id ); - -return datepicker.regional.id; - -} ); diff --git a/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-iw.js b/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-iw.js deleted file mode 100644 index fbe3c40c..00000000 --- a/wiquery-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-iw.js +++ /dev/null @@ -1,40 +0,0 @@ -/* Hebrew initialisation for the UI Datepicker extension. */ -/* Written by Amir Hardon (ahardon at gmail dot com). */ -( function( factory ) { - "use strict"; - - if ( typeof define === "function" && define.amd ) { - - // AMD. Register as an anonymous module. - define( [ "../widgets/datepicker" ], factory ); - } else { - - // Browser globals - factory( jQuery.datepicker ); - } -} )( function( datepicker ) { -"use strict"; - -datepicker.regional.he = { - closeText: "סגור", - prevText: "הקודם", - nextText: "הבא", - currentText: "היום", - monthNames: [ "ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני", - "יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר" ], - monthNamesShort: [ "ינו", "פבר", "מרץ", "אפר", "מאי", "יוני", - "יולי", "אוג", "ספט", "אוק", "נוב", "דצמ" ], - dayNames: [ "ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת" ], - dayNamesShort: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ], - dayNamesMin: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ], - weekHeader: "Wk", - dateFormat: "dd/mm/yy", - firstDay: 0, - isRTL: true, - showMonthAfterYear: false, - yearSuffix: "" }; -datepicker.setDefaults( datepicker.regional.he ); - -return datepicker.regional.he; - -} ); diff --git a/wiquery-jquery-ui/src/test/java/org/wicketstuff/wiquery/ui/datepicker/DatePickerLanguageResourceReferenceTestCase.java b/wiquery-jquery-ui/src/test/java/org/wicketstuff/wiquery/ui/datepicker/DatePickerLanguageResourceReferenceTestCase.java index 4b22b6c5..399f108f 100644 --- a/wiquery-jquery-ui/src/test/java/org/wicketstuff/wiquery/ui/datepicker/DatePickerLanguageResourceReferenceTestCase.java +++ b/wiquery-jquery-ui/src/test/java/org/wicketstuff/wiquery/ui/datepicker/DatePickerLanguageResourceReferenceTestCase.java @@ -6,9 +6,6 @@ import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator; import org.apache.wicket.util.lang.Packages; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.EnabledOnJre; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,8 +84,7 @@ public void testGetJsFileName() } @Test - @EnabledForJreRange(min = JRE.JAVA_17) - public void testRenamedLocales_JDK17OrLater() + public void testRenamedLocales() { assertEquals(DatePickerLanguages.INDONESIAN, DatePickerLanguages.getDatePickerLanguages(new Locale("in"))); @@ -111,22 +107,4 @@ public void testRenamedLocales_JDK17OrLater() // kz does not exist assertNotEquals(new Locale("kk"), new Locale("kz")); } - - @Test - @EnabledForJreRange(max =JRE.JAVA_16) - public void testRenamedLocales_preJava17() { - assertEquals(DatePickerLanguages.INDONESIAN, - DatePickerLanguages.getDatePickerLanguages(new Locale("in"))); - assertEquals(DatePickerLanguages.INDONESIAN, - DatePickerLanguages.getDatePickerLanguages(new Locale("id"))); - assertEquals(DatePickerLanguages.getJsFileName(DatePickerLanguages.INDONESIAN), - "i18n/datepicker-in.js"); - - assertEquals(DatePickerLanguages.HEBREW, - DatePickerLanguages.getDatePickerLanguages(new Locale("he"))); - assertEquals(DatePickerLanguages.HEBREW, - DatePickerLanguages.getDatePickerLanguages(new Locale("iw"))); - assertEquals(DatePickerLanguages.getJsFileName(DatePickerLanguages.HEBREW), - "i18n/datepicker-iw.js"); - } } \ No newline at end of file