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

LCL, Translations unit: Improved/fixed comments handling:

Browse Source 
* Do not eat comment marker ('#') when regenerating file;
    * Do not move comments chaotically in the PO file: as per GetText manual they belong to the entry which follows them;
    * Discard "invalid" comments (lines not starting with '# ', '#.', '#:', '#,', '#|'), which confuse e.g. PoEdit.

git-svn-id: trunk@46094 -
This commit is contained in:
maxim 2014-08-31 00:52:38 +00:00
parent b2e16dc653
commit f0d304c56c
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lcl/translations.pas
View File

@ -607,6 +607,7 @@ var
Handled: Boolean; Handled: Boolean;
CurMsg: TMsg; CurMsg: TMsg;
Msg: array[TMsg] of string; Msg: array[TMsg] of string;
MsgStrFlag: boolean;
procedure ResetVars; procedure ResetVars;
begin begin
@ -618,6 +619,7 @@ var
Comments := ''; Comments := '';
Flags := ''; Flags := '';
PrevMsgID := ''; PrevMsgID := '';
MsgStrFlag := false;
end; end;
procedure AddEntry; procedure AddEntry;
@ -668,11 +670,13 @@ begin
case LineStart^ of case LineStart^ of
'#': '#':
begin begin
if MsgStrFlag=true then
//we detected comments after previous MsgStr. Consider it as start of new entry
AddEntry;
case LineStart[1] of case LineStart[1] of
':': ':':
if LineStart[2]=' ' then begin if LineStart[2]=' ' then begin
// '#: ' // '#: '
AddEntry;
Identifier:=copy(s,LineStart-p+4,LineLen-3); Identifier:=copy(s,LineStart-p+4,LineLen-3);
// the RTL creates identifier paths with point instead of colons // the RTL creates identifier paths with point instead of colons
// fix it: // fix it:
@ -700,7 +704,11 @@ begin
// '#' // '#'
if Comments<>'' then if Comments<>'' then
Comments := Comments + LineEnding; Comments := Comments + LineEnding;
Comments := Comments + GetUTF8String(LineStart+1,LineEnd); // if comment is valid then store it, otherwise omit it
if (LineStart[1]=' ') or (LineStart[1]='.') then
Comments := Comments + GetUTF8String(LineStart+1,LineEnd)
else
GetUTF8String(LineStart+1,LineEnd);
Handled:=true; Handled:=true;
end; end;
end; end;
@ -715,6 +723,7 @@ begin
end; end;
's': 's':
if IsKey(LineStart,'msgstr "') then begin if IsKey(LineStart,'msgstr "') then begin
MsgStrFlag:=true;
CurMsg:=mstr; CurMsg:=mstr;
Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+length('msgstr "'),LineEnd-1); Msg[CurMsg]:=Msg[CurMsg]+GetUTF8String(LineStart+length('msgstr "'),LineEnd-1);
Handled:=true; Handled:=true;
@ -1030,18 +1039,28 @@ var
FHelperList.Text:=AValue; FHelperList.Text:=AValue;
if FHelperList.Count=1 then begin if FHelperList.Count=1 then begin
if AProp='' then OutLst.Add(FHelperList[0]) if AProp='' then
else OutLst.Add(AProp+' "'+FHelperList[0]+'"'); OutLst.Add(FHelperList[0])
else begin
if AProp='#' then
//comments are not quoted
OutLst.Add(AProp+FHelperList[0])
else
OutLst.Add(AProp+' "'+FHelperList[0]+'"');
end;
end else begin end else begin
if AProp<>'' then //comments are not quoted, instead prepend each line with '#'
if (AProp<>'') and (AProp<>'#') then
OutLst.Add(AProp+' ""'); OutLst.Add(AProp+' ""');
for i:=0 to FHelperList.Count-1 do begin for i:=0 to FHelperList.Count-1 do begin
s := FHelperList[i]; s := FHelperList[i];
if AProp<>'' then begin if (AProp<>'') and (AProp<>'#') then begin
s := '"' + s + '\n"'; s := '"' + s + '\n"';
if AProp='#| msgid' then if AProp='#| msgid' then
s := '#| ' + s; s := '#| ' + s;
end; end else
if AProp='#' then
s := AProp + s;
OutLst.Add(s) OutLst.Add(s)
end; end;
end; end;
@ -1049,7 +1068,8 @@ var
procedure WriteItem(Item: TPOFileItem); procedure WriteItem(Item: TPOFileItem);
begin begin
WriteLst('',Item.Comments); if Item.Comments<>'' then
WriteLst('#', Item.Comments);
if Item.IdentifierLow<>'' then if Item.IdentifierLow<>'' then
OutLst.Add('#: '+Item.IdentifierLow); OutLst.Add('#: '+Item.IdentifierLow);
if Trim(Item.Flags)<>'' then if Trim(Item.Flags)<>'' then