From: <rb...@us...> - 2018-01-28 10:17:39
|
Revision: 15100 http://sourceforge.net/p/htmlunit/code/15100 Author: rbri Date: 2018-01-28 10:17:36 +0000 (Sun, 28 Jan 2018) Log Message: ----------- chrome 64 Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-01-27 18:33:07 UTC (rev 15099) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-01-28 10:17:36 UTC (rev 15100) @@ -152,8 +152,9 @@ CHROME_FORMATS_.put("be", yyyyDash); CHROME_FORMATS_.put("en-CA", yyyyDash); - CHROME_FORMATS_.put("en-IE", mmSlash); - CHROME_FORMATS_.put("en-MT", mmSlash); + CHROME_FORMATS_.put("en-IE", ddSlash); + CHROME_FORMATS_.put("en-MT", ddSlash); + CHROME_FORMATS_.put("en-PH", ddSlash); CHROME_FORMATS_.put("es-US", ddSlash); CHROME_FORMATS_.put("fr", ddSlash); CHROME_FORMATS_.put("fr-CH", ddDot); @@ -164,10 +165,11 @@ CHROME_FORMATS_.put("iw", ddDot); CHROME_FORMATS_.put("ja-JP-u-ca-japanese", "平成yy/MM/dd"); CHROME_FORMATS_.put("lv", yyyyDotDot); + CHROME_FORMATS_.put("mk", yyyyDash); + CHROME_FORMATS_.put("nl-BE", ddSlash); CHROME_FORMATS_.put("sk", ddDotBlank); CHROME_FORMATS_.put("sq", yyyyDash); CHROME_FORMATS_.put("sr", ddDotDot); - CHROME_FORMATS_.put("mk", yyyyDash); IE_FORMATS_.put("ar", rightToLeft); IE_FORMATS_.put("ar-AE", rightToLeft); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-01-27 18:33:07 UTC (rev 15099) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-01-28 10:17:36 UTC (rev 15100) @@ -692,8 +692,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "12/20/2012", - FF = "20/12/2012", + @Alerts(DEFAULT = "20/12/2012", IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012") public void format_en_ie() throws Exception { test("new Intl.DateTimeFormat('en-IE').format(date)"); @@ -713,8 +712,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "12/20/2012", - FF = "20/12/2012", + @Alerts(DEFAULT = "20/12/2012", IE = "\u200E12\u200E/\u200E20\u200E/\u200E2012") public void format_en_mt() throws Exception { test("new Intl.DateTimeFormat('en-MT').format(date)"); @@ -734,8 +732,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "12/20/2012", - FF = "20/12/2012", + @Alerts(DEFAULT = "20/12/2012", IE = "\u200E12\u200E/\u200E20\u200E/\u200E2012") public void format_en_ph() throws Exception { test("new Intl.DateTimeFormat('en-PH').format(date)"); @@ -1409,8 +1406,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "20-12-2012", - FF52 = "20/12/2012", + @Alerts(DEFAULT = "20/12/2012", + FF45 = "20-12-2012", IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012") public void format_nl_be() throws Exception { test("new Intl.DateTimeFormat('nl-BE').format(date)"); |