[iOS][non-icu] HybridGlobalization implement calendar data #90004

mkhamoyan · 2023-08-04T09:25:25Z

Implement calendar data for hybrid mode on Apple platforms

Public APIs affected by the PR:

DateTimeFormatInfo.AbbreviatedDayNames
DateTimeFormatInfo.AbbreviatedMonthGenitiveNames
DateTimeFormatInfo.AbbreviatedMonthNames
DateTimeFormatInfo.CalendarWeekRule
DateTimeFormatInfo.DayNames
DateTimeFormatInfo.FirstDayOfWeek
DateTimeFormatInfo.FullDateTimePattern
DateTimeFormatInfo.LongDatePattern
DateTimeFormatInfo.LongTimePattern
DateTimeFormatInfo.MonthDayPattern
DateTimeFormatInfo.MonthGenitiveNames
DateTimeFormatInfo.MonthNames
DateTimeFormatInfo.NativeCalendarName
DateTimeFormatInfo.ShortDatePattern
DateTimeFormatInfo.ShortestDayNames
DateTimeFormatInfo.ShortTimePattern
DateTimeFormatInfo.YearMonthPattern

Contributes to #80689

ghost · 2023-08-04T09:25:37Z

Tagging subscribers to this area: @dotnet/area-system-globalization
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:	mkhamoyan
Assignees:	-
Labels:	`area-System.Globalization`
Milestone:	-

mkhamoyan · 2023-08-04T13:13:29Z

/azp run runtime-ioslike

azure-pipelines · 2023-08-04T13:13:41Z

Azure Pipelines successfully started running 1 pipeline(s).

mkhamoyan · 2023-08-04T15:09:39Z

/azp run runtime-ioslike

azure-pipelines · 2023-08-04T15:09:47Z

Azure Pipelines successfully started running 1 pipeline(s).

ghost · 2023-08-04T15:39:12Z

Tagging subscribers to 'os-ios': @steveisok, @akoeplinger, @kotlarmilos
See info in area-owners.md if you want to be subscribed.

Issue Details

Implement calendar data for hybrid mode on Apple platforms

Public APIs affected by the PR:

DateTimeFormatInfo.AbbreviatedDayNames
DateTimeFormatInfo.AbbreviatedMonthGenitiveNames
DateTimeFormatInfo.AbbreviatedMonthNames
DateTimeFormatInfo.CalendarWeekRule
DateTimeFormatInfo.DayNames
DateTimeFormatInfo.FirstDayOfWeek
DateTimeFormatInfo.FullDateTimePattern
DateTimeFormatInfo.LongDatePattern
DateTimeFormatInfo.LongTimePattern
DateTimeFormatInfo.MonthDayPattern
DateTimeFormatInfo.MonthGenitiveNames
DateTimeFormatInfo.MonthNames
DateTimeFormatInfo.NativeCalendarName
DateTimeFormatInfo.ShortDatePattern
DateTimeFormatInfo.ShortestDayNames
DateTimeFormatInfo.ShortTimePattern
DateTimeFormatInfo.YearMonthPattern

Contributes to #80689

cc @SamMonoRT

Author:	mkhamoyan
Assignees:	mkhamoyan
Labels:	`area-System.Globalization`, `os-ios`
Milestone:	-

docs/design/features/globalization-hybrid-mode.md

.../System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj

src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.iOS.cs

…em.Globalization.Calendars.IOS.Tests.csproj Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

src/libraries/Common/src/Interop/Interop.Calendar.iOS.cs

mdh1418 · 2023-08-07T16:48:34Z

src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.iOS.cs

+            this.sNativeName = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.NativeName);
+            this.sMonthDay = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.MonthDay);
+            this.saShortDates = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.ShortDates).Split("||");
+            this.saLongDates = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.LongDates).Split("||");
+            this.saYearMonths = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.YearMonths).Split("||");
+            this.saDayNames = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.DayNames).Split("||");
+            this.saAbbrevDayNames = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.AbbrevDayNames).Split("||");
+            this.saSuperShortDayNames = GetCalendarInfoNative(localeName, calendarId, CalendarDataType.SuperShortDayNames).Split("||");
+
+            string? leapHebrewMonthName = null;
+            this.saMonthNames = NormalizeMonthArray(GetCalendarInfoNative(localeName, calendarId, CalendarDataType.MonthNames).Split("||"), calendarId, ref leapHebrewMonthName);
+            if (leapHebrewMonthName != null)
+            {
+                Debug.Assert(this.saMonthNames != null);
+
+                // In Hebrew calendar, get the leap month name Adar II and override the non-leap month 7
+                Debug.Assert(calendarId == CalendarId.HEBREW && saMonthNames.Length == 13);
+                saLeapYearMonthNames = (string[]) saMonthNames.Clone();
+                saLeapYearMonthNames[6] = leapHebrewMonthName;
+
+                // The returned data has 6th month name as 'Adar I' and 7th month name as 'Adar'
+                // We need to adjust that in the list used with non-leap year to have 6th month as 'Adar' and 7th month as 'Adar II'
+                // note that when formatting non-leap year dates, 7th month shouldn't get used at all.
+                saMonthNames[5] = saMonthNames[6];
+                saMonthNames[6] = leapHebrewMonthName;
+
+            }
+            this.saAbbrevMonthNames = NormalizeMonthArray(GetCalendarInfoNative(localeName, calendarId, CalendarDataType.AbbrevMonthNames).Split("||"), calendarId, ref leapHebrewMonthName);
+            this.saMonthGenitiveNames = NormalizeMonthArray(GetCalendarInfoNative(localeName, calendarId, CalendarDataType.MonthGenitiveNames).Split("||"), calendarId, ref leapHebrewMonthName);
+            this.saAbbrevMonthGenitiveNames = NormalizeMonthArray(GetCalendarInfoNative(localeName, calendarId, CalendarDataType.AbbrevMonthGenitiveNames).Split("||"), calendarId, ref leapHebrewMonthName);
+
+            this.saEraNames = NormalizeEraNames(calendarId, GetCalendarInfoNative(localeName, calendarId, CalendarDataType.EraNames).Split("||"));
+            this.saAbbrevEraNames = Array.Empty<string>();//NormalizeEraNames(calendarId, GetCalendarInfoNative(localeName, calendarId, CalendarDataType.AbbrevEraNames).Split("||"));
+
+            return this.sNativeName != null && this.saShortDates != null && this.saLongDates != null && this.saYearMonths != null &&
+                   this.saDayNames != null && this.saAbbrevDayNames != null && this.saSuperShortDayNames != null && this.saMonthNames != null &&
+                   this.saAbbrevMonthNames != null && this.saMonthGenitiveNames != null && this.saAbbrevMonthGenitiveNames != null &&
+                   this.saEraNames != null && this.saAbbrevEraNames != null;


Is this. necessary? https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md

Was following same style as in https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs#L118 . Will remove as it is not necessary.

src/native/libs/System.Globalization.Native/pal_calendarData.h

src/native/libs/System.Globalization.Native/pal_calendarData.m

src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.iOS.cs

mkhamoyan · 2023-08-08T12:07:59Z

/azp run runtime-ioslike

azure-pipelines · 2023-08-08T12:08:08Z

Azure Pipelines successfully started running 1 pipeline(s).

mkhamoyan · 2023-08-08T12:59:49Z

/azp run runtime-ioslike

azure-pipelines · 2023-08-08T12:59:58Z

Azure Pipelines successfully started running 1 pipeline(s).

mdh1418

Looks good to me! Thanks

mkhamoyan · 2023-08-08T15:51:41Z

Failures are not related.

Implement calendar info for hybrid mode

819e146

dotnet-issue-labeler bot added the area-System.Globalization label Aug 4, 2023

ghost assigned mkhamoyan Aug 4, 2023

mkhamoyan changed the title ~~Implement calendar info for hybrid mode~~ [iOS][non-icu] HybridGlobalization implement calendar data Aug 4, 2023

Merge branch 'main' into hybrid_calendar_data

00a53cd

mkhamoyan requested review from steveisok, akoeplinger and mdh1418 August 4, 2023 09:34

mkhamoyan added 2 commits August 4, 2023 14:15

Add calendar tests for hybrid mode iOS

58806cb

Minor fix

9c7eca0

update shortDates and longDates

93d1845

mkhamoyan requested a review from ilonatommy August 4, 2023 15:09

mkhamoyan marked this pull request as ready for review August 4, 2023 15:10

mkhamoyan requested review from vargaz, lambdageek and SamMonoRT as code owners August 4, 2023 15:10

tarekgh added the os-ios Apple iOS label Aug 4, 2023

This was referenced Aug 4, 2023

Tracking issue for CI build timeouts #76454

Closed

JIT/jit64/opt/rngchk/RngchkStress2.cs failing to build with error CS8078: An expression is too long or complex to compile #87879

Closed

akoeplinger approved these changes Aug 7, 2023

View reviewed changes

mkhamoyan and others added 2 commits August 7, 2023 20:46

Update src/libraries/System.Globalization.Calendars/tests/Hybrid/Syst…

e7f33f7

…em.Globalization.Calendars.IOS.Tests.csproj Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

Update docs/design/features/globalization-hybrid-mode.md

81dc180

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

mdh1418 reviewed Aug 7, 2023

View reviewed changes

Merge branch 'main' into hybrid_calendar_data

f14a5c3

Updates requested by review

d4b015e

mkhamoyan requested a review from mdh1418 August 8, 2023 12:08

Merge branch 'main' into hybrid_calendar_data

377cdd8

mdh1418 approved these changes Aug 8, 2023

View reviewed changes

mkhamoyan merged commit c83324d into dotnet:main Aug 8, 2023

mkhamoyan deleted the hybrid_calendar_data branch August 8, 2023 15:53

mkhamoyan mentioned this pull request Aug 9, 2023

[iOS][globalization][icu] Tracking issue for HybridGlobalization: Native API + ICU #80689

Closed

23 tasks

ghost locked as resolved and limited conversation to collaborators Sep 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[iOS][non-icu] HybridGlobalization implement calendar data #90004

[iOS][non-icu] HybridGlobalization implement calendar data #90004

mkhamoyan commented Aug 4, 2023 •

edited

Loading

ghost commented Aug 4, 2023

mkhamoyan commented Aug 4, 2023

azure-pipelines bot commented Aug 4, 2023

mkhamoyan commented Aug 4, 2023

azure-pipelines bot commented Aug 4, 2023

ghost commented Aug 4, 2023

mdh1418 Aug 7, 2023

mkhamoyan Aug 8, 2023

mkhamoyan commented Aug 8, 2023

azure-pipelines bot commented Aug 8, 2023

mkhamoyan commented Aug 8, 2023

azure-pipelines bot commented Aug 8, 2023

mdh1418 left a comment

mkhamoyan commented Aug 8, 2023

[iOS][non-icu] HybridGlobalization implement calendar data #90004

[iOS][non-icu] HybridGlobalization implement calendar data #90004

Conversation

mkhamoyan commented Aug 4, 2023 • edited Loading

ghost commented Aug 4, 2023

mkhamoyan commented Aug 4, 2023

azure-pipelines bot commented Aug 4, 2023

mkhamoyan commented Aug 4, 2023

azure-pipelines bot commented Aug 4, 2023

ghost commented Aug 4, 2023

mdh1418 Aug 7, 2023

Choose a reason for hiding this comment

mkhamoyan Aug 8, 2023

Choose a reason for hiding this comment

mkhamoyan commented Aug 8, 2023

azure-pipelines bot commented Aug 8, 2023

mkhamoyan commented Aug 8, 2023

azure-pipelines bot commented Aug 8, 2023

mdh1418 left a comment

Choose a reason for hiding this comment

mkhamoyan commented Aug 8, 2023

mkhamoyan commented Aug 4, 2023 •

edited

Loading