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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b58cd975ba1322850a35f6aebc76adab348f6df8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b58cd975ba1322850a35f6aebc...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Wed Dec  9 15:03:07 2009 -0600

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

---

 dlls/kernel32/locale.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index ac33e78..0b466e0 100644
--- 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];