organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-22189 Merge maint/maint-72 to main (#2235)

Browse source
This commit is contained in:
Shane F. Carr 2022-10-20 13:53:44 -07:00 • committed by GitHub
commit 649c5f0176
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 435 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
docs/processes/release/tasks/docs.md
View file

@ -311,7 +311,7 @@ and make sure ICU4J adequately covers the JDK API for the classes we replicate.
---
## Build API documentations
## Build API documentation
### **ICU4C**
@ -329,8 +329,8 @@ javadoc files. Create icu4c-X_X_X-docs.zip
3. The generated API docs are in <path>/icu4c/source/doc/html/<br>
`cd <path>/icu4c/source/doc/html/`
4. Create a zip file, e.g.,<br>
`tar cvfz /tmp/icu4c641.tar.gz * # '641' needs to be replaced by the respective release label.`
5. ~~Upload this zip file to the GitHub release page. For the live API docs, see below.~~
`tar cvfz /tmp/icu4c72rc.tar.gz * # Note: label the file apropriately for the release.
#### Create a PR for ICU4C docs using the docs zip file
@ -340,25 +340,29 @@ javadoc files. Create icu4c-X_X_X-docs.zip
b. Create and switch to a feature branch based of the latest `main`. Ex: `git checkout -b ICU-<TICKET-NUMBER>`.
c. Copy the zip file into your local copy of icu-docs into `apidoc/released/icu4c`
(or `apidoc/dev/icu4c` if not a release)
c. Go to the directory for the version of interest, either
`apidoc/dev/icu4c` (release candicate) or `apidoc/released/icu4c`
(general release.)
d. Unzip the file, replacing all documentation. Ex: `tar xvfz /tmp/icu4c641.tar.gz`
d. Be sure that you are in the right directory. Then, remove all the files
in this directory, e.g., `rm -rf *`. (Remember "git restore" is a good friend!)
e. Unzip the tar file from above, replacing all documentation. Ex: `tar xvfz /tmp/icu4c72rc.tar.gz`
e. Remove the zip file
e. Remove the zip file if it's in the folder.
f. `git add .`
f. `git add .`. Note that this may remove some old files. That's correct behavior.
g. `git commit -m "ICU-<TICKET-NUMBER> Update ICU4C API reference docs for
h. `git commit -m "ICU-<TICKET-NUMBER> Update ICU4C API reference docs for
XX.Y"`<br>
Example: [ICU-21546 Update ICU4C API reference docs for 69.1](https://github.com/unicode-org/icu-docs/pull/25)
h. `git push origin ICU-<TICKET-NUMBER>`
i. `git push origin ICU-<TICKET-NUMBER>`
i. Create Pull Request from your personal github fork of icu-docs from your newly-pushed branch `ICU-<TICKET-NUMBER>` with a destination of
j. Create Pull Request from your personal github fork of icu-docs from your newly-pushed branch `ICU-<TICKET-NUMBER>` with a destination of
the `unicode-org/icu-docs` repo's `main` branch
j. Request review
k. Request a review and submit the PR when approved.
Note: This is also referenced below [Upload API documentations](docs.md#upload-api-documentations) for how to make the API docs public.

2
docs/userguide/locale/resources.md
View file

@ -635,7 +635,7 @@ root {
}
}
// This resource is a table, thus accessible only through iteration and indexes...
// This resource is an array, thus accessible only through iteration and indexes...
errors {
"Invalid Command",
"Bad Value",

82
icu4c/APIChangeReport.html
View file

@ -310,6 +310,86 @@
</tr>
</THEAD>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">Builder icu::DisplayOptions::copyToBuilder() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setCapitalization(UDisplayOptionsCapitalization)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setDisplayLength(UDisplayOptionsDisplayLength)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setGrammaticalCase(UDisplayOptionsGrammaticalCase)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setNameStyle(UDisplayOptionsNameStyle)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setNounClass(UDisplayOptionsNounClass)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setPluralCategory(UDisplayOptionsPluralCategory)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">Builder&amp; icu::DisplayOptions::Builder::setSubstituteHandling(UDisplayOptionsSubstituteHandling)</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">DisplayOptions icu::DisplayOptions::Builder::build()</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">DisplayOptions&amp; icu::DisplayOptions::operator=(DisplayOptions&amp;&amp;) noexcept=default</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">DisplayOptions&amp; icu::DisplayOptions::operator=(const DisplayOptions&amp;)=default</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsCapitalization icu::DisplayOptions::getCapitalization() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsDisplayLength icu::DisplayOptions::getDisplayLength() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsGrammaticalCase icu::DisplayOptions::getGrammaticalCase() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsNameStyle icu::DisplayOptions::getNameStyle() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsNounClass icu::DisplayOptions::getNounClass() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsPluralCategory icu::DisplayOptions::getPluralCategory() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto">UDisplayOptionsSubstituteHandling icu::DisplayOptions::getSubstituteHandling() const</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">displayoptions.h</td><td class="proto">icu::DisplayOptions::DisplayOptions(const DisplayOptions&amp;)=default</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row0">
<td class="file">displayoptions.h</td><td class="proto"><tt>static</tt> Builder icu::DisplayOptions::builder()</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
<tr class="row1">
<td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit icu::MeasureUnit::getQuarter()</td><td class="">(missing)</td><td>Draft<br>
<span class=""><span>ICU 72</span></span></td>
</tr>
@ -642,7 +722,7 @@
<a href="#_top">(jump back to top)</a>
<hr>
<p>
<i><font size="-1">Contents generated by StableAPI tool on Thu Sep 22 13:25:10 PDT 2022<br>
<i><font size="-1">Contents generated by StableAPI tool on Thu Oct 06 11:06:39 PDT 2022<br>
Copyright &copy; 2017 and later: Unicode, Inc. and others.<br>
License &amp; terms of use: http://www.unicode.org/copyright.html
</font></i>

22
icu4c/APIChangeReport.md
View file

@ -117,6 +117,26 @@ Added in ICU 72
| File | API | ICU 71 | ICU 72 |
|---|---|---|---|
| displayoptions.h | Builder icu::DisplayOptions::copyToBuilder() const | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setCapitalization(UDisplayOptionsCapitalization) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setDisplayLength(UDisplayOptionsDisplayLength) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setGrammaticalCase(UDisplayOptionsGrammaticalCase) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setNameStyle(UDisplayOptionsNameStyle) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setNounClass(UDisplayOptionsNounClass) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setPluralCategory(UDisplayOptionsPluralCategory) | (missing) | DraftICU 72
| displayoptions.h | Builder&amp; icu::DisplayOptions::Builder::setSubstituteHandling(UDisplayOptionsSubstituteHandling) | (missing) | DraftICU 72
| displayoptions.h | DisplayOptions icu::DisplayOptions::Builder::build() | (missing) | DraftICU 72
| displayoptions.h | DisplayOptions&amp; icu::DisplayOptions::operator=(DisplayOptions&amp;&amp;) noexcept=default | (missing) | DraftICU 72
| displayoptions.h | DisplayOptions&amp; icu::DisplayOptions::operator=(const DisplayOptions&amp;)=default | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsCapitalization icu::DisplayOptions::getCapitalization() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsDisplayLength icu::DisplayOptions::getDisplayLength() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsGrammaticalCase icu::DisplayOptions::getGrammaticalCase() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsNameStyle icu::DisplayOptions::getNameStyle() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsNounClass icu::DisplayOptions::getNounClass() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsPluralCategory icu::DisplayOptions::getPluralCategory() const | (missing) | DraftICU 72
| displayoptions.h | UDisplayOptionsSubstituteHandling icu::DisplayOptions::getSubstituteHandling() const | (missing) | DraftICU 72
| displayoptions.h | icu::DisplayOptions::DisplayOptions(const DisplayOptions&amp;)=default | (missing) | DraftICU 72
| displayoptions.h | <tt>static</tt> Builder icu::DisplayOptions::builder() | (missing) | DraftICU 72
| measunit.h | <tt>static</tt> MeasureUnit icu::MeasureUnit::getQuarter() | (missing) | DraftICU 72
| measunit.h | <tt>static</tt> MeasureUnit icu::MeasureUnit::getTonne() | (missing) | DraftICU 72
| measunit.h | <tt>static</tt> MeasureUnit* icu::MeasureUnit::createQuarter(UErrorCode&amp;) | (missing) | DraftICU 72
@ -211,7 +231,7 @@ This section shows cases where the signature was "simplified" for the sake of co
## Colophon
Contents generated by StableAPI tool on Thu Sep 22 13:25:27 PDT 2022
Contents generated by StableAPI tool on Thu Oct 06 11:06:50 PDT 2022
Copyright © 2019 and later: Unicode, Inc. and others.
License & terms of use: http://www.unicode.org/copyright.html

2
icu4c/source/common/ucurr.cpp
View file

@ -1951,6 +1951,7 @@ static const struct CurrencyList {
{"SHP", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SIT", UCURR_COMMON|UCURR_DEPRECATED},
{"SKK", UCURR_COMMON|UCURR_DEPRECATED},
{"SLE", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SLL", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SOS", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SRD", UCURR_COMMON|UCURR_NON_DEPRECATED},
@ -1988,6 +1989,7 @@ static const struct CurrencyList {
{"UYW", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"UZS", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VEB", UCURR_COMMON|UCURR_DEPRECATED},
{"VED", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"VEF", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VES", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VND", UCURR_COMMON|UCURR_NON_DEPRECATED},

2
icu4c/source/common/unicode/ubiditransform.h
View file

@ -28,7 +28,7 @@
/**
* \file
* \brief Bidi Transformations
* \brief C API: Bidi Transformations
*/
/**

4
icu4c/source/common/unicode/ucnv_cb.h
View file

@ -15,8 +15,8 @@
*/
/**
* \file
* \brief C UConverter functions to aid the writers of callbacks
* \file
* \brief C API: UConverter functions to aid the writers of callbacks
*
* <h2> Callback API for UConverter </h2>
*

2
icu4c/source/common/unicode/ucnv_err.h
View file

@ -12,7 +12,7 @@
/**
* \file
* \brief C UConverter predefined error callbacks
* \brief C API: UConverter predefined error callbacks
*
* <h2>Error Behaviour Functions</h2>
* Defines some error behaviour functions called by ucnv_{from,to}Unicode

1
icu4c/source/common/unicode/ucnvsel.h
View file

@ -36,6 +36,7 @@
/**
* \file
* \brief C API: Encoding/charset encoding selector
*
* A converter selector is built with a set of encoding/charset names
* and given an input string returns the set of names of the

3
icu4c/source/common/unicode/ucpmap.h
View file

@ -13,8 +13,7 @@ U_CDECL_BEGIN
/**
* \file
*
* This file defines an abstract map from Unicode code points to integer values.
* \brief C API: This file defines an abstract map from Unicode code points to integer values.
*
* @see UCPMap
* @see UCPTrie

3
icu4c/source/common/unicode/ucptrie.h
View file

@ -19,8 +19,7 @@ U_CDECL_BEGIN
/**
* \file
*
* This file defines an immutable Unicode code point trie.
* \brief C API: This file defines an immutable Unicode code point trie.
*
* @see UCPTrie
* @see UMutableCPTrie

4
icu4c/source/common/unicode/uloc.h
View file

@ -26,9 +26,9 @@
#include "unicode/utypes.h"
#include "unicode/uenum.h"
/**
/**
* \file
* \brief C API: Locale
* \brief C API: Locale ID functionality similar to C++ class Locale
*
* <h2> ULoc C API for Locale </h2>
* A <code>Locale</code> represents a specific geographical, political,

4
icu4c/source/common/unicode/umisc.h
View file

@ -21,9 +21,9 @@
/**
* \file
* \brief C API:misc definitions
* \brief C API: Miscellaneous definitions
*
* This file contains miscellaneous definitions for the C APIs.
* This file contains miscellaneous definitions for the C APIs.
*/
U_CDECL_BEGIN

3
icu4c/source/common/unicode/umutablecptrie.h
View file

@ -21,8 +21,7 @@ U_CDECL_BEGIN
/**
* \file
*
* This file defines a mutable Unicode code point trie.
* \brief C API: This file defines a mutable Unicode code point trie.
*
* @see UCPTrie
* @see UMutableCPTrie

1
icu4c/source/data/curr/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

2
icu4c/source/data/curr/hr.txt
View file

@ -376,7 +376,7 @@ hr{
"etiopski bir",
}
EUR{
"EUR",
"€",
"euro",
}
FIM{

9
icu4c/source/data/curr/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/curr/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

15
icu4c/source/data/curr/supplementalData.txt
View file

@ -1939,12 +1939,23 @@ supplementalData:table(nofallback){
}
}
HR{
{
from:intvector{
389,
1788921856,
}
id{"EUR"}
}
{
from:intvector{
179,
1456854016,
}
id{"HRK"}
to:intvector{
389,
-1210045441,
}
}
{
from:intvector{
@ -3773,8 +3784,8 @@ supplementalData:table(nofallback){
}
id{"SLL"}
to:intvector{
387,
-1778510849,
391,
974987263,
}
}
{

1
icu4c/source/data/lang/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/lang/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/lang/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/locales/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

6
icu4c/source/data/locales/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

19
icu4c/source/data/misc/metaZones.txt
View file

@ -305,9 +305,7 @@ metaZones:table(nofallback){
EG{"Africa/Cairo"}
FI{"Europe/Helsinki"}
GR{"Europe/Athens"}
JO{"Asia/Amman"}
LB{"Asia/Beirut"}
SY{"Asia/Damascus"}
}
Europe_Further_Eastern{
001{"Europe/Minsk"}
@ -2839,6 +2837,8 @@ metaZones:table(nofallback){
"Asia:Amman"{
{
"Europe_Eastern",
"1970-01-01 00:00",
"2022-10-27 22:00",
}
}
"Asia:Anadyr"{
@ -3026,6 +3026,8 @@ metaZones:table(nofallback){
"Asia:Damascus"{
{
"Europe_Eastern",
"1970-01-01 00:00",
"2022-10-27 21:00",
}
}
"Asia:Dhaka"{
@ -4133,16 +4135,11 @@ metaZones:table(nofallback){
{
"Moscow",
"1970-01-01 00:00",
"1990-06-30 23:00",
}
{
"Europe_Central",
"1990-06-30 23:00",
"1991-03-31 02:00",
"1990-06-30 22:00",
}
{
"Europe_Eastern",
"1991-03-31 02:00",
"1990-06-30 22:00",
"9999-12-31 23:59",
}
}
@ -4202,11 +4199,11 @@ metaZones:table(nofallback){
{
"Moscow",
"1970-01-01 00:00",
"1991-03-30 23:00",
"1990-06-30 22:00",
}
{
"Europe_Eastern",
"1991-03-30 23:00",
"1990-06-30 22:00",
"9999-12-31 23:59",
}
}

2
icu4c/source/data/misc/supplementalData.txt
View file

@ -4526,7 +4526,6 @@ supplementalData:table(nofallback){
"SDP",
"SIT",
"SKK",
"SLE",
"SRG",
"STD",
"SUR",
@ -4695,6 +4694,7 @@ supplementalData:table(nofallback){
"SEK",
"SGD",
"SHP",
"SLE",
"SLL",
"SOS",
"SRD",

108
icu4c/source/data/misc/zoneinfo64.txt
View file

@ -3,17 +3,17 @@
// License & terms of use: http://www.unicode.org/copyright.html
//---------------------------------------------------------
// Build tool: tz2icu
// Build date: Thu Sep 15 17:54:12 2022
// Build date: Wed Oct 12 16:48:13 2022
// tz database: ftp://ftp.iana.org/tz/
// tz version: 2022b
// ICU version: 72.0.1
// tz version: 2022e
// ICU version: 72.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
TZVersion { "2022b" }
TZVersion { "2022e" }
Zones:array {
/* ACT */ :int { 356 } //Z#0
/* AET */ :int { 368 } //Z#1
@ -292,7 +292,7 @@ zoneinfo64:table(nofallback) {
/* America/Bahia_Banderas */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288508400, 1301817600, 1319958000 }
typeOffsets:intvector { -25260, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 }
typeMap:bin { "0204020402040201020302030203020302030203020302030203020302030203020302030205040504" }
typeMap:bin { "0204020302040201020302030203020302030203020302030203020302030203020302030205040504" }
finalRule { "Mexico" }
finalRaw:int { -21600 }
finalYear:int { 2012 }
@ -377,7 +377,7 @@ zoneinfo64:table(nofallback) {
/* America/Chihuahua */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600 }
typeOffsets:intvector { -25460, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 }
typeMap:bin { "0103010301030403040302010201020102010201" }
typeMap:bin { "0103010201030403040302010201020102010201" }
finalRule { "Mexico" }
finalRaw:int { -25200 }
finalYear:int { 2003 }
@ -532,7 +532,7 @@ zoneinfo64:table(nofallback) {
/* America/Hermosillo */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 }
typeOffsets:intvector { -26632, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0 }
typeMap:bin { "020402040204020102030203020302" }
typeMap:bin { "020402030204020102030203020302" }
} //Z#130
/* America/Indiana/Indianapolis */ :table {
transPre32:intvector { -1, 1577320096 }
@ -710,7 +710,7 @@ zoneinfo64:table(nofallback) {
} //Z#158
/* America/Matamoros */ :table {
trans:intvector { -1514743200, 576057600, 594198000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1268553600, 1289113200 }
typeOffsets:intvector { -24000, 0, -21600, 0, -21600, 3600 }
typeOffsets:intvector { -23400, 0, -21600, 0, -21600, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "US" }
finalRaw:int { -21600 }
@ -719,7 +719,7 @@ zoneinfo64:table(nofallback) {
/* America/Mazatlan */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600 }
typeOffsets:intvector { -25540, 0, -28800, 0, -25200, 0, -25200, 3600, -21600, 0 }
typeMap:bin { "0204020402040201020302030203020302030203020302" }
typeMap:bin { "0204020302040201020302030203020302030203020302" }
finalRule { "Mexico" }
finalRaw:int { -25200 }
finalYear:int { 2003 }
@ -754,8 +754,8 @@ zoneinfo64:table(nofallback) {
} //Z#164
/* America/Mexico_City */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -975261600, -963169200, -917114400, -907354800, -821901600, -810068400, -627501600, -612990000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000 }
typeOffsets:intvector { -23796, 0, -25200, 0, -21600, 0, -21600, 3600 }
typeMap:bin { "01020102010203020302030203020302030203020302030203020302" }
typeOffsets:intvector { -23796, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 }
typeMap:bin { "01030102010304030403040304030403040304030403040304030403" }
finalRule { "Mexico" }
finalRaw:int { -21600 }
finalYear:int { 2003 }
@ -867,7 +867,7 @@ zoneinfo64:table(nofallback) {
/* America/Ojinaga */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800 }
typeOffsets:intvector { -25060, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 }
typeMap:bin { "010301030103040304030201020102010201020102010201020102010201020102010201" }
typeMap:bin { "010301020103040304030201020102010201020102010201020102010201020102010201" }
finalRule { "US" }
finalRaw:int { -25200 }
finalYear:int { 2011 }
@ -1058,7 +1058,7 @@ zoneinfo64:table(nofallback) {
finalYear:int { 2008 }
} //Z#216
/* America/Tijuana */ :table {
trans:intvector { -1514736000, -1451667600, -1343062800, -1234803600, -1222963200, -1207242000, -873820800, -761677200, -686073600, -661539600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 }
trans:intvector { -1514739600, -1451667600, -1343062800, -1234803600, -1222963200, -1207242000, -873820800, -761677200, -686073600, -661539600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 }
typeOffsets:intvector { -28084, 0, -28800, 0, -28800, 3600, -25200, 0 }
typeMap:bin { "03010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "US" }
@ -1178,11 +1178,8 @@ zoneinfo64:table(nofallback) {
} //Z#240
/* Asia/Amman */ :table {
trans:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000, 1175205600, 1193349600, 1206655200, 1225404000, 1238104800, 1256853600, 1269554400, 1288303200, 1301608800, 1319752800, 1333058400, 1387486800, 1395957600, 1414706400, 1427407200, 1446156000, 1459461600, 1477605600, 1490911200, 1509055200, 1522360800, 1540504800, 1553810400, 1571954400, 1585260000, 1604008800, 1616709600, 1635458400, 1645740000, 1666908000 }
typeOffsets:intvector { 8624, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Jordan" }
finalRaw:int { 7200 }
finalYear:int { 2023 }
typeOffsets:intvector { 8624, 0, 7200, 0, 7200, 3600, 10800, 0 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" }
} //Z#241
/* Asia/Anadyr */ :table {
trans:intvector { -1441194596, -1247572800, 354884400, 370692000, 386420400, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 }
@ -1270,12 +1267,9 @@ zoneinfo64:table(nofallback) {
} //Z#261
/* Asia/Dacca */ :int { 264 } //Z#262
/* Asia/Damascus */ :table {
trans:intvector { -1577931912, -1568592000, -1554080400, -1537142400, -1522630800, -1505692800, -1491181200, -1474243200, -1459126800, -242265600, -228877200, -210556800, -197427600, -178934400, -165718800, -147398400, -134269200, -116467200, -102646800, -84326400, -71110800, -52704000, -39488400, -21168000, -7952400, 10368000, 23583600, 41904000, 55119600, 73526400, 86742000, 105062400, 118278000, 136598400, 149814000, 168134400, 181350000, 199756800, 212972400, 231292800, 241916400, 262828800, 273452400, 418694400, 433810800, 450316800, 465433200, 508896000, 529196400, 541555200, 562633200, 574387200, 594255600, 607305600, 623199600, 638928000, 654649200, 670456800, 686264400, 702684000, 717886800, 733096800, 748904400, 765151200, 780958800, 796687200, 812494800, 828309600, 844117200, 859759200, 875653200, 891208800, 907189200, 922917600, 938725200, 954540000, 970347600, 986076000, 1001883600, 1017612000, 1033419600, 1049148000, 1064955600, 1080770400, 1096578000, 1112306400, 1128114000, 1143842400, 1158872400, 1175205600, 1193950800, 1207260000, 1225486800, 1238104800, 1256850000, 1270159200, 1288299600, 1301608800, 1319749200, 1333058400, 1351198800 }
typeOffsets:intvector { 8712, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Syria" }
finalRaw:int { 7200 }
finalYear:int { 2013 }
trans:intvector { -1577931912, -1568592000, -1554080400, -1537142400, -1522630800, -1505692800, -1491181200, -1474243200, -1459126800, -242265600, -228877200, -210556800, -197427600, -178934400, -165718800, -147398400, -134269200, -116467200, -102646800, -84326400, -71110800, -52704000, -39488400, -21168000, -7952400, 10368000, 23583600, 41904000, 55119600, 73526400, 86742000, 105062400, 118278000, 136598400, 149814000, 168134400, 181350000, 199756800, 212972400, 231292800, 241916400, 262828800, 273452400, 418694400, 433810800, 450316800, 465433200, 508896000, 529196400, 541555200, 562633200, 574387200, 594255600, 607305600, 623199600, 638928000, 654649200, 670456800, 686264400, 702684000, 717886800, 733096800, 748904400, 765151200, 780958800, 796687200, 812494800, 828309600, 844117200, 859759200, 875653200, 891208800, 907189200, 922917600, 938725200, 954540000, 970347600, 986076000, 1001883600, 1017612000, 1033419600, 1049148000, 1064955600, 1080770400, 1096578000, 1112306400, 1128114000, 1143842400, 1158872400, 1175205600, 1193950800, 1207260000, 1225486800, 1238104800, 1256850000, 1270159200, 1288299600, 1301608800, 1319749200, 1333058400, 1351198800, 1364508000, 1382648400, 1395957600, 1414702800, 1427407200, 1446152400, 1458856800, 1477602000, 1490911200, 1509051600, 1522360800, 1540501200, 1553810400, 1571950800, 1585260000, 1604005200, 1616709600, 1635454800, 1648159200, 1666904400 }
typeOffsets:intvector { 8712, 0, 7200, 0, 7200, 3600, 10800, 0 }
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" }
} //Z#263
/* Asia/Dhaka */ :table {
transPre32:intvector { -1, 1770423996 }
@ -1310,22 +1304,22 @@ zoneinfo64:table(nofallback) {
} //Z#268
/* Asia/Gaza */ :table {
transPre32:intvector { -1, 2109557424 }
trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666908000 }
trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1679702400, 1698447600 }
typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Palestine" }
finalRaw:int { 7200 }
finalYear:int { 2023 }
finalYear:int { 2024 }
} //Z#269
/* Asia/Harbin */ :int { 315 } //Z#270
/* Asia/Hebron */ :table {
transPre32:intvector { -1, 2109557273 }
trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666908000 }
trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1679702400, 1698447600 }
typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Palestine" }
finalRaw:int { 7200 }
finalYear:int { 2023 }
finalYear:int { 2024 }
} //Z#271
/* Asia/Ho_Chi_Minh */ :table {
trans:intvector { -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 }
@ -2096,7 +2090,7 @@ zoneinfo64:table(nofallback) {
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
links:intvector { 462, 464 }
links:intvector { 462, 464, 494, 502 }
} //Z#464
/* Europe/Lisbon */ :table {
trans:intvector { -1830384000, -1689555600, -1677801600, -1667437200, -1647738000, -1635814800, -1616202000, -1604365200, -1584666000, -1572742800, -1553043600, -1541206800, -1521507600, -1442451600, -1426813200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922669200, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -623282400, -607557600, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, 212544000, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@ -2242,15 +2236,7 @@ zoneinfo64:table(nofallback) {
typeOffsets:intvector { 11616, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "030506050605060506050605060506050605040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050305" }
} //Z#493
/* Europe/Uzhgorod */ :table {
transPre32:intvector { -1, 1794027544 }
trans:intvector { -938905200, -857257200, -844556400, -828226800, -812502000, -794714400, -773456400, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 646786800, 670384800, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846378000, 859683600, 877827600 }
typeOffsets:intvector { 5352, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
typeMap:bin { "01020102010201050605060506050605060506050605060506050103040304030403040304030403" }
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
} //Z#494
/* Europe/Uzhgorod */ :int { 464 } //Z#494
/* Europe/Vaduz */ :int { 503 } //Z#495
/* Europe/Vatican */ :int { 481 } //Z#496
/* Europe/Vienna */ :table {
@ -2286,15 +2272,7 @@ zoneinfo64:table(nofallback) {
links:intvector { 500, 597 }
} //Z#500
/* Europe/Zagreb */ :int { 445 } //Z#501
/* Europe/Zaporozhye */ :table {
transPre32:intvector { -1, 1454818056 }
trans:intvector { -1441160400, -1247536800, -894769200, -857257200, -844556400, -828226800, -826419600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686091600, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846378000, 859683600, 877827600 }
typeOffsets:intvector { 8440, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 8400, 0, 10800, 0, 10800, 3600 }
typeMap:bin { "050306020102010607060706070607060706070607060706070607060403040304030403040304030403" }
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
} //Z#502
/* Europe/Zaporozhye */ :int { 464 } //Z#502
/* Europe/Zurich */ :table {
transPre32:intvector { -1, 619768448, -1, 1909720710 }
trans:intvector { -904435200, -891129600, -872985600, -859680000, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@ -2937,48 +2915,42 @@ zoneinfo64:table(nofallback) {
Haiti:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
} //_#12
Jordan:intvector {
1, -29, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
} //_#13
LH:intvector {
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
} //_#14
} //_#13
Lebanon:intvector {
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
} //_#15
} //_#14
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#16
} //_#15
Moldova:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
} //_#17
} //_#16
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
} //_#18
} //_#17
Palestine:intvector {
2, 25, -1, 0, 0, 9, 23, -6, 3600, 0, 3600
} //_#19
2, -30, -7, 7200, 0, 9, -30, -7, 7200, 0, 3600
} //_#18
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
} //_#20
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
} //_#21
} //_#19
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#22
} //_#20
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
} //_#23
} //_#21
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
} //_#24
} //_#22
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
} //_#25
} //_#23
Zion:intvector {
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#26
} //_#24
}
Regions:array {
"AU", //Z#0 ACT

1
icu4c/source/data/region/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/region/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/region/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

4
icu4c/source/data/region/so.txt
View file

@ -300,12 +300,12 @@ so{
}
Countries%short{
GB{"UK"}
PS{"Palestine (translation hint: Warning, see info panel on right.)"}
PS{"Falastiin"}
}
Countries%variant{
CD{"Jamhuuriyadda Dimuqaadiga Kongo"}
CG{"Jamhuuriyadda Kongo"}
CI{"Ivory Coast (translation hint: Warning, see info panel on right.)"}
CI{"Côte d’Ivoire"}
CZ{"Jamhuuriyadda Jek"}
FK{"Jasiiradaha Fookland"}
NZ{"Aotearoa New Zealand"}

1
icu4c/source/data/unit/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/unit/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/unit/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/zone/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/zone/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/zone/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

6
icu4c/source/data/zone/yo.txt
View file

@ -592,12 +592,6 @@ yo{
lg{"Àkókò Ìwọ̀ oorùn Greenland"}
ls{"Àkókò Àfẹnukò Ìwọ̀ Oòrùn Greenland"}
}
"meta:Gulf"{
ls{
"Gulf Standard Time [translation hint: translate as just \u0022Gulf T"
"ime\u0022]"
}
}
"meta:Guyana"{
ls{"Àkókò Gúyànà"}
}

9
icu4c/source/i18n/unicode/displayoptions.h
View file

@ -10,6 +10,13 @@
#if !UCONFIG_NO_FORMATTING
/**
* \file
* \brief C++ API: Display options class
*
* This class is designed as a more modern version of the UDisplayContext mechanism.
*/
#include "unicode/udisplayoptions.h"
#include "unicode/uversion.h"
@ -31,7 +38,7 @@ U_NAMESPACE_BEGIN
* .setGrammaticalCase(UDISPOPT_GRAMMATICAL_CASE_DATIVE)
* .setPluralCategory(UDISPOPT_PLURAL_CATEGORY_FEW)
* .build();
*```
* ```
*
* @draft ICU 72
*/

2
icu4c/source/i18n/unicode/regex.h
View file

@ -22,7 +22,7 @@
/**
* \file
* \brief C++ API: Regular Expressions
* \brief C++ API: Regular Expressions
*
* The ICU API for processing regular expressions consists of two classes,
* `RegexPattern` and `RegexMatcher`.

13
icu4c/source/i18n/unicode/udisplayoptions.h
View file

@ -8,6 +8,14 @@
#if !UCONFIG_NO_FORMATTING
/**
* \file
* \brief C API: Display options (enum types, values, helper functions)
*
* These display options are designed to be used in class DisplayOptions
* as a more modern version of the UDisplayContext mechanism.
*/
#include "unicode/uversion.h"
#ifndef U_HIDE_DRAFT_API
@ -111,8 +119,9 @@ U_CAPI const char * U_EXPORT2
udispopt_getPluralCategoryIdentifier(UDisplayOptionsPluralCategory pluralCategory);
/**
* @param keyword for example "few" or "other"
* @return the plural category corresponding to the keyword, or `UDISPOPT_PLURAL_CATEGORY_UNDEFINED`
* @param identifier for example "few" or "other"
* @return the plural category corresponding to the identifier (plural keyword),
* or `UDISPOPT_PLURAL_CATEGORY_UNDEFINED`
*
* @draft ICU 72
*/

2
icu4c/source/i18n/unicode/unumberformatter.h
View file

@ -16,7 +16,7 @@
/**
* \file
* \brief C-compatible API for localized number formatting; not recommended for C++.
* \brief C API: Localized number formatting; not recommended for C++.
*
* This is the C-compatible version of the NumberFormatter API introduced in ICU 60. C++ users should
* include unicode/numberformatter.h and use the proper C++ APIs.

2
icu4c/source/i18n/unicode/unumberrangeformatter.h
View file

@ -17,7 +17,7 @@
/**
* \file
* \brief C-compatible API for localized number range formatting.
* \brief C API: Localized number range formatting
*
* This is the C-compatible version of the NumberRangeFormatter API. C++ users
* should include unicode/numberrangeformatter.h and use the proper C++ APIs.

2
icu4c/source/i18n/unicode/uspoof.h
View file

@ -35,7 +35,7 @@
/**
* \file
* \brief Unicode Security and Spoofing Detection, C API.
* \brief C API: Unicode Security and Spoofing Detection
*
* <p>
* This class, based on <a href="http://unicode.org/reports/tr36">Unicode Technical Report #36</a> and

21
icu4c/source/test/cintltst/crestst.c
View file

@ -1069,12 +1069,27 @@ static void TestAlgorithmicParentFallback(void) {
// or sr_Latn to root, but all of these resource bundle files actually exist in the project
};
// fallbacks to "root" in the table above actually fall back to the system default locale.
// Trying to compare the locale ID from the resource bundle we get back to uloc_getDefault()
// has all kinds of problems, so instead we open a resource bundle with a locale ID that we know
// will fall back to the default, save THAT resource bundle's locale ID, and just compare anything
// that's supposed to fall back to "root" to THAT. (If trying to determine the default locale
// in this way fails for some reason, we dump out and don't do the rest of the test.)
UErrorCode err = U_ZERO_ERROR;
UResourceBundle* defaultLocaleRB = ures_open(NULL, "xx_YY", &err);
const char* defaultLocaleID = ures_getLocaleByType(defaultLocaleRB, ULOC_ACTUAL_LOCALE, &err);
if (U_FAILURE(err)) {
log_err("Couldn't create resource bundle for default locale: %s\n", u_errorName(err));
return;
}
// (can't close defaultLocaleRB here because then defaultLocaleID would go bad)
for (int32_t i = 0; i < UPRV_LENGTHOF(testCases); i += 3) {
const char* testLocale = testCases[i];
const char* regularExpected = testCases[i + 1];
const char* noDefaultExpected = testCases[i + 2];
UErrorCode err = U_ZERO_ERROR;
err = U_ZERO_ERROR;
UResourceBundle* regularRB = ures_open(NULL, testLocale, &err);
char errorMessage[200];
@ -1086,8 +1101,7 @@ static void TestAlgorithmicParentFallback(void) {
if (assertSuccess(errorMessage, &err)) {
sprintf(errorMessage, "Mismatch for locale %s and URES_OPEN_LOCALE_DEFAULT_ROOT", testLocale);
if (uprv_strcmp(regularExpected, "root") == 0) {
// (the system default locale may have keywords-- just check if the resource locale (which won't) is a prefix of the system default)
assertTrue(errorMessage, uprv_strncmp(uloc_getDefault(), resourceLocale, uprv_strlen(resourceLocale)) == 0);
assertEquals(errorMessage, defaultLocaleID, resourceLocale);
} else {
assertEquals(errorMessage, regularExpected, resourceLocale);
}
@ -1110,4 +1124,5 @@ static void TestAlgorithmicParentFallback(void) {
}
ures_close(noDefaultRB);
}
ures_close(defaultLocaleRB);
}

12
icu4c/source/test/cintltst/currtest.c
View file

@ -100,6 +100,18 @@ static void TestEnumList(void) {
expectInList("VES", UCURR_DEPRECATED, false);
expectInList("VES", UCURR_NON_DEPRECATED, true);
// CLDR 41/42 and ICU-21989
expectInList("SLE", UCURR_ALL, true);
expectInList("SLE", UCURR_COMMON, true);
expectInList("SLE", UCURR_UNCOMMON, false);
expectInList("SLE", UCURR_DEPRECATED, false);
expectInList("SLE", UCURR_NON_DEPRECATED, true);
expectInList("VED", UCURR_ALL, true);
expectInList("VED", UCURR_COMMON, false);
expectInList("VED", UCURR_UNCOMMON, true);
expectInList("VED", UCURR_DEPRECATED, false);
expectInList("VED", UCURR_NON_DEPRECATED, true);
expectInList("EQE", UCURR_ALL, false);
}

2
icu4c/source/test/intltest/tztest.cpp
View file

@ -2149,9 +2149,11 @@ void TimeZoneTest::TestCanonicalID() {
{"Europe/Sarajevo", "Europe/Belgrade"},
{"Europe/Skopje", "Europe/Belgrade"},
{"Europe/Stockholm", "Europe/Berlin"},
{"Europe/Uzhgorod", "Europe/Kiev"},
{"Europe/Vaduz", "Europe/Zurich"},
{"Europe/Vatican", "Europe/Rome"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Europe/Zaporozhye", "Europe/Kiev"},
{"Indian/Antananarivo", "Africa/Nairobi"},
{"Indian/Christmas", "Asia/Bangkok"},
{"Indian/Cocos", "Asia/Rangoon"},

24
icu4c/source/test/testdata/structLocale.txt vendored
View file

@ -1224,6 +1224,10 @@ structLocale:table(nofallback){
"",
"",
}
SLE{
"",
"",
}
SLL{
"",
"",
@ -1372,6 +1376,10 @@ structLocale:table(nofallback){
"",
"",
}
VED{
"",
"",
}
VEF{
"",
"",
@ -3426,6 +3434,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
SLE{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
SLL{
zero{""}
one{""}
@ -3706,6 +3722,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
VED{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
VEF{
zero{""}
one{""}

2
icu4c/source/tools/genrb/parse.cpp
View file

@ -22,7 +22,7 @@
// Safer use of UnicodeString.
#include <cstdint>
#include <unicode/umachine.h>
#include "unicode/umachine.h"
#ifndef UNISTR_FROM_CHAR_EXPLICIT
# define UNISTR_FROM_CHAR_EXPLICIT explicit
#endif

4
icu4j/build.properties
View file

@ -6,7 +6,7 @@
#*******************************************************************************
api.report.version = 72
api.report.prev.version = 71
release.file.ver = 72rc
release.file.ver = 72_1
api.doc.version = 72.1
maven.pom.ver = 72.1-SNAPSHOT
maven.pom.ver = 72.1

57
icu4j/main/classes/core/src/com/ibm/icu/text/PersonNameFormatter.java
View file

@ -14,13 +14,56 @@ import com.ibm.icu.impl.personname.PersonNameFormatterImpl;
*
* The Length, Usage, and Formality options can be used to get a wide variety of results. In English, they would
* produce results along these lines:
*
* | | REFERRING | REFERRING | ADDRESSING | ADDRESSING | MONOGRAM | MONOGRAM |
* | | FORMAL | INFORMAL | FORMAL | INFORMAL | FORMAL | INFORMAL |
* |--------|-----------------------|--------------|------------|------------|----------|----------|
* | LONG | James Earl Carter Jr. | Jimmy Carter | Mr. Carter | Jimmy | JEC | JC |
* | MEDIUM | James E. Carter Jr. | Jimmy Carter | Mr. Carter | Jimmy | C | J |
* | SHORT | J. E. Carter | Jimmy Carter | Mr. Carter | Jimmy | C | J |
* <table border="1">
* <tr>
* <th rowspan="2">
* </th>
* <th colspan="2">
* REFERRING
* </th>
* <th colspan="2">
* ADDRESSING
* </th>
* <th colspan="2">
* MONOGRAM
* </th>
* </tr>
* <tr>
* <th>FORMAL</th>
* <th>INFORMAL</th>
* <th>FORMAL</th>
* <th>INFORMAL</th>
* <th>FORMAL</th>
* <th>INFORMAL</th>
* </tr>
* <tr>
* <th>LONG</th>
* <td>James Earl Carter Jr.</td>
* <td>Jimmy Carter</td>
* <td>Mr. Carter</td>
* <td>Jimmy</td>
* <td>JEC</td>
* <td>JC</td>
* </tr>
* <tr>
* <th>MEDIUM</th>
* <td>James E. Carter Jr.</td>
* <td>Jimmy Carter</td>
* <td>Mr. Carter</td>
* <td>Jimmy</td>
* <td>C</td>
* <td>J</td>
* </tr>
* <tr>
* <th>SHORT</th>
* <td>J. E. Carter</td>
* <td>Jimmy Carter</td>
* <td>Mr. Carter</td>
* <td>Jimmy</td>
* <td>C</td>
* <td>J</td>
* </tr>
* </table>
*
* @internal ICU 72 technology preview
* @deprecated This API is for technology preview only.

4
icu4j/main/shared/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1594af096f99faaf76d3abe43cdcd184353e84393e79291f627cd4ee7e47ce90
size 14172480
oid sha256:06dfeeb5d37e1335a30a60f86cedffc88a3bfac1fa88a3a01cde60b1c2cb7e03
size 14175154

4
icu4j/main/shared/data/icutzdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c9c125e295e374521b2f9865e398a6deb8a3a42609a3a3da7dc98c495bd0dea
size 93665
oid sha256:bf689de16f6b31cd55e8985db3761c3906c1d6c132c417d3a3fef9f2e467fd70
size 93462

4
icu4j/main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a522856180aa25c87c818fadca9b85cf64463204190f3280a76bbf1e83ed8b38
size 831602
oid sha256:048c14ed0e27b1e9a48c20f3d24b8ab10aa9d54b7aedf9eab1753f2ed3191ad0
size 831605

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View file

@ -1588,9 +1588,11 @@ public class TimeZoneTest extends TestFmwk
{"Europe/Sarajevo", "Europe/Belgrade"},
{"Europe/Skopje", "Europe/Belgrade"},
{"Europe/Stockholm", "Europe/Berlin"},
{"Europe/Uzhgorod", "Europe/Kiev"},
{"Europe/Vaduz", "Europe/Zurich"},
{"Europe/Vatican", "Europe/Rome"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Europe/Zaporozhye", "Europe/Kiev"},
{"Indian/Antananarivo", "Africa/Nairobi"},
{"Indian/Christmas", "Asia/Bangkok"},
{"Indian/Cocos", "Asia/Rangoon"},

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
View file

@ -581,6 +581,8 @@ public class CurrencyTest extends TestFmwk {
assertTrue("Full currencies list should include UYW", currencies.contains("UYW")); // ICU-21622
assertTrue("Full currencies list should include VES", currencies.contains("VES")); // ICU-21685
assertFalse("Full currencies list should not include EQE", currencies.contains("EQE")); // ICU-21685
assertTrue("Full currencies list should include SLE", currencies.contains("SLE")); // CLDR 41/42, ICU-21989
assertTrue("Full currencies list should include VED", currencies.contains("VED")); // CLDR 41, ICU-21989
}
// Coverage-only test of the CurrencyMetaInfo class

4
tools/cldr/cldr-to-icu/build-icu-data.xml
View file

@ -234,7 +234,7 @@
raj, rm, rn, ro, rof, ru, rw, rwk
// S
sa, sah, saq, sat, sat_IN, sbp, sc, sd, sd_Deva, sd_PK, se, seh, ses, sg, sh, sh_BA, sh_CS, sh_YU
sa, sah, saq, sat, sat_IN, sbp, sc, sd, sd_Deva, sd_IN, sd_PK, se, seh, ses, sg, sh, sh_BA, sh_CS, sh_YU
shi, shi_Latn, shi_MA, si, sk, sl, smn, sn, so, sq, sr, sr_BA, sr_CS, sr_Cyrl_CS, sr_Cyrl_YU, sr_Latn
sr_Latn_CS, sr_Latn_YU, sr_ME, sr_RS, sr_XK, sr_YU, su, su_ID, sv, sw
@ -356,7 +356,7 @@
<directory dir="brkitr" inheritLanguageSubtag="zh_Hant">
<localeIds>
root,
de, el, en, en_US_POSIX, en_US, es, fr, it, ja, pt, ru, zh_Hant, zh
de, el, en, en_US_POSIX, en_US, es, fi, fr, it, ja, pt, ru, sv, zh_Hant, zh
</localeIds>
</directory>

2
tools/cldr/cldr-to-icu/pom.xml
View file

@ -83,7 +83,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-for-cldr</artifactId>
<version>72.0.1-SNAPSHOT-cldr-2022-09-12</version>
<version>72.1-cldr-2022-10-11</version>
<!-- Note: see https://github.com/unicode-org/icu/packages/411079/versions
for the icu4j-for-cldr version tag to use -->
</dependency>

6
tools/currency/build.xml
View file

@ -13,9 +13,9 @@
<property name="res.dir" value="${out.dir}/res"/>
<property name="xml.dir" value="${out.dir}/xml"/>
<property name="base.url" value="https://www.currency-iso.org/dam/downloads/lists/"/>
<property name="current.xml" value="list_one.xml"/>
<property name="historic.xml" value="list_three.xml"/>
<property name="base.url" value="https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/"/>
<property name="current.xml" value="list-one.xml"/>
<property name="historic.xml" value="list-three.xml"/>
<target name="build" depends="check, resource" description="Verify ICU's local data and generate ISO 4217 alpha-numeric code mapping data resource"/>

4
tools/currency/readme.txt
View file

@ -35,8 +35,8 @@ ISO 4217 code data in XML format. These files are found in
http://www.currency-iso.org/iso_index/iso_tables.htm. There are two
files that we're interested in.
- http://www.currency-iso.org/dl_iso_table_a1.xml
- http://www.currency-iso.org/dl_iso_tables_a3.xml
- https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml
- https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-three.xml
Table A.1 contains current currencies and funds and Table A.3 contains
historic denominations.