@@ -1003,7 +1003,7 @@ DateFormatTest::TestBadInput135()
10031003 dataerrln (" could not create date time instance" );
10041004 return ;
10051005 }
1006- UnicodeString expected (u" March 1, 2000 at 1:23:45\u202F AM " , -1 );
1006+ UnicodeString expected (u" March 1, 2000 at 1:23:45 AM " , -1 );
10071007 for (int32_t i = 0 ; i < strings_length;++i) {
10081008 const char * text = strings[i];
10091009 for (int32_t j = 0 ; j < looks_length;++j) {
@@ -1342,7 +1342,7 @@ DateFormatTest::TestLocaleDateFormat() // Bug 495
13421342 DateFormat::FULL , Locale::getUS ());
13431343 UnicodeString expectedFRENCH ( u" lundi 15 septembre 1997 à 00:00:00 heure d’été du Pacifique nord-américain" , -1 );
13441344 expectedFRENCH = expectedFRENCH.unescape ();
1345- UnicodeString expectedUS ( u" Monday, September 15, 1997 at 12:00:00\u202F AM Pacific Daylight Time" , -1 );
1345+ UnicodeString expectedUS ( u" Monday, September 15, 1997 at 12:00:00 AM Pacific Daylight Time" , -1 );
13461346 logln (UnicodeString (" Date set to : " ) + dateToString (testDate));
13471347 UnicodeString out;
13481348 if (dfUS == nullptr || dfFrench == nullptr ){
@@ -5028,7 +5028,7 @@ void DateFormatTest::TestPatternFromSkeleton() {
50285028 const char16_t * const pattern;
50295029 } TESTDATA [] = {
50305030 // Ticket #11985
5031- {Locale::getEnglish (), " jjmm" , u" h:mm\u202F a " },
5031+ {Locale::getEnglish (), " jjmm" , u" h:mm a " },
50325032 {Locale::getEnglish (), " JJmm" , u" hh:mm" },
50335033 {Locale::getGerman (), " jjmm" , u" HH:mm" },
50345034 {Locale::getGerman (), " JJmm" , u" HH:mm" },
@@ -5851,23 +5851,23 @@ void DateFormatTest::TestHourCycle() {
58515851 UnicodeString expectedResult;
58525852 } TEST_CASES [] = {
58535853 // test some locales for which we have data
5854- { " en-us" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
5855- { " en-ca" , u" Tuesday, March 16, 1943 at 3:45:32 p.m." },
5854+ { " en-us" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
5855+ { " en-ca" , u" Tuesday, March 16, 1943 at 3:45:32 p.m." },
58565856 { " en-gb" , u" Tuesday, 16 March 1943 at 15:45:32" },
5857- { " en-au" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5857+ { " en-au" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
58585858 // test a couple locales for which we don't have specific locale files (we should still get the correct hour cycle)
58595859 { " en-co" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
58605860 { " en-mx" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
58615861 // test that the rg subtag does the right thing
58625862 { " en-us-u-rg-gbzzzz" , u" Tuesday, March 16, 1943 at 15:45:32" },
58635863 { " en-us-u-rg-cazzzz" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
58645864 { " en-ca-u-rg-uszzzz" , u" Tuesday, March 16, 1943 at 3:45:32 p.m." },
5865- { " en-gb-u-rg-uszzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5866- { " en-gb-u-rg-cazzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5867- { " en-gb-u-rg-auzzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5865+ { " en-gb-u-rg-uszzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5866+ { " en-gb-u-rg-cazzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5867+ { " en-gb-u-rg-auzzzz" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
58685868 // test that the hc ("hours") subtag does the right thing
58695869 { " en-us-u-hc-h23" , u" Tuesday, March 16, 1943 at 15:45:32" },
5870- { " en-gb-u-hc-h12" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
5870+ { " en-gb-u-hc-h12" , u" Tuesday, 16 March 1943 at 3:45:32 pm" },
58715871 // test that the rg and hc subtags do the right thing when used together
58725872 { " en-us-u-rg-gbzzzz-hc-h12" , u" Tuesday, March 16, 1943 at 3:45:32 PM" },
58735873 { " en-gb-u-rg-uszzzz-hc-h23" , u" Tuesday, 16 March 1943 at 15:45:32" },
0 commit comments