kernel32: Strip modifiers from the Mac locale so setlocale can parse it.

The CFLocale API can produce locale identifiers with modifiers, such as "pl_PL@currency=EUR". However, the Mac setlocale() can't understand such locale strings.

kernel32: Strip modifiers from the Mac locale so setlocale can parse it.
59bf036c · Ken Thomases · Alexandre Julliard · 6a65f3b3 · 59bf036c
Commit 59bf036c authored Aug 07, 2008 by Ken Thomases Committed by Alexandre Julliard Aug 18, 2008
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

locale.c dlls/kernel32/locale.c +3 -0

No files found.
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -2867,12 +2867,15 @@ void LOCALE_Init(void)
    CFArrayRef preferred_locales, all_locales;
    CFStringRef user_language_string_ref = NULL;
    char user_locale[50];
+    char* p;
    CFLocaleRef user_locale_ref = CFLocaleCopyCurrent();
    CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref );
    CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 );
    CFRelease( user_locale_ref );
+    /* Strip modifiers because setlocale() can't parse them. */
+    if (p = strchr( user_locale, '@' )) *p = 0;
    if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" );
    unix_cp = CP_UTF8;  /* default to utf-8 even if we don't get a valid locale */
    setenv( "LANG", user_locale, 0 );