paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-02 17:19:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TPOFile: fixed continuation lines

Browse Source 
git-svn-id: trunk@35387 -
This commit is contained in:
mattias 2012-02-16 01:52:28 +00:00
parent b75cbdf949
commit 5803ddeab4
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lcl/translations.pas
View File

@ -580,6 +580,12 @@ msgid " Do not show splash screen"
msgstr ""
}
type
TMsg = (
mid,
mstr,
mctx
);
var
l: Integer;
LineLen: Integer;
@ -587,10 +593,8 @@ var
LineStart: PChar;
LineEnd: PChar;
Identifier: String;
MsgID,MsgStr,PrevMsgID: String;
Line: String;
PrevMsgID: String;
Comments: String;
Context: string;
Flags: string;
TextEnd: PChar;
i: Integer;
@ -598,15 +602,17 @@ var
NewSrc: String;
s: String;
Handled: Boolean;
CurMsg: TMsg;
Msg: array[TMsg] of string;
procedure ResetVars;
begin
MsgId := '';
MsgStr := '';
Line := '';
CurMsg:=mid;
Msg[mid]:='';
Msg[mstr]:='';
Msg[mctx]:='';
Identifier := '';
Comments := '';
Context := '';
Flags := '';
PrevMsgID := '';
end;
@ -617,24 +623,24 @@ var
begin
if Identifier<>'' then begin
// check for unresolved duplicates in po file
Item := TPOFileItem(FOriginalToItem.Data[MsgID]);
Item := TPOFileItem(FOriginalToItem.Data[Msg[mid]]);
if (Item<>nil) then begin
// fix old duplicate context
if Item.Context='' then
Item.Context:=Item.IdentifierLow;
// set context of new duplicate
if Context='' then
Context := Identifier;
if Msg[mctx]='' then
Msg[mctx] := Identifier;
// if old duplicate was translated and
// new one is not, provide a initial translation
if MsgStr='' then
MsgStr := Item.Translation;
if Msg[mstr]='' then
Msg[mstr] := Item.Translation;
end;
Add(Identifier,MsgID,MsgStr,Comments,Context,Flags,PrevMsgID);
Add(Identifier,Msg[mid],Msg[mstr],Comments,Msg[mctx],Flags,PrevMsgID);
ResetVars;
end else
if (Line<>'') and (FHeader=nil) then begin
FHeader := TPOFileItem.Create('',MsgID,Line);
if (Msg[CurMsg]<>'') and (FHeader=nil) then begin
FHeader := TPOFileItem.Create('',Msg[mid],Msg[CurMsg]);
FHeader.Comments:=Comments;
ResetVars;
end
@ -648,10 +654,7 @@ begin
LineStart:=p;
TextEnd:=p+l;
Identifier:='';
Comments:='';
Line:='';
Flags:='';
ResetVars;
while LineStart<TextEnd do begin
LineEnd:=LineStart;
@ -680,7 +683,7 @@ begin
PrevMsgID:=PrevMsgID+GetUTF8String(LineStart+length('#| msgid "'),LineEnd-1);
Handled:=true;
end else if IsKey(LineStart, '#| "') then begin
Line := Line + GetUTF8String(LineStart+length('#| "'),LineEnd-1);
Msg[CurMsg] := Msg[CurMsg] + GetUTF8String(LineStart+length('#| "'),LineEnd-1);
Handled:=true;
end;
',':
@ -703,24 +706,27 @@ begin
case LineStart[3] of
'i':
if IsKey(LineStart,'msgid "') then begin
MsgID:=MsgID+GetUTF8String(LineStart+length('msgid "'),LineEnd-1);
CurMsg:=mid;
Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+length('msgid "'),LineEnd-1);
Handled:=true;
end;
's':
if IsKey(LineStart,'msgstr "') then begin
MsgStr:=MsgStr+GetUTF8String(LineStart+length('msgstr "'),LineEnd-1);
CurMsg:=mstr;
Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+length('msgstr "'),LineEnd-1);
Handled:=true;
end;
'c':
if IsKey(LineStart, 'msgctxt "') then begin
Context:=GetUTF8String(LineStart+length('msgctxt "'), LineEnd-1);
CurMsg:=mctx;
Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+length('msgctxt "'), LineEnd-1);
Handled:=true;
end;
end;
end;
'"':
begin
if (MsgID='')
if (Msg[mid]='')
and IsKey(LineStart,'"Content-Type: text/plain; charset=') then
begin
FCharSet:=GetUTF8String(LineStart+length('"Content-Type: text/plain; charset='),LineEnd);
@ -740,7 +746,8 @@ begin
LineLen:=LineEnd-LineStart;
end;
end;
Line := Line + GetUTF8String(LineStart+1,LineEnd-1);
// continuation
Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+1,LineEnd-1);
Handled:=true;
end;
end;
@ -748,7 +755,7 @@ begin
AddEntry;
end;
LineStart:=LineEnd+1;
while (LineStart<TextEnd) and (LineStart^ in [#10,#13]) do inc(LineStart);
while (LineStart^ in [#10,#13]) do inc(LineStart);
end;
AddEntry;
end;