mirror of
https://github.com/classilla/tenfourfox.git
synced 2024-06-16 14:29:46 +00:00
#562: ICU 56.2 sync to upstream
This commit is contained in:
parent
44e037bfbc
commit
1fd25c5107
|
@ -1,3 +1,5 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
**********************************************************************
|
||||
* Copyright (C) 1997-2015, International Business Machines
|
||||
|
@ -64,6 +66,12 @@ static Locale *gDefaultLocale = NULL;
|
|||
*/
|
||||
#define ULOC_STRING_LIMIT 357913941
|
||||
|
||||
/**
|
||||
* \def ULOC_STRING_LIMIT
|
||||
* strings beyond this value crash in CharString
|
||||
*/
|
||||
#define ULOC_STRING_LIMIT 357913941
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
typedef enum ELocalePos {
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
**********************************************************************
|
||||
* Copyright (C) 1997-2015, International Business Machines
|
||||
|
@ -45,6 +47,8 @@
|
|||
|
||||
#include <stdio.h> /* for sprintf */
|
||||
|
||||
using namespace icu;
|
||||
|
||||
/* ### Declarations **************************************************/
|
||||
|
||||
/* Locale stuff from locid.cpp */
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
* This value will change in the subsequent releases of ICU
|
||||
* @stable ICU 2.6
|
||||
*/
|
||||
#define U_ICU_VERSION_MINOR_NUM 1
|
||||
#define U_ICU_VERSION_MINOR_NUM 2
|
||||
|
||||
/** The current ICU patchlevel version as an integer.
|
||||
* This value will change in the subsequent releases of ICU
|
||||
|
@ -118,7 +118,7 @@
|
|||
* This value will change in the subsequent releases of ICU
|
||||
* @stable ICU 2.4
|
||||
*/
|
||||
#define U_ICU_VERSION "56.1"
|
||||
#define U_ICU_VERSION "56.2"
|
||||
|
||||
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
|
||||
* This value will change in the subsequent releases of ICU
|
||||
|
@ -130,7 +130,7 @@
|
|||
/** Data version in ICU4C.
|
||||
* @internal ICU 4.4 Internal Use Only
|
||||
**/
|
||||
#define U_ICU_DATA_VERSION "56.1"
|
||||
#define U_ICU_DATA_VERSION "56.2"
|
||||
#endif /* U_HIDE_INTERNAL_API */
|
||||
|
||||
/*===========================================================================
|
||||
|
|
|
@ -1596,6 +1596,7 @@ ar{
|
|||
"تيشو",
|
||||
"شووا",
|
||||
"هيسي",
|
||||
"ريوا",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -993,6 +993,7 @@ bs_Cyrl{
|
|||
"Таишо",
|
||||
"Шова",
|
||||
"Хаисеи",
|
||||
"Реива",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1186,6 +1186,7 @@ de{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1385,6 +1385,7 @@ he{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1185,6 +1185,7 @@ hi{
|
|||
"ताईशो",
|
||||
"शोवा",
|
||||
"हेईसेई",
|
||||
"रेइवा",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1532,6 +1532,7 @@ hr{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1907,6 +1907,7 @@ id{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2381,6 +2381,7 @@ ja{
|
|||
"大正",
|
||||
"昭和",
|
||||
"平成",
|
||||
"令和",
|
||||
}
|
||||
narrow{
|
||||
"大化",
|
||||
|
@ -2619,6 +2620,7 @@ ja{
|
|||
"T",
|
||||
"S",
|
||||
"H",
|
||||
"R",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1846,6 +1846,7 @@ ko{
|
|||
"다이쇼",
|
||||
"쇼와",
|
||||
"헤이세이",
|
||||
"레이와",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1817,6 +1817,7 @@ lo{
|
|||
"ໄຕໂຊ",
|
||||
"ໂຊວາ",
|
||||
"ຮີຊີ",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2388,6 +2388,7 @@ lt{
|
|||
"Taišo",
|
||||
"Šova",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1999,6 +1999,7 @@ nb{
|
|||
"T",
|
||||
"S",
|
||||
"H",
|
||||
"R",
|
||||
}
|
||||
wide{
|
||||
"Taika (645–650)",
|
||||
|
@ -2237,6 +2238,7 @@ nb{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2181,6 +2181,7 @@ nl{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1879,6 +1879,7 @@ root{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
narrow{
|
||||
"Taika (645–650)",
|
||||
|
@ -2117,6 +2118,7 @@ root{
|
|||
"T",
|
||||
"S",
|
||||
"H",
|
||||
"R",
|
||||
}
|
||||
wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
|
||||
}
|
||||
|
|
|
@ -1648,6 +1648,7 @@ ru{
|
|||
"Эпоха Тайсьо",
|
||||
"Сьова",
|
||||
"Эпоха Хэйсэй",
|
||||
"Рэйва",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1169,6 +1169,7 @@ sr{
|
|||
"Таишо",
|
||||
"Шова",
|
||||
"Хаисеи",
|
||||
"Реива",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1170,6 +1170,7 @@ sr_Latn{
|
|||
"Taišo",
|
||||
"Šova",
|
||||
"Haisei",
|
||||
"Reiva",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1490,6 +1490,7 @@ sv{
|
|||
"Taishō",
|
||||
"Shōwa",
|
||||
"Heisei",
|
||||
"Reiwa",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2262,6 +2262,7 @@ th{
|
|||
"ทะอิโช",
|
||||
"โชวะ",
|
||||
"เฮเซ",
|
||||
"เรวะ",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2063,6 +2063,7 @@ zh{
|
|||
"大正",
|
||||
"昭和",
|
||||
"平成",
|
||||
"令和",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2343,6 +2343,7 @@ zh_Hant{
|
|||
"大正",
|
||||
"昭和",
|
||||
"平成",
|
||||
"令和",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,6 @@
|
|||
// ***************************************************************************
|
||||
|
||||
icuver:table(nofallback){
|
||||
DataVersion { "56.1.0.0" }
|
||||
ICUVersion { "56.1.0.0" }
|
||||
DataVersion { "56.2.0.0" }
|
||||
ICUVersion { "56.2.0.0" }
|
||||
}
|
||||
|
|
|
@ -813,7 +813,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Western",
|
||||
"1985-12-31 23:00",
|
||||
"9999-12-31 23:59",
|
||||
"2018-10-28 02:00",
|
||||
}
|
||||
}
|
||||
"Africa:Ceuta"{
|
||||
|
@ -862,7 +862,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Western",
|
||||
"1976-04-14 01:00",
|
||||
"9999-12-31 23:59",
|
||||
"2018-10-28 02:00",
|
||||
}
|
||||
}
|
||||
"Africa:Freetown"{
|
||||
|
@ -1035,6 +1035,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Africa_Western",
|
||||
"2018-01-01 01:00",
|
||||
"2019-01-01 01:00",
|
||||
}
|
||||
{
|
||||
"GMT",
|
||||
"2019-01-01 01:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -2076,6 +2081,16 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Alaska",
|
||||
"2015-11-01 10:00",
|
||||
"2018-11-04 10:00",
|
||||
}
|
||||
{
|
||||
"America_Pacific",
|
||||
"2018-11-04 10:00",
|
||||
"2019-01-20 10:00",
|
||||
}
|
||||
{
|
||||
"Alaska",
|
||||
"2019-01-20 10:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -2559,7 +2574,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Casey",
|
||||
"2016-10-21 16:00",
|
||||
"2016-03-10 17:00",
|
||||
"2018-03-10 17:00",
|
||||
}
|
||||
{
|
||||
"Australia_Western",
|
||||
|
@ -3132,11 +3147,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Pyongyang",
|
||||
"2015-08-14 15:00",
|
||||
"2018-05-05 08:30",
|
||||
"2018-05-04 15:00",
|
||||
}
|
||||
{
|
||||
"Korea",
|
||||
"2018-05-05 08:30",
|
||||
"2018-05-04 15:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -3152,6 +3167,13 @@ metaZones:table(nofallback){
|
|||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Asia:Qostanay"{
|
||||
{
|
||||
"Kazakhstan_Eastern",
|
||||
"2004-10-30 21:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Asia:Qyzylorda"{
|
||||
{
|
||||
"Kizilorda",
|
||||
|
@ -3166,6 +3188,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Kazakhstan_Eastern",
|
||||
"2004-10-30 21:00",
|
||||
"2018-12-20 18:00",
|
||||
}
|
||||
{
|
||||
"Kazakhstan_Western",
|
||||
"2018-12-20 18:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -3992,6 +4019,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Moscow",
|
||||
"1992-03-28 22:00",
|
||||
"2018-10-27 23:00",
|
||||
}
|
||||
{
|
||||
"Volgograd",
|
||||
"2018-10-27 23:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -4211,11 +4243,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Kwajalein",
|
||||
"1970-01-01 00:00",
|
||||
"1993-08-20 12:00",
|
||||
"1993-08-21 12:00",
|
||||
}
|
||||
{
|
||||
"Marshall_Islands",
|
||||
"1993-08-20 12:00",
|
||||
"1993-08-21 12:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
|
@ -416,6 +416,7 @@ timezoneTypes:table(nofallback){
|
|||
"Asia:Pontianak"{"idpnk"}
|
||||
"Asia:Pyongyang"{"kpfnj"}
|
||||
"Asia:Qatar"{"qadoh"}
|
||||
"Asia:Qostanay"{"kzksn"}
|
||||
"Asia:Qyzylorda"{"kzkzo"}
|
||||
"Asia:Rangoon"{"mmrgn"}
|
||||
"Asia:Riyadh"{"saruh"}
|
||||
|
|
|
@ -17,8 +17,8 @@ windowsZones:table(nofallback){
|
|||
"Alaskan Standard Time"{
|
||||
001{"America/Anchorage"}
|
||||
US{
|
||||
"America/Anchorage America/Juneau America/Metlakatla America/Nome Ame"
|
||||
"rica/Sitka America/Yakutat"
|
||||
"America/Anchorage America/Juneau America/Nome America/Sitka America/"
|
||||
"Yakutat"
|
||||
}
|
||||
}
|
||||
"Aleutian Standard Time"{
|
||||
|
@ -130,7 +130,7 @@ windowsZones:table(nofallback){
|
|||
CN{"Asia/Urumqi"}
|
||||
IO{"Indian/Chagos"}
|
||||
KG{"Asia/Bishkek"}
|
||||
KZ{"Asia/Almaty Asia/Qyzylorda"}
|
||||
KZ{"Asia/Almaty Asia/Qostanay"}
|
||||
ZZ{"Etc/GMT-6"}
|
||||
}
|
||||
"Central Brazilian Standard Time"{
|
||||
|
@ -287,7 +287,7 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"GTB Standard Time"{
|
||||
001{"Europe/Bucharest"}
|
||||
CY{"Asia/Nicosia"}
|
||||
CY{"Asia/Famagusta Asia/Nicosia"}
|
||||
GR{"Europe/Athens"}
|
||||
RO{"Europe/Bucharest"}
|
||||
}
|
||||
|
@ -468,7 +468,7 @@ windowsZones:table(nofallback){
|
|||
"Pacific Standard Time"{
|
||||
001{"America/Los_Angeles"}
|
||||
CA{"America/Vancouver America/Dawson America/Whitehorse"}
|
||||
US{"America/Los_Angeles"}
|
||||
US{"America/Los_Angeles America/Metlakatla"}
|
||||
ZZ{"PST8PDT"}
|
||||
}
|
||||
"Pakistan Standard Time"{
|
||||
|
@ -580,6 +580,10 @@ windowsZones:table(nofallback){
|
|||
001{"Pacific/Apia"}
|
||||
WS{"Pacific/Apia"}
|
||||
}
|
||||
"Sao Tome Standard Time"{
|
||||
001{"Africa/Sao_Tome"}
|
||||
ST{"Africa/Sao_Tome"}
|
||||
}
|
||||
"Saratov Standard Time"{
|
||||
001{"Europe/Saratov"}
|
||||
RU{"Europe/Saratov"}
|
||||
|
@ -654,7 +658,6 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"Turkey Standard Time"{
|
||||
001{"Europe/Istanbul"}
|
||||
CY{"Asia/Famagusta"}
|
||||
TR{"Europe/Istanbul"}
|
||||
}
|
||||
"Turks And Caicos Standard Time"{
|
||||
|
@ -746,7 +749,6 @@ windowsZones:table(nofallback){
|
|||
GQ{"Africa/Malabo"}
|
||||
NE{"Africa/Niamey"}
|
||||
NG{"Africa/Lagos"}
|
||||
ST{"Africa/Sao_Tome"}
|
||||
TD{"Africa/Ndjamena"}
|
||||
TN{"Africa/Tunis"}
|
||||
ZZ{"Etc/GMT-1"}
|
||||
|
@ -777,7 +779,7 @@ windowsZones:table(nofallback){
|
|||
"West Asia Standard Time"{
|
||||
001{"Asia/Tashkent"}
|
||||
AQ{"Antarctica/Mawson"}
|
||||
KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau"}
|
||||
KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qyzylorda"}
|
||||
MV{"Indian/Maldives"}
|
||||
TF{"Indian/Kerguelen"}
|
||||
TJ{"Asia/Dushanbe"}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -273,7 +273,8 @@ static const struct {
|
|||
{ 1868, 9, 8 }, // Meiji 232
|
||||
{ 1912, 7, 30 }, // Taisho 233
|
||||
{ 1926, 12, 25 }, // Showa 234
|
||||
{ 1989, 1, 8 } // Heisei 235
|
||||
{ 1989, 1, 8 }, // Heisei 235
|
||||
{ 2019, 5, 1 } // Reiwa 236
|
||||
};
|
||||
|
||||
#define kEraCount (sizeof(kEraInfo)/sizeof(kEraInfo[0]))
|
||||
|
|
Loading…
Reference in New Issue
Block a user