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

LazUtils: Mark PO translation string as badly formatted when original string does not have argument errors and translation has them. Allows to catch more formatting errors, e. g. when original contains %s%s and translation contains s%s%s% (note the order of 's' and '%' in translation).

Browse Source
This commit is contained in:
Maxim Ganetsky 2022-12-08 04:00:28 +03:00
parent 4f9ed1191e
commit a5c527068c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/lazutils/translations.pas
View File

@ -420,7 +420,16 @@ begin
begin
// If S1 contains arguments, then analyze S2
Extr2 := ExtractFormatArgs(S2, ArgErr2);
Result := UTF8CompareLatinTextFast(Extr1, Extr2) = 0;
// If S1 contains arguments without errors and S2 has errors,
// S2 formatting is bad, no further comparison needed.
// This allows to catch a case when S1 contains %s%s and S2 contains s%s%s%
// (note the order of 's' and '%' in S2).
// All other cases (no errors in both S1 and S2, errors in both S1 and S2,
// errors in S1 but not S2) warrant performing argument comparison.
if (ArgErr1 = 0) and (ArgErr2 <> 0) then
Result := false
else
Result := UTF8CompareLatinTextFast(Extr1, Extr2) = 0;
end;
end;
end;