ntdll: Initialize locale from Mac language identifiers with script name.

730bdf6c · Jactry Zeng · Alexandre Julliard · c2f4619d · 730bdf6c
Commit 730bdf6c authored Nov 28, 2023 by Jactry Zeng Committed by Alexandre Julliard Nov 28, 2023
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

env.c dlls/ntdll/unix/env.c +6 -1

No files found.
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -833,6 +833,7 @@ static void init_locale(void)
            {
                CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode );
                CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode );
+                CFStringRef script = CFDictionaryGetValue( components, kCFLocaleScriptCode );
                CFLocaleRef mac_user_locale = NULL;
                CFStringRef locale_string;

@@ -841,7 +842,11 @@ static void init_locale(void)
                    mac_user_locale = CFLocaleCopyCurrent();
                    country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode );
                }
-                if (country)
+                if (country && script)
+                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@-%@"), lang, script, country );
+                else if (script)
+                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, script );
+                else if (country)
                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country );
                else
                    locale_string = CFStringCreateCopy( NULL, lang );