Imported Upstream version 6.4.0.188
Former-commit-id: b992b2545dbb313fcf2c9fbb79c87625aed019a0
This commit is contained in:
parent
22441cc9fb
commit
5366903ce5
@ -1 +1 @@
|
||||
697def686b221f80e49bd7286802b3a76adac046
|
||||
42081cb7ce765fb36c75762f4e8cbcbde4e0960f
|
@ -1 +1 @@
|
||||
3f61beb1f86b86a2da5ac63d27ef6bf2ce7e9d75
|
||||
6226c861f8c989cad651f3ae647920bbb5a81902
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.187";
|
||||
public const string MonoVersion = "6.4.0.188";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -34,6 +34,36 @@ namespace System.Globalization
|
||||
[StructLayout (LayoutKind.Sequential)]
|
||||
partial class CalendarData
|
||||
{
|
||||
private static string[] HEBREW_MONTH_NAMES = new[] {
|
||||
"\u05EA\u05E9\u05E8\u05D9",
|
||||
"\u05D7\u05E9\u05D5\u05DF",
|
||||
"\u05DB\u05E1\u05DC\u05D5",
|
||||
"\u05D8\u05D1\u05EA",
|
||||
"\u05E9\u05D1\u05D8",
|
||||
"\u05D0\u05D3\u05E8",
|
||||
"\u05D0\u05D3\u05E8\u0020\u05D1",
|
||||
"\u05E0\u05D9\u05E1\u05DF",
|
||||
"\u05D0\u05D9\u05D9\u05E8",
|
||||
"\u05E1\u05D9\u05D5\u05DF",
|
||||
"\u05EA\u05DE\u05D5\u05D6",
|
||||
"\u05D0\u05D1",
|
||||
"\u05D0\u05DC\u05D5\u05DC" };
|
||||
|
||||
private static string[] HEBREW_LEAP_MONTH_NAMES = new[] {
|
||||
"\u05EA\u05E9\u05E8\u05D9",
|
||||
"\u05D7\u05E9\u05D5\u05DF",
|
||||
"\u05DB\u05E1\u05DC\u05D5",
|
||||
"\u05D8\u05D1\u05EA",
|
||||
"\u05E9\u05D1\u05D8",
|
||||
"\u05D0\u05D3\u05E8\u0020\u05D0",
|
||||
"\u05D0\u05D3\u05E8\u0020\u05D1",
|
||||
"\u05E0\u05D9\u05E1\u05DF",
|
||||
"\u05D0\u05D9\u05D9\u05E8",
|
||||
"\u05E1\u05D9\u05D5\u05DF",
|
||||
"\u05EA\u05DE\u05D5\u05D6",
|
||||
"\u05D0\u05D1",
|
||||
"\u05D0\u05DC\u05D5\u05DC" };
|
||||
|
||||
public static int nativeGetTwoDigitYearMax (int calID)
|
||||
{
|
||||
// -1 mean OS does not override default BCL max year
|
||||
@ -43,7 +73,17 @@ namespace System.Globalization
|
||||
static bool nativeGetCalendarData (CalendarData data, string localeName, int calendarId)
|
||||
{
|
||||
// TODO: Convert calendar-id to mono runtime calendar-id when it's used
|
||||
return data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId);
|
||||
if (data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId)) {
|
||||
if ((CalendarId)calendarId == CalendarId.HEBREW) {
|
||||
// HACK: Generate leap month names because the native code does not do it
|
||||
// and tests would fail to round-trip dates on leap years.
|
||||
// https://github.com/mono/mono/issues/16623
|
||||
data.saMonthNames = HEBREW_MONTH_NAMES;
|
||||
data.saLeapYearMonthNames = HEBREW_LEAP_MONTH_NAMES;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
|
@ -1 +1 @@
|
||||
3abc8e8f55c5cb4a9a3e4efe4cd0763769d9c195
|
||||
1bfb37576d4b00841ddf9fd40c66d4e0ecdda8b2
|
@ -1 +1 @@
|
||||
e925fe0f1361b9e6bf78893830c63667f5e41fb3
|
||||
0558b482cc4b6d782482b40f0be298a4d234a9eb
|
@ -1 +1 @@
|
||||
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
|
||||
925636b92585ed8cf097a3278ec15abb29afdab9
|
@ -1 +1 @@
|
||||
3c2e330763ca854a2259da0baf98936541785934
|
||||
22f9e3194800bdb1b6397ef5af7489878dd2c3d9
|
@ -1 +1 @@
|
||||
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
|
||||
c24d6993e92f58c39c034ff2e33329e793e333cf
|
@ -1 +1 @@
|
||||
e4e76f037929f101e9690211286da031013a0833
|
||||
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61
|
@ -1 +1 @@
|
||||
93b139c713973ccf7c2ef61bab9feab364715fda
|
||||
2006f7f6eaab992e2d565e700bbb1a368a0c58f0
|
@ -1 +1 @@
|
||||
310ca82df358b8d54b3ebffa12954e9f1718ea28
|
||||
00ce3736b604ad60da0844e3e91bd38987e30ffb
|
@ -1 +1 @@
|
||||
e925fe0f1361b9e6bf78893830c63667f5e41fb3
|
||||
0558b482cc4b6d782482b40f0be298a4d234a9eb
|
@ -1 +1 @@
|
||||
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
|
||||
925636b92585ed8cf097a3278ec15abb29afdab9
|
@ -1 +1 @@
|
||||
3c2e330763ca854a2259da0baf98936541785934
|
||||
22f9e3194800bdb1b6397ef5af7489878dd2c3d9
|
@ -1 +1 @@
|
||||
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
|
||||
c24d6993e92f58c39c034ff2e33329e793e333cf
|
@ -1 +1 @@
|
||||
e4e76f037929f101e9690211286da031013a0833
|
||||
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61
|
@ -1 +1 @@
|
||||
93b139c713973ccf7c2ef61bab9feab364715fda
|
||||
2006f7f6eaab992e2d565e700bbb1a368a0c58f0
|
@ -1 +1 @@
|
||||
a3edf311a2041e2c64c3b214e8ae124aa50e4809
|
||||
1742a410702df3146103f8541d4bc52ad15b9eb5
|
@ -1 +1 @@
|
||||
310ca82df358b8d54b3ebffa12954e9f1718ea28
|
||||
00ce3736b604ad60da0844e3e91bd38987e30ffb
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user