From 31ee676637775ca21e77f1dde5068274446d6204 Mon Sep 17 00:00:00 2001
From: yhuang <unknown>
Date: Wed, 2 Apr 2014 00:42:40 -0700
Subject: [PATCH] 8017142: Time display for Spanish(Chile, Ecuador ) locale
 doesn't show 24-hour format Reviewed-by: okutsu

---
 .../text/resources/es/FormatData_es_CL.java    | 10 +++++-----
 .../text/resources/es/FormatData_es_EC.java    | 10 +++++-----
 test/sun/text/resources/LocaleData             | 18 ++++++++++--------
 test/sun/text/resources/LocaleDataTest.java    |  1 +
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/share/classes/sun/text/resources/es/FormatData_es_CL.java b/src/share/classes/sun/text/resources/es/FormatData_es_CL.java
index 87805df3a..49396af7f 100644
--- a/src/share/classes/sun/text/resources/es/FormatData_es_CL.java
+++ b/src/share/classes/sun/text/resources/es/FormatData_es_CL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,10 +57,10 @@ public class FormatData_es_CL extends ParallelListResourceBundle {
             },
             { "TimePatterns",
                 new String[] {
-                    "hh:mm:ss a z", // full time pattern
-                    "hh:mm:ss a z", // long time pattern
-                    "hh:mm:ss a", // medium time pattern
-                    "hh:mm a", // short time pattern
+                    "HH:mm:ss zzzz", // full time pattern
+                    "H:mm:ss z", // long time pattern
+                    "H:mm:ss", // medium time pattern
+                    "H:mm", // short time pattern
                 }
             },
             { "DatePatterns",
diff --git a/src/share/classes/sun/text/resources/es/FormatData_es_EC.java b/src/share/classes/sun/text/resources/es/FormatData_es_EC.java
index a5283df03..76ef82c6a 100644
--- a/src/share/classes/sun/text/resources/es/FormatData_es_EC.java
+++ b/src/share/classes/sun/text/resources/es/FormatData_es_EC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,10 +72,10 @@ public class FormatData_es_EC extends ParallelListResourceBundle {
             },
             { "TimePatterns",
                 new String[] {
-                    "hh:mm:ss a z", // full time pattern
-                    "hh:mm:ss a z", // long time pattern
-                    "hh:mm:ss a", // medium time pattern
-                    "hh:mm a", // short time pattern
+                    "HH:mm:ss zzzz", // full time pattern
+                    "H:mm:ss z", // long time pattern
+                    "H:mm:ss", // medium time pattern
+                    "H:mm", // short time pattern
                 }
             },
             { "DatePatterns",
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index afd66e140..c015be51f 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -431,10 +431,6 @@ CurrencyNames/es_CL/CLP=Ch$
 FormatData/es_CL/NumberPatterns/0=#,##0.###;-#,##0.###
 # FormatData/es_CL/NumberPatterns/1=Ch$#,##0.00;Ch$-#,##0.00 # Changed; see bug 4122840
 FormatData/es_CL/NumberPatterns/2=#,##0%
-FormatData/es_CL/TimePatterns/0=hh:mm:ss a z
-FormatData/es_CL/TimePatterns/1=hh:mm:ss a z
-FormatData/es_CL/TimePatterns/2=hh:mm:ss a
-FormatData/es_CL/TimePatterns/3=hh:mm a
 FormatData/es_CL/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
 FormatData/es_CL/DatePatterns/1=d' de 'MMMM' de 'yyyy
 FormatData/es_CL/DatePatterns/2=dd-MM-yyyy
@@ -498,10 +494,6 @@ FormatData/es_EC/NumberPatterns/0=#,##0.###;-#,##0.###
 FormatData/es_EC/NumberPatterns/2=#,##0%
 #changed for 4945388
 CurrencyNames/es_EC/USD=$
-FormatData/es_EC/TimePatterns/0=hh:mm:ss a z
-FormatData/es_EC/TimePatterns/1=hh:mm:ss a z
-FormatData/es_EC/TimePatterns/2=hh:mm:ss a
-FormatData/es_EC/TimePatterns/3=hh:mm a
 FormatData/es_EC/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
 FormatData/es_EC/DatePatterns/1=d' de 'MMMM' de 'yyyy
 FormatData/es_EC/DatePatterns/2=dd/MM/yyyy
@@ -7693,3 +7685,13 @@ LocaleNames/sv/ZA=Sydafrika
 
 # bug 8027695
 FormatData/sv_SE/NumberPatterns/2=#,##0 %
+
+# bug 8017142
+FormatData/es_CL/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_CL/TimePatterns/1=H:mm:ss z
+FormatData/es_CL/TimePatterns/2=H:mm:ss
+FormatData/es_CL/TimePatterns/3=H:mm
+FormatData/es_EC/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_EC/TimePatterns/1=H:mm:ss z
+FormatData/es_EC/TimePatterns/2=H:mm:ss
+FormatData/es_EC/TimePatterns/3=H:mm
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index 1c9aa5b75..7381bb61d 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -36,6 +36,7 @@
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
  *      7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
+ *      8017142
  * @summary Verify locale data
  *
  */
-- 
GitLab