paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-09 18:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCLTranslator: make GetDefaultLang function result independent of LCL translation presence. Now it depends only on presence of interface translation. This behavior makes sense in cases when interface translation present and LCL one missing, or the other way round.

Browse Source 
git-svn-id: trunk@61543 -
This commit is contained in:
maxim 2019-07-07 23:22:34 +00:00
parent 631fcf53e1
commit 787897eba2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/lcltranslator.pas
View File

@ -536,8 +536,12 @@ end;
procedure TranslateLCLResourceStrings(Lang, Dir: string);
var
LCLPath: string;
LCLPath, DefaultLangBackup: string;
begin
// DefaultLang value is preserved when translating LCL, so it will depend only
// on presence of interface translation. Useful when interface translation present
// and LCL one missing, or the other way round.
DefaultLangBackup:=DefaultLang;
LCLPath:=FindLocaleFileName('.po', Lang, ExtractFilePath(Dir), 'lclstrconsts');
if LCLPath<>'' then
Translations.TranslateUnitResourceStrings('LCLStrConsts', LCLPath)
@ -547,6 +551,7 @@ begin
if LCLPath<>'' then
GetText.TranslateResourceStrings(UTF8ToSys(LCLPath));
end;
DefaultLang:=DefaultLangBackup;
end;
procedure SetDefaultLang(Lang: string; Dir: string = ''; LocaleFileName: string = ''; ForceUpdate: boolean = true);