PR feedback

dotnet · May 3, 2022 · 5f367d5 · 5f367d5
1 parent 5f034bc
commit 5f367d5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/native/libs/System.Globalization.Native/pal_locale.c b/src/native/libs/System.Globalization.Native/pal_locale.c
@@ -129,9 +129,11 @@ int32_t FixupLocaleName(UChar* value, int32_t valueLength)
     return i;
 }
 
-// We use whatever ICU give us as the default locale except if it is en_US_POSIX. We'll map
-// this POSIX locale to Invariant instead. The reason is POSIX locale collation behavior
-// is not desirable at all because it doesn't support case insensitive string comparisons.
+// We use whatever ICU give us as the default locale except if it is en_US_POSIX. 
+//
+// On Apple related platforms (OSX, iOS, tvOS, MacCatalyst), we'll take what the system locale is.  
+// On all other platforms we'll map this POSIX locale to Invariant instead. 
+// The reason is POSIX locale collation behavior is not desirable at all because it doesn't support case insensitive string comparisons.
 const char* DetectDefaultLocaleName()
 {
     const char* icuLocale;
@@ -140,11 +142,7 @@ const char* DetectDefaultLocaleName()
 
     if (strcmp(icuLocale, "en_US_POSIX") == 0)
     {
-#ifdef TARGET_OS_MAC
-        icuLocale = DetectDefaultAppleLocaleName();
-#else
         return "";
-#endif
     }
 
     return icuLocale;
@@ -223,6 +221,16 @@ int32_t GlobalizationNative_GetDefaultLocaleName(UChar* value, int32_t valueLeng
 
     const char* defaultLocale = DetectDefaultLocaleName();
 
+#ifdef __APPLE__
+    char* appleLocale = NULL;
+
+    if (strcmp(defaultLocale, "") == 0)
+    {
+        appleLocale = DetectDefaultAppleLocaleName();
+        defaultLocale = appleLocale;
+    }
+#endif
+
     uloc_getBaseName(defaultLocale, localeNameBuffer, ULOC_FULLNAME_CAPACITY, &status);
     u_charsToUChars_safe(localeNameBuffer, value, valueLength, &status);
 
@@ -243,6 +251,11 @@ int32_t GlobalizationNative_GetDefaultLocaleName(UChar* value, int32_t valueLeng
         }
     }
 
+#ifdef __APPLE__
+    if (appleLocale)
+        free(appleLocale);
+#endif
+
     return UErrorCodeToBool(status);
 }
 

diff --git a/src/native/libs/System.Globalization.Native/pal_locale.m b/src/native/libs/System.Globalization.Native/pal_locale.m
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 
-const char* DetectDefaultAppleLocaleName()
+char* DetectDefaultAppleLocaleName()
 {
     NSLocale *currentLocale = [NSLocale currentLocale];
     NSString *localeName = @"";

diff --git a/src/native/libs/System.Globalization.Native/pal_locale_internal.h b/src/native/libs/System.Globalization.Native/pal_locale_internal.h
@@ -59,5 +59,5 @@ DetectDefaultSystemLocaleName
 
 Detects the default locale string for Apple platforms
 */
-const char* DetectDefaultAppleLocaleName(void);
+char* DetectDefaultAppleLocaleName(void);
 #endif