From 3059ac945f67478a9977ff623c4dfa681872b332 Mon Sep 17 00:00:00 2001 From: Scott Russell Date: Tue, 21 Jan 2014 20:58:03 +0000 Subject: [PATCH] ICU-10650 53m1 BRS task - updates for non-ascii code in C X-SVN-Rev: 34953 --- .../samples/dtitvfmtsample/dtitvfmtsample.cpp | 24 ++------------ .../samples/dtptngsample/dtptngsample.cpp | 31 +------------------ icu4c/source/test/cintltst/cdattst.c | 4 +-- icu4c/source/test/cintltst/udatpg_test.c | 4 +-- 4 files changed, 8 insertions(+), 55 deletions(-) diff --git a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp index 1d2e57255ff..e35ad450b9b 100644 --- a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp +++ b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp @@ -1,5 +1,5 @@ -/******************************************************************************** -* Copyright (C) 2008-2013, International Business Machines Corporation and +/****************************************************************************** +* Copyright (C) 2008-2014, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -70,15 +70,6 @@ static void dtitvfmtPreDefined() { i++; } u_fclose(out); - //! [dtitvfmtPreDefined] -/* output of the sample code: - ********************************************************************************************************************************************************* - Skeleton from to Date Interval in en_US Date Interval in Ja - yMMMd 2007-10-10 10:10:10 2008-10-10 10:10:10 Nov 10, 2007 – Nov 10, 2008 2007年11月10日～2008年11月10日 - MMMMd 2008-10-10 10:10:10 2008-11-10 10:10:10 November 10 – December 10 11月10日～12月10日 - jm 2008-11-10 10:10:10 2008-11-10 15:10:10 10:10 AM – 3:10 PM 10:10～15:10 - - *********************************************************************************************************************************************************/ } static void dtitvfmtCustomized() { @@ -138,15 +129,6 @@ static void dtitvfmtCustomized() { } } u_fclose(out); - //! [dtitvfmtCustomized] -/* output of the sample code: - *************************************************************************************************************************************************************** - Skeleton from to Date Interval in en_US Date Interval in Ja - yMMMd 2007-10-10 10:10:10 2007-11-10 10:10:10 2007 Diff Oct 10 --- Nov 10 2007 Diff 10月 10 --- 11月 10 - yMMMd 2007-11-10 10:10:10 2007-11-10 22:10:10 Nov 10, 2007 2007年11月10 - Hm 2007-10-10 10:10:10 2007-11-10 10:10:10 10/10/2007, 10:10 ~~~ 11/10/2007, 10:10 2007/10/10 10:10 ~~~ 2007/11/10 10:10 - Hm 2007-11-10 10:10:10 2007-11-10 22:10:10 2007 Nov 10 10:10 ~ 22:10 2007 11月 10 10:10 ~ 22:10 - ***************************************************************************************************************************************************************/ } int main (int argc, char* argv[]) @@ -154,4 +136,4 @@ int main (int argc, char* argv[]) dtitvfmtPreDefined(); dtitvfmtCustomized(); return 0; -} \ No newline at end of file +} diff --git a/icu4c/source/samples/dtptngsample/dtptngsample.cpp b/icu4c/source/samples/dtptngsample/dtptngsample.cpp index 84123885271..2b20e973297 100644 --- a/icu4c/source/samples/dtptngsample/dtptngsample.cpp +++ b/icu4c/source/samples/dtptngsample/dtptngsample.cpp @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2008-2013, International Business Machines Corporation and + * Copyright (c) 2008-2014, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ //! [getBestPatternExample1] @@ -67,22 +67,6 @@ static void getBestPatternExample() { /* close the file resource */ u_fclose(f); delete cal; - //! [getBestPatternExample] - /* output of the sample code: - *********************************************************************************************************** - Skeleton en_US fr_FR zh_CN - - yQQQQ 4th quarter 1999 4e trimestre 1999 1999年第四季度 - - yMMMM October 1999 octobre 1999 1999年10月 - - MMMMd October 13 13 octobre 10月13日 - - hhmm 11:58 PM 11:58 PM 下午11:58 - - jjmm 11:58 PM 23:58 下午11:58 - - ************************************************************************************************************/ } static void addPatternExample() { @@ -167,19 +151,6 @@ static void replaceFieldTypesExample() { delete cal; u_fclose(out); - //! [replaceFieldTypesExample] - /* output of the sample code: - ************************************************************************************************* - Pattern before replacement: - EEEE d MMMM y HH:mm:ss zzzz - Date/Time format in fr_FR: - jeudi 14 octobre 1999 05:58:59 heure avancée d’Europe centrale - Pattern after replacement: - EEEE d MMMM y HH:mm:ss vvvv - Date/Time format in fr_FR: - jeudi 14 octobre 1999 05:58:59 heure de l’Europe centrale - - *************************************************************************************************/ } int main (int argc, char* argv[]) diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c index 13ac0c52ecb..7591efe37d4 100644 --- a/icu4c/source/test/cintltst/cdattst.c +++ b/icu4c/source/test/cintltst/cdattst.c @@ -1396,8 +1396,8 @@ static const UChar yesterday_enDefault[] = { 0x79,0x65,0x73,0x74,0x65,0x72,0x64, static const UChar yesterday_enTitle[] = { 0x59,0x65,0x73,0x74,0x65,0x72,0x64,0x61,0x79,0 }; /* "Yesterday" sentence-begin, uiListOrMenu, standalone */ static const UChar today_nbDefault[] = { 0x69,0x20,0x64,0x61,0x67,0 }; /* "i dag" */ static const UChar today_nbTitle[] = { 0x49,0x20,0x64,0x61,0x67,0 }; /* "I dag" sentence-begin, standalone */ -static const UChar yesterday_nbDefault[] = { 0x69,0x20,0x67,0xE5,0x72,0 }; /* "i går" */ -static const UChar yesterday_nbTitle[] = { 0x49,0x20,0x67,0xE5,0x72,0 }; /* "I går" sentence-begin, standalone */ +static const UChar yesterday_nbDefault[] = { 0x69,0x20,0x67,0xE5,0x72,0 }; +static const UChar yesterday_nbTitle[] = { 0x49,0x20,0x67,0xE5,0x72,0 }; typedef struct { const char * locale; diff --git a/icu4c/source/test/cintltst/udatpg_test.c b/icu4c/source/test/cintltst/udatpg_test.c index cf8e0b0bd9e..930455c41dc 100644 --- a/icu4c/source/test/cintltst/udatpg_test.c +++ b/icu4c/source/test/cintltst/udatpg_test.c @@ -119,8 +119,8 @@ typedef struct { static const AppendItemNameData appendItemNameData[] = { /* for Finnish */ { UDATPG_YEAR_FIELD, {0x0076,0x0075,0x006F,0x0073,0x0069,0} }, /* "vuosi" */ { UDATPG_MONTH_FIELD, {0x006B,0x0075,0x0075,0x006B,0x0061,0x0075,0x0073,0x0069,0} }, /* "kuukausi" */ - { UDATPG_WEEKDAY_FIELD, {0x0076,0x0069,0x0069,0x006B,0x006F,0x006E,0x0070,0x00E4,0x0069,0x0076,0x00E4,0} }, /* "viikonpäivä" */ - { UDATPG_DAY_FIELD, {0x0070,0x00E4,0x0069,0x0076,0x00E4,0} }, /* "päivä" */ + { UDATPG_WEEKDAY_FIELD, {0x0076,0x0069,0x0069,0x006B,0x006F,0x006E,0x0070,0x00E4,0x0069,0x0076,0x00E4,0} }, + { UDATPG_DAY_FIELD, {0x0070,0x00E4,0x0069,0x0076,0x00E4,0} }, { UDATPG_HOUR_FIELD, {0x0074,0x0075,0x006E,0x0074,0x0069,0} }, /* "tunti" */ { UDATPG_FIELD_COUNT, {0} } /* terminator */ };