mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-29 16:29:33 +02:00
LCLProc darwin: a better fix for LCLGetLanguageIDs
git-svn-id: trunk@20946 -
This commit is contained in:
parent
ea03b8aa2d
commit
9c89f78e08
@ -4232,7 +4232,6 @@ procedure LCLGetLanguageIDs(var Lang, FallbackLang: String);
|
||||
StrRange: CFRange;
|
||||
begin
|
||||
Result := 'en';
|
||||
if CFBundleGetMainBundle = nil then Exit;
|
||||
LangArray := CFBundleCopyLocalizationsForPreferences(CFBundleCopyBundleLocalizations(CFBundleGetMainBundle), nil);
|
||||
try
|
||||
if CFArrayGetCount(LangArray) > 0 then
|
||||
@ -4256,8 +4255,13 @@ procedure LCLGetLanguageIDs(var Lang, FallbackLang: String);
|
||||
{$ENDIF}
|
||||
begin
|
||||
{$IFDEF DARWIN}
|
||||
Lang := GetLanguage;
|
||||
FallbackLang := Copy(Lang, 1, 2);
|
||||
if CFBundleGetMainBundle = nil then
|
||||
GetLanguageIDs(Lang, FallbackLang)
|
||||
else
|
||||
begin
|
||||
Lang := GetLanguage;
|
||||
FallbackLang := Copy(Lang, 1, 2);
|
||||
end;
|
||||
{$ELSE}
|
||||
GetLanguageIDs(Lang, FallbackLang);
|
||||
{$ENDIF}
|
||||
|
Loading…
Reference in New Issue
Block a user