Skip to content

Commit

Permalink
Bug 1543641 - Part 2: Update in-tree ICU to release 60.3. r=jwalden a…
Browse files Browse the repository at this point in the history 
…=lizzard

Differential Revision: https://phabricator.services.mozilla.com//D27347

Depends on D27345

--HG--
extra : histedit_source : 12a2a2c1188d967aea29662ce3ecfba6cb861c10
  • Loading branch information
@anba
anba committed Apr 12, 2019
1 parent 83406f3 commit a64b924
Show file tree
Hide file tree
Showing 35 changed files with 1,111 additions and 998 deletions.
Binary file modified config/external/icu/data/icudt60l.dat
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions intl/icu/GIT-INFO
View file
@@ -0,0 +1,5 @@
commit dcae2a648060dce170fc47f37dbe40e1ec9db394
Author: yumaoka <y.umaoka@gmail.com>
Date: Tue Apr 9 23:29:57 2019 -0400

ICU-20536 ICU 60.3 release tasks
6 changes: 3 additions & 3 deletions intl/icu/source/common/unicode/uvernum.h
View file
Expand Up @@ -64,7 +64,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 2
#define U_ICU_VERSION_MINOR_NUM 3

/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
Expand Down Expand Up @@ -119,7 +119,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "60.2"
#define U_ICU_VERSION "60.3"

/** 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
Expand All @@ -131,7 +131,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "60.2"
#define U_ICU_DATA_VERSION "60.3"
#endif /* U_HIDE_INTERNAL_API */

/*===========================================================================
Expand Down
28 changes: 20 additions & 8 deletions intl/icu/source/common/wintz.cpp
View file
Expand Up @@ -49,7 +49,7 @@ typedef struct
/**
* Various registry keys and key fragments.
*/
static const char CURRENT_ZONE_REGKEY[] = "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation\\";
static const wchar_t CURRENT_ZONE_REGKEY[] = L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation\\";
static const char STANDARD_TIME_REGKEY[] = " Standard Time";
static const char TZI_REGKEY[] = "TZI";
static const char STD_REGKEY[] = "Std";
Expand Down Expand Up @@ -121,27 +121,39 @@ static LONG getSTDName(const char *winid, char *regStdName, int32_t length)
return result;
}

static LONG getTZKeyName(char* tzKeyName, int32_t length)
static LONG getTZKeyName(char* tzKeyName, int32_t tzKeyNamelength)
{
HKEY hkey;
LONG result = FALSE;
DWORD cbData = length;
WCHAR timeZoneKeyNameData[128];
DWORD timeZoneKeyNameLength = static_cast<DWORD>(sizeof(timeZoneKeyNameData));

if(ERROR_SUCCESS == RegOpenKeyExA(
if(ERROR_SUCCESS == RegOpenKeyExW(
HKEY_LOCAL_MACHINE,
CURRENT_ZONE_REGKEY,
0,
KEY_QUERY_VALUE,
&hkey))
{
result = RegQueryValueExA(
if (ERROR_SUCCESS == RegQueryValueExW(
hkey,
"TimeZoneKeyName",
L"TimeZoneKeyName",
NULL,
NULL,
(LPBYTE)tzKeyName,
&cbData);
(LPBYTE)timeZoneKeyNameData,
&timeZoneKeyNameLength))
{
// Ensure null termination.
timeZoneKeyNameData[UPRV_LENGTHOF(timeZoneKeyNameData) - 1] = L'\0';

// Convert the UTF-16 string to UTF-8.
UErrorCode status = U_ZERO_ERROR;
u_strToUTF8(tzKeyName, tzKeyNamelength, NULL, reinterpret_cast<const UChar *>(timeZoneKeyNameData), -1, &status);
if (U_ZERO_ERROR == status)
{
result = ERROR_SUCCESS;
}
}
RegCloseKey(hkey);
}

Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/ar.txt
View file
Expand Up @@ -1634,6 +1634,7 @@ ar{
"تيشو",
"شووا",
"هيسي",
"ريوا",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions intl/icu/source/data/locales/ast.txt
View file
Expand Up @@ -2304,6 +2304,7 @@ ast{
"Taishō",
"e. Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika",
Expand Down Expand Up @@ -2542,6 +2543,7 @@ ast{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -2780,6 +2782,7 @@ ast{
"Taishō",
"era Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/bs_Cyrl.txt
View file
Expand Up @@ -1030,6 +1030,7 @@ bs_Cyrl{
"Таишо",
"Шова",
"Хаисеи",
"Реива",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions intl/icu/source/data/locales/cs.txt
View file
Expand Up @@ -3697,6 +3697,7 @@ cs{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -3935,6 +3936,7 @@ cs{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -4173,6 +4175,7 @@ cs{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/de.txt
View file
Expand Up @@ -1601,6 +1601,7 @@ de{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/he.txt
View file
Expand Up @@ -1837,6 +1837,7 @@ he{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/hi.txt
View file
Expand Up @@ -1239,6 +1239,7 @@ hi{
"ताईशो",
"शोवा",
"हेईसेई",
"रेइवा",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/hr.txt
View file
Expand Up @@ -1567,6 +1567,7 @@ hr{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/id.txt
View file
Expand Up @@ -2217,6 +2217,7 @@ id{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions intl/icu/source/data/locales/ja.txt
View file
Expand Up @@ -2464,6 +2464,7 @@ ja{
"大正",
"昭和",
"平成",
"令和",
}
narrow{
"大化",
Expand Down Expand Up @@ -2702,6 +2703,7 @@ ja{
"T",
"S",
"H",
"R",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/ko.txt
View file
Expand Up @@ -1909,6 +1909,7 @@ ko{
"다이쇼",
"쇼와",
"헤이세이",
"레이와",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/lo.txt
View file
Expand Up @@ -1845,6 +1845,7 @@ lo{
"ໄຕໂຊ",
"ໂຊວາ",
"ຮີຊີ",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/lt.txt
View file
Expand Up @@ -2466,6 +2466,7 @@ lt{
"Taišo",
"Šova",
"Heisei",
"Reiwa",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions intl/icu/source/data/locales/nb.txt
View file
Expand Up @@ -5483,6 +5483,7 @@ nb{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -5721,6 +5722,7 @@ nb{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -5959,6 +5961,7 @@ nb{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
3 changes: 3 additions & 0 deletions intl/icu/source/data/locales/nl.txt
View file
Expand Up @@ -4894,6 +4894,7 @@ nl{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -5132,6 +5133,7 @@ nl{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -5370,6 +5372,7 @@ nl{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions intl/icu/source/data/locales/root.txt
View file
Expand Up @@ -1713,6 +1713,7 @@ root{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -1951,6 +1952,7 @@ root{
"T",
"S",
"H",
"R",
}
wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/ru.txt
View file
Expand Up @@ -1837,6 +1837,7 @@ ru{
"Эпоха Тайсьо",
"Сьова",
"Эпоха Хэйсэй",
"Рэйва",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/sr.txt
View file
Expand Up @@ -1246,6 +1246,7 @@ sr{
"Таишо",
"Шова",
"Хаисеи",
"Реива",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/sr_Latn.txt
View file
Expand Up @@ -1247,6 +1247,7 @@ sr_Latn{
"Taišo",
"Šova",
"Haisei",
"Reiva",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/sv.txt
View file
Expand Up @@ -1630,6 +1630,7 @@ sv{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/th.txt
View file
Expand Up @@ -2332,6 +2332,7 @@ th{
"ทะอิโช",
"โชวะ",
"เฮเซ",
"เรวะ",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/yue.txt
View file
Expand Up @@ -2394,6 +2394,7 @@ yue{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions intl/icu/source/data/locales/yue_Hans.txt
View file
Expand Up @@ -2392,6 +2392,7 @@ yue_Hans{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions intl/icu/source/data/locales/zh.txt
View file
Expand Up @@ -3403,6 +3403,7 @@ zh{
"大正",
"昭和",
"平成",
"令和",
}
narrow{
"大化(645–650)",
Expand Down Expand Up @@ -3641,6 +3642,7 @@ zh{
"T",
"S",
"H",
"R",
}
wide{
"大化 (645–650)",
Expand Down Expand Up @@ -3879,6 +3881,7 @@ zh{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down

0 comments on commit a64b924

Please sign in to comment.