X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/d25163bfc042dbef00577180ee21dd3460fc3715..249c4c5ea9376c24572daf9c2effa7484a282f14:/icuSources/test/testdata/format.txt

diff --git a/icuSources/test/testdata/format.txt b/icuSources/test/testdata/format.txt
index 9d905c02..2cd8e895 100644
--- a/icuSources/test/testdata/format.txt
+++ b/icuSources/test/testdata/format.txt
@@ -1,4 +1,6 @@
-// Copyright (c) 2007-2014 International Business Machines
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+// Copyright (c) 2007-2015 International Business Machines
 // Corporation and others. All Rights Reserved.
 format:table(nofallback) {
     Info {
@@ -117,13 +119,13 @@ format:table(nofallback) {
                     "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0",
                     "Monday, October 8, 2012 at 11:59:00 PM GMT"
                },
-               // normal formats, combined using ", "
+               // normal formats, combined using 'at'
                {
                     "en_US@calendar=gregorian",         
                     "GMT",
                     "DATE=RELATIVE_MEDIUM,TIME=SHORT",
                     "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0",
-                    "Oct 8, 2012, 11:59 PM"
+                    "Oct 8, 2012 at 11:59 PM"
                },
                // formats with relative day, combined using 'at'
                {
@@ -133,13 +135,13 @@ format:table(nofallback) {
                     "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time
                     "yesterday at 5:00:00 PM GMT"
                },
-               // formats with relative day, combined using ", "
+               // formats with relative day, combined using 'at'
                {
                     "en_US@calendar=gregorian",         
                     "GMT",
                     "DATE=RELATIVE_MEDIUM,TIME=SHORT",
                     "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time
-                    "yesterday, 5:00 PM"
+                    "yesterday at 5:00 PM"
                },
                // normal formats that have quoted literals, combined
                {
@@ -155,14 +157,14 @@ format:table(nofallback) {
                     "GMT",
                     "DATE=RELATIVE_LONG,TIME=MEDIUM",
                     "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0",
-                    "23:59:00 Ngày 08 tháng 10 năm 2012"
+                    "23:59:00 ngày 8 tháng 10, 2012"
                },
                {
                     "vi@calendar=gregorian",         
                     "GMT",
                     "DATE=RELATIVE_LONG,TIME=MEDIUM",
                     "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time
-                    "17:00:00 hôm qua"
+                    "17:00:00 Hôm qua"
                },
                // el combines formats using hyphen
                {
@@ -492,35 +494,35 @@ format:table(nofallback) {
                     "",
                     "PATTERN=G y",
                     "YEAR=8",
-                    "Heisei 8"
+                    "Reiwa 8"
                },
                {
                     "en_US@calendar=japanese",         
                     "",
                     "PATTERN=G yy",
                     "YEAR=8",
-                    "Heisei 08"
+                    "Reiwa 08"
                },
                {
                     "en_US@calendar=japanese",         
                     "",
                     "PATTERN=G yyy",
                     "YEAR=8",
-                    "Heisei 008"
+                    "Reiwa 008"
                },
                {
                     "en_US@calendar=japanese",         
                     "",
                     "PATTERN=G yyyy",
                     "YEAR=8",
-                    "Heisei 0008"
+                    "Reiwa 0008"
                },
                {
                     "en_US@calendar=japanese",         
                     "",
                     "PATTERN=G yyyyy",
                     "YEAR=8",
-                    "Heisei 00008"
+                    "Reiwa 00008"
                },
 
             }