bug-1636984-append-item-dayperiod-fractional-seconds.diff (4539B)
1 # Add <appendItem> entries for "DayPeriod" and "FractionalSeconds" to avoid the 2 # "├ ┤" parentheses from ICU and instead use the normal "( )" parentheses. 3 # 4 # CLDR bug: https://unicode-org.atlassian.net/browse/CLDR-13184 5 6 diff --git a/intl/icu/source/data/locales/root.txt b/intl/icu/source/data/locales/root.txt 7 --- a/intl/icu/source/data/locales/root.txt 8 +++ b/intl/icu/source/data/locales/root.txt 9 @@ -1283,17 +1283,19 @@ root{ 10 } 11 NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} 12 NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} 13 appendItems{ 14 Day{"{0} ({2}: {1})"} 15 + DayPeriod{"{0} ({2}: {1})"} 16 Day-Of-Week{"{0} {1}"} 17 Era{"{1} {0}"} 18 Hour{"{0} ({2}: {1})"} 19 Minute{"{0} ({2}: {1})"} 20 Month{"{0} ({2}: {1})"} 21 Quarter{"{0} ({2}: {1})"} 22 Second{"{0} ({2}: {1})"} 23 + FractionalSecond{"{0} ({2}: {1})"} 24 Timezone{"{0} {1}"} 25 Week{"{0} ({2}: {1})"} 26 Year{"{1} {0}"} 27 } 28 availableFormats{ 29 @@ -1833,17 +1835,19 @@ root{ 30 } 31 NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} 32 NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} 33 appendItems{ 34 Day{"{0} ({2}: {1})"} 35 + DayPeriod{"{0} ({2}: {1})"} 36 Day-Of-Week{"{0} {1}"} 37 Era{"{1} {0}"} 38 Hour{"{0} ({2}: {1})"} 39 Minute{"{0} ({2}: {1})"} 40 Month{"{0} ({2}: {1})"} 41 Quarter{"{0} ({2}: {1})"} 42 Second{"{0} ({2}: {1})"} 43 + FractionalSecond{"{0} ({2}: {1})"} 44 Timezone{"{0} {1}"} 45 Week{"{0} ({2}: {1})"} 46 Year{"{1} {0}"} 47 } 48 availableFormats{ 49 @@ -2113,17 +2117,19 @@ root{ 50 "yMMMd", 51 "yMMdd", 52 } 53 appendItems{ 54 Day{"{0} ({2}: {1})"} 55 + DayPeriod{"{0} ({2}: {1})"} 56 Day-Of-Week{"{0} {1}"} 57 Era{"{1} {0}"} 58 Hour{"{0} ({2}: {1})"} 59 Minute{"{0} ({2}: {1})"} 60 Month{"{0} ({2}: {1})"} 61 Quarter{"{0} ({2}: {1})"} 62 Second{"{0} ({2}: {1})"} 63 + FractionalSecond{"{0} ({2}: {1})"} 64 Timezone{"{0} {1}"} 65 Week{"{0} ({2}: {1})"} 66 Year{"{1} {0}"} 67 } 68 availableFormats{ 69 @@ -2694,17 +2700,19 @@ root{ 70 } 71 NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} 72 NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} 73 appendItems{ 74 Day{"{0} ({2}: {1})"} 75 + DayPeriod{"{0} ({2}: {1})"} 76 Day-Of-Week{"{0} {1}"} 77 Era{"{1} {0}"} 78 Hour{"{0} ({2}: {1})"} 79 Minute{"{0} ({2}: {1})"} 80 Month{"{0} ({2}: {1})"} 81 Quarter{"{0} ({2}: {1})"} 82 Second{"{0} ({2}: {1})"} 83 + FractionalSecond{"{0} ({2}: {1})"} 84 Timezone{"{0} {1}"} 85 Week{"{0} ({2}: {1})"} 86 Year{"{1} {0}"} 87 } 88 availableFormats{ 89 diff --git a/intl/icu/source/i18n/dtptngen.cpp b/intl/icu/source/i18n/dtptngen.cpp 90 --- a/intl/icu/source/i18n/dtptngen.cpp 91 +++ b/intl/icu/source/i18n/dtptngen.cpp 92 @@ -259,12 +259,12 @@ static const dtTypeElem dtTypes[] = { 93 {0, UDATPG_FIELD_COUNT, 0, 0, 0} , // last row of dtTypes[] 94 }; 95 96 static const char* const CLDR_FIELD_APPEND[] = { 97 "Era", "Year", "Quarter", "Month", "Week", "*", "Day-Of-Week", 98 - "*", "*", "Day", "*", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J 99 - "Hour", "Minute", "Second", "*", "Timezone" 100 + "*", "*", "Day", "DayPeriod", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J 101 + "Hour", "Minute", "Second", "FractionalSecond", "Timezone" 102 }; 103 104 static const char* const CLDR_FIELD_NAME[UDATPG_FIELD_COUNT] = { 105 "era", "year", "quarter", "month", "week", "weekOfMonth", "weekday", 106 "dayOfYear", "weekdayOfMonth", "day", "dayperiod", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J