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

LCLTranslator: made TranslateLCLResourceStrings return found language for symmetry with SetDefaultLang

Browse Source 
git-svn-id: trunk@61602 -
This commit is contained in:
maxim 2019-07-18 22:41:43 +00:00
parent a67db5c7a4
commit bd30dff893
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/lcltranslator.pas
View File

@ -80,7 +80,7 @@ type
PropInfo: PPropInfo; var Content: string); override; PropInfo: PPropInfo; var Content: string); override;
end; end;
procedure TranslateLCLResourceStrings(Lang, Dir: string); function TranslateLCLResourceStrings(Lang, Dir: string): string;
function SetDefaultLang(Lang: string; Dir: string = ''; LocaleFileName: string = ''; ForceUpdate: boolean = true): string; function SetDefaultLang(Lang: string; Dir: string = ''; LocaleFileName: string = ''; ForceUpdate: boolean = true): string;
function GetDefaultLang: String; deprecated 'Use SetDefaultLang function result instead'; // Lazarus 2.1.0 function GetDefaultLang: String; deprecated 'Use SetDefaultLang function result instead'; // Lazarus 2.1.0
@ -532,17 +532,17 @@ begin
end; end;
end; end;
procedure TranslateLCLResourceStrings(Lang, Dir: string); function TranslateLCLResourceStrings(Lang, Dir: string): string;
var var
LCLPath, FoundLang: string; LCLPath: string;
begin begin
FoundLang:=''; Result:='';
LCLPath:=FindLocaleFileName('.po', Lang, ExtractFilePath(Dir), 'lclstrconsts', FoundLang); LCLPath:=FindLocaleFileName('.po', Lang, ExtractFilePath(Dir), 'lclstrconsts', Result);
if LCLPath<>'' then if LCLPath<>'' then
Translations.TranslateUnitResourceStrings('LCLStrConsts', LCLPath) Translations.TranslateUnitResourceStrings('LCLStrConsts', LCLPath)
else else
begin begin
LCLPath:=FindLocaleFileName('.mo', Lang, ExtractFilePath(Dir), 'lclstrconsts', FoundLang); LCLPath:=FindLocaleFileName('.mo', Lang, ExtractFilePath(Dir), 'lclstrconsts', Result);
if LCLPath<>'' then if LCLPath<>'' then
GetText.TranslateResourceStrings(UTF8ToSys(LCLPath)); GetText.TranslateResourceStrings(UTF8ToSys(LCLPath));
end; end;