Skip to content

[iOS][HybridGlobalization] Make consistent HybridGlobalization checks #104082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkhamoyan merged 4 commits into from
Jul 1, 2024
+33 −30
Merged

[iOS][HybridGlobalization] Make consistent HybridGlobalization checks #104082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a794ba1
make consistent hybrid checks
mkhamoyan Jun 27, 2024
13d5e00
fix
mkhamoyan Jun 27, 2024
b42a1b1
fix browser build failure
mkhamoyan Jun 27, 2024
0f62b88
Merge branch 'main' into refactor_hybrid_checks
mkhamoyan Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ internal static int IcuGetCalendars(string localeName, CalendarId[] calendars)
int count;
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
{
count = Interop.Globalization.GetCalendarsNative(localeName, calendars, calendars.Length);
}
else
count = Interop.Globalization.GetCalendars(localeName, calendars, calendars.Length);
#else
count = Interop.Globalization.GetCalendars(localeName, calendars, calendars.Length);
#endif
{
count = Interop.Globalization.GetCalendars(localeName, calendars, calendars.Length);
}

// ensure there is at least 1 calendar returned
if (count == 0 && calendars.Length > 0)
Expand Down
10 changes: 4 additions & 6 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,12 +521,11 @@ private static CultureInfo[] IcuEnumCultures(CultureTypes types)
bufferLength = Interop.Globalization.GetLocalesNative(null, 0);
}
else
#endif
{
bufferLength = Interop.Globalization.GetLocales(null, 0);
}
#else
bufferLength = Interop.Globalization.GetLocales(null, 0);
#endif

if (bufferLength <= 0)
{
return Array.Empty<CultureInfo>();
Expand All @@ -540,12 +539,11 @@ private static CultureInfo[] IcuEnumCultures(CultureTypes types)
bufferLength = Interop.Globalization.GetLocalesNative(chars, bufferLength);
}
else
#endif
{
bufferLength = Interop.Globalization.GetLocales(chars, bufferLength);
}
#else
bufferLength = Interop.Globalization.GetLocales(chars, bufferLength);
#endif

if (bufferLength <= 0)
{
return Array.Empty<CultureInfo>();
Expand Down
23 changes: 11 additions & 12 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,11 +976,10 @@ internal string DisplayName
private string GetLanguageDisplayNameCore(string cultureName) => GlobalizationMode.UseNls ?
NlsGetLanguageDisplayName(cultureName) :
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
GlobalizationMode.Hybrid ? GetLocaleInfoNative(cultureName, LocaleStringData.LocalizedDisplayName, CultureInfo.CurrentUICulture.Name) :
IcuGetLanguageDisplayName(cultureName);
#else
IcuGetLanguageDisplayName(cultureName);
GlobalizationMode.Hybrid ?
GetLocaleInfoNative(cultureName, LocaleStringData.LocalizedDisplayName, CultureInfo.CurrentUICulture.Name) :
#endif
IcuGetLanguageDisplayName(cultureName);

/// <summary>
/// English pretty name for this locale (ie: English (United States))
Expand Down Expand Up @@ -1545,20 +1544,22 @@ internal int FirstDayOfWeek
if (_iFirstDayOfWeek == undef && !GlobalizationMode.Invariant)
{
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
_iFirstDayOfWeek = GlobalizationMode.Hybrid ? GetLocaleInfoNative(LocaleNumberData.FirstDayOfWeek) : IcuGetLocaleInfo(LocaleNumberData.FirstDayOfWeek);
if (GlobalizationMode.Hybrid)
{
_iFirstDayOfWeek = GetLocaleInfoNative(LocaleNumberData.FirstDayOfWeek);
}
else
#elif TARGET_BROWSER
if (GlobalizationMode.Hybrid)
{
Debug.Assert(_sName != null, "[FirstDayOfWeek] Expected _sName to be populated already");
_iFirstDayOfWeek = GetFirstDayOfWeek(_sName);
}
else
#endif
{
_iFirstDayOfWeek = IcuGetLocaleInfo(LocaleNumberData.FirstDayOfWeek);
_iFirstDayOfWeek = ShouldUseUserOverrideNlsData ? NlsGetFirstDayOfWeek() : IcuGetLocaleInfo(LocaleNumberData.FirstDayOfWeek);
}
#else
_iFirstDayOfWeek = ShouldUseUserOverrideNlsData ? NlsGetFirstDayOfWeek() : IcuGetLocaleInfo(LocaleNumberData.FirstDayOfWeek);
#endif
}
return _iFirstDayOfWeek;
}
Expand All @@ -1581,12 +1582,10 @@ internal int CalendarWeekRule
_iFirstWeekOfYear = GetFirstWeekOfYear(_sName);
}
else
#endif
{
_iFirstWeekOfYear = GetLocaleInfoCoreUserOverride(LocaleNumberData.FirstWeekOfYear);
}
#else
_iFirstWeekOfYear = GetLocaleInfoCoreUserOverride(LocaleNumberData.FirstWeekOfYear);
#endif
}
return _iFirstWeekOfYear;
}
Expand Down
22 changes: 13 additions & 9 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/Normalization.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ private static unsafe bool IcuIsNormalized(string strInput, NormalizationForm no
{
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
{
ret = Interop.Globalization.IsNormalizedNative(normalizationForm, pInput, strInput.Length);
}
else
ret = Interop.Globalization.IsNormalized(normalizationForm, pInput, strInput.Length);
#else
ret = Interop.Globalization.IsNormalized(normalizationForm, pInput, strInput.Length);
#endif
{
ret = Interop.Globalization.IsNormalized(normalizationForm, pInput, strInput.Length);
}
}

if (ret == -1)
Expand Down Expand Up @@ -61,13 +63,15 @@ private static unsafe string IcuNormalize(string strInput, NormalizationForm nor
fixed (char* pDest = &MemoryMarshal.GetReference(buffer))
{
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
realLen = Interop.Globalization.NormalizeStringNative(normalizationForm, pInput, strInput.Length, pDest, buffer.Length);
else
realLen = Interop.Globalization.NormalizeString(normalizationForm, pInput, strInput.Length, pDest, buffer.Length);
#else
realLen = Interop.Globalization.NormalizeString(normalizationForm, pInput, strInput.Length, pDest, buffer.Length);
if (GlobalizationMode.Hybrid)
{
realLen = Interop.Globalization.NormalizeStringNative(normalizationForm, pInput, strInput.Length, pDest, buffer.Length);
}
else
#endif
{
realLen = Interop.Globalization.NormalizeString(normalizationForm, pInput, strInput.Length, pDest, buffer.Length);
}
}

if (realLen == -1)
Expand Down