paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-10 12:48:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: lcltranslator: fixed translating only TTranslateString properties

Browse Source 
git-svn-id: trunk@56119 -
This commit is contained in:
mattias 2017-10-18 08:50:38 +00:00
parent 8300e744e7
commit feb16f7063
1 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
lcl/lcltranslator.pas
View File

@ -38,8 +38,11 @@ uses
// RTL + FCL
Classes, SysUtils, typinfo, GetText,
// LCL
LResources, Forms,
LResources, Forms, LCLType,
// LazUtils
{$IFDEF VerbosePOTranslator}
LazLoggerBase,
{$ENDIF}
Translations, LazFileUtils, LazUTF8;
type
@ -334,48 +337,54 @@ begin
case APropInfo^.PropType^.Kind of
tkSString,
tkLString,
tkAString: begin
TmpStr := '';
LRSTranslator.TranslateStringProperty(self,aninstance,APropInfo,TmpStr);
if TmpStr <>'' then
SetStrProp(AnInstance, APropInfo, TmpStr);
end;
tkclass: begin
APersistentProp := TPersistent(GetObjectProp(AnInstance, APropInfo, TPersistent));
if Assigned(APersistentProp) then
begin
if APersistentProp is TCollection then
begin
for j := 0 to TCollection(APersistentProp).Count-1 do
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+APropInfo^.Name+'['+inttostr(j)+']';
IntUpdateTranslation(TCollection(APersistentProp).Items[j]);
FStackPath:=StoreStackPath;
end;
end
else
begin
if APersistentProp is TComponent then
begin
if (csSubComponent in TComponent(APersistentProp).ComponentStyle) then
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+TComponent(APersistentProp).Name;
IntUpdateTranslation(APersistentProp);
FStackPath:=StoreStackPath;
end
end
else
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+APropInfo^.Name;
IntUpdateTranslation(APersistentProp);
FStackPath:=StoreStackPath;
end;
end;
end;
end;
tkAString:
if APropInfo^.PropType=TypeInfo(TTranslateString) then
begin
TmpStr := '';
{$IFDEF VerbosePOTranslator}
debugln(['TUpdateTranslator.IntUpdateTranslation ',GetStrProp(AnInstance,APropInfo)]);
{$ENDIF}
LRSTranslator.TranslateStringProperty(Self,AnInstance,APropInfo,TmpStr);
if TmpStr <>'' then
SetStrProp(AnInstance, APropInfo, TmpStr);
end;
tkClass:
begin
APersistentProp := TPersistent(GetObjectProp(AnInstance, APropInfo, TPersistent));
if Assigned(APersistentProp) then
begin
if APersistentProp is TCollection then
begin
for j := 0 to TCollection(APersistentProp).Count-1 do
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+APropInfo^.Name+'['+IntToStr(j)+']';
IntUpdateTranslation(TCollection(APersistentProp).Items[j]);
FStackPath:=StoreStackPath;
end;
end
else
begin
if APersistentProp is TComponent then
begin
if (csSubComponent in TComponent(APersistentProp).ComponentStyle) then
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+TComponent(APersistentProp).Name;
IntUpdateTranslation(APersistentProp);
FStackPath:=StoreStackPath;
end
end
else
begin
StoreStackPath:=FStackPath;
FStackPath:=FStackPath+'.'+APropInfo^.Name;
IntUpdateTranslation(APersistentProp);
FStackPath:=StoreStackPath;
end;
end;
end;
end;
end;
end;
finally
@ -470,6 +479,9 @@ begin
if Assigned(FPOFile) then
begin
s := GetIdentifierPath(Sender, Instance, PropInfo);
{$IFDEF VerbosePOTranslator}
debugln(['TPOTranslator.TranslateStringProperty Content="',Content,'" s="',s,'" Instance=',Instance.ClassName,' PropInfo.Name=',PropInfo^.Name]);
{$ENDIF}
if s <> '' then
begin
s := FPOFile.Translate(s, Content);
@ -517,7 +529,7 @@ begin
if lcfn='' then
begin
// try now with MO traslation resources
// try now with MO translation resources
try
lcfn := FindLocaleFileName('.mo', Lang, Dir);
if lcfn <> '' then