kernel32: Mac lang. pref. overrides LANG, but not LC_ALL or LC_MESSAGES.

b58cd975 · Ken Thomases · Alexandre Julliard · 21acb71e · b58cd975
Commit b58cd975 authored Dec 09, 2009 by Ken Thomases Committed by Alexandre Julliard Dec 10, 2009
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

locale.c dlls/kernel32/locale.c +1 -1

No files found.
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -2971,7 +2971,7 @@ void LOCALE_Init(void)

 #ifdef __APPLE__
    /* Override lcid_LC_MESSAGES with user_language if LC_MESSAGES is set to default */
-    if (lcid_LC_MESSAGES == lcid_LC_CTYPE && user_language_string_ref)
+    if (user_language_string_ref && !getenv("LC_ALL") && !getenv("LC_MESSAGES"))
    {
        struct locale_name locale_name;
        WCHAR buffer[128];