PoChecker: don't use SimplePoFiles anymore, all it's functionality now is in Translations unit. Patch by G. Colla.

git-svn-id: trunk@46638 -

components/pochecker/Proj/pochecker.lpi

@@ -75,7 +75,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="10">
+    <Units Count="9">
       <Unit0>
         <Filename Value="pochecker.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -94,47 +94,42 @@
         <UnitName Value="ResultDlg"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\simplepofiles.pp"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="SimplePoFiles"/>
-      </Unit3>
-      <Unit4>
         <Filename Value="..\pocheckerconsts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pocheckerconsts"/>
-      </Unit4>
-      <Unit5>
+      </Unit3>
+      <Unit4>
         <Filename Value="..\pocheckermain.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="PoCheckerForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="pocheckermain"/>
-      </Unit5>
-      <Unit6>
+      </Unit4>
+      <Unit5>
         <Filename Value="..\graphstat.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="GraphStatForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="GraphStat"/>
-      </Unit6>
-      <Unit7>
+      </Unit5>
+      <Unit6>
         <Filename Value="..\pocheckersettings.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PoCheckerSettings"/>
-      </Unit7>
-      <Unit8>
+      </Unit6>
+      <Unit7>
         <Filename Value="..\pofamilylists.pp"/>
         <IsPartOfProject Value="True"/>
-      </Unit8>
-      <Unit9>
+      </Unit7>
+      <Unit8>
         <Filename Value="..\pocheckermemodlg.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="MemoForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit9>
+      </Unit8>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -156,7 +151,7 @@
       </Options>
     </Linking>
     <Other>
-      <CustomOptions Value="-dPoCheckerStandAlone -dUSE_NEW_TRANSLATIONS"/>
+      <CustomOptions Value="-dPoCheckerStandAlone"/>
     </Other>
   </CompilerOptions>
   <Debugging>

components/pochecker/Proj/pochecker.lpr

@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, pocheckermain, pofamilies, resultdlg, simplepofiles, pocheckerconsts,
+  Forms, pocheckermain, pofamilies, resultdlg, pocheckerconsts,
   graphstat, pocheckersettings, pofamilylists;
 
 {$R *.res}

components/pochecker/graphstat.pp

@@ -130,7 +130,6 @@ var
   anItem: TListItem;
   anIndex: Integer;
   AStat: TStat;
-  mr: TModalResult;
 begin
   anItem := Listview.GetItemAt(X, Y);
   {$ifdef pocheckerstandalone}

components/pochecker/pochecker.lpk

@@ -10,13 +10,13 @@
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
-        <CustomOptions Value="$(IDEBuildOptions) -dUSE_NEW_TRANSLATIONS"/>
+        <CustomOptions Value="$(IDEBuildOptions)"/>
       </Other>
     </CompilerOptions>
     <Description Value="Check the validity of translated PO files.
 "/>
     <Version Major="1"/>
-    <Files Count="11">
+    <Files Count="10">
       <Item1>
         <Filename Value="resultdlg.pp"/>
         <UnitName Value="ResultDlg"/>
@@ -35,33 +35,29 @@
         <UnitName Value="pocheckermain"/>
       </Item4>
       <Item5>
-        <Filename Value="simplepofiles.pp"/>
-        <UnitName Value="SimplePoFiles"/>
-      </Item5>
-      <Item6>
         <Filename Value="pocheckermain.lfm"/>
         <Type Value="LFM"/>
-      </Item6>
-      <Item7>
+      </Item5>
+      <Item6>
         <Filename Value="pocheckerconsts.pas"/>
         <UnitName Value="pocheckerconsts"/>
-      </Item7>
-      <Item8>
+      </Item6>
+      <Item7>
         <Filename Value="graphstat.lfm"/>
         <Type Value="LFM"/>
-      </Item8>
-      <Item9>
+      </Item7>
+      <Item8>
         <Filename Value="graphstat.pp"/>
         <UnitName Value="GraphStat"/>
-      </Item9>
-      <Item10>
+      </Item8>
+      <Item9>
         <Filename Value="pocheckersettings.pp"/>
         <UnitName Value="PoCheckerSettings"/>
-      </Item10>
-      <Item11>
+      </Item9>
+      <Item10>
         <Filename Value="pocheckerxmlconfig.pp"/>
         <UnitName Value="PoCheckerXMLConfig"/>
-      </Item11>
+      </Item10>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>

components/pochecker/pochecker.pas

@@ -7,8 +7,8 @@ unit PoChecker;
 interface
 
 uses
-  ResultDlg, PoFamilies, pocheckermain, SimplePoFiles, pocheckerconsts, 
-  GraphStat, PoCheckerSettings, PoCheckerXMLConfig, LazarusPackageIntf;
+  ResultDlg, PoFamilies, pocheckermain, pocheckerconsts, GraphStat, 
+  PoCheckerSettings, PoCheckerXMLConfig, LazarusPackageIntf;
 
 implementation
 

components/pochecker/pocheckermain.pp

@@ -26,13 +26,11 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
   StdCtrls, LCLProc, CheckLst, Buttons, ExtCtrls, ComCtrls, Types,
-  LCLType,
-  {$IFDEF POCHECKERSTANDALONE}
-  Translations,
-  {$ELSE}
-  IDEIntf, MenuIntf,{$IFDEF USE_NEW_TRANSLATIONS}Translations,{$ENDIF}
+  LCLType, Translations,
+  {$IFnDEF POCHECKERSTANDALONE}
+  IDEIntf, MenuIntf,
   {$ENDIF}
-  SimplePoFiles, PoFamilies, ResultDlg, pocheckerconsts, PoCheckerSettings,
+  PoFamilies, ResultDlg, pocheckerconsts, PoCheckerSettings,
   PoFamilyLists, PoCheckerMemoDlg;
 
 type
@@ -163,7 +161,7 @@ end;
 
 procedure TPoCheckerForm.OpenBtnClick(Sender: TObject);
 var
-  Fn: String;
+  Fn,Mn,l: String;
   Idx: Integer;
 begin
   if TrySelectFile(Fn) then
@@ -174,6 +172,21 @@ begin
       Idx := MasterPoListBox.Items.IndexOf(Fn);
       if (Idx <> -1) then
         MasterPoListBox.Selected[Idx] := True;
+    end
+    else begin
+      Mn := ExtractMasterNameFromChildName(Fn);
+      if Mn <> '' then begin
+        AddToMasterPoList(Mn);
+        Idx := MasterPoListBox.Items.IndexOf(Mn);
+        if (Idx <> -1) then
+          MasterPoListBox.Selected[Idx] := True;
+        l := ExtractLanguageFromChildName(Fn);
+        l := '[' + l + ']';
+        for Idx := 0 to LangFilter.Items.Count -1 do begin
+           if pos(l,LangFilter.Items[Idx]) <> 0 then
+             LangFilter.ItemIndex := Idx;
+        end;
+      end;
     end;
     UpdateGUI(MasterPoListBox.SelCount > 0);
   end;
@@ -915,7 +928,7 @@ end;
 
 function SameItem(Item1, Item2: TPoFileItem): boolean;
 begin
-  Result := (Item1.Identifier = Item2.Identifier) and
+  Result := (Item1.IdentifierLow = Item2.IdentifierLow) and
     (Item1.Original = Item2.Original) and (Item1.Context = Item2.Context) and
     (Item1.Flags = Item2.Flags) and (Item1.PreviousID = Item2.PreviousID) and
     (Item1.Translation = Item2.Translation);

components/pochecker/pofamilies.pp

@@ -8,7 +8,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, FileUtil, StringHashList, ContNrs, Math,
-  Masks,{$IFDEF USE_NEW_TRANSLATIONS}Translations ,{$ENDIF}SimplePoFiles, PoCheckerConsts;
+  Masks, Translations, PoCheckerConsts;
 
 Type
 
@@ -41,8 +41,8 @@ Type
 
   TPoFamily = class
   private
-    FMaster: TSimplePoFile;
-    FChild: TSimplePoFile;
+    FMaster: TPOFile;
+    FChild: TPOFile;
     FMasterName: String;
     FChildName: String;
     FOnTestStart: TTestStartEvent;
@@ -74,8 +74,8 @@ Type
   public
     procedure RunTests(out ErrorCount, WarningCount: Integer; ErrorLog: TStrings);
 
-    property Master: TSimplePoFile read FMaster;
-    property Child: TSimplePoFile read FChild;
+    property Master: TPOFile read FMaster;
+    property Child: TPOFile read FChild;
     property MasterName: String read FMasterName write SetMasterName;
     property ChildName: String read FChildName write SetChildName;
     property TestTypes: TPoTestTypes read FTestTypes write FTestTypes;
@@ -133,9 +133,10 @@ Type
     property Count: Integer read GetCount;
   end;
 
-function ExtractFormatArgs(S: String; out ArgumentError: Integer): String;
+{function ExtractFormatArgs(S: String; out ArgumentError: Integer): String;}
 function IsMasterPoName(const Fn: String): Boolean;
 function ExtractMasterNameFromChildName(const AChildName: String): String;
+function ExtractLanguageFromChildName(const AChildName: string): String;
 function FindAllTranslatedPoFiles(const Filename: string): TStringList;
 procedure LocalizePoTestTypeNames;
 
@@ -171,7 +172,7 @@ const
 
 //Helper functions
 
-function ExtractFormatArgs(S: String; out ArgumentError: Integer): String;
+{function ExtractFormatArgs(S: String; out ArgumentError: Integer): String;
 const
   FormatArgs = 'DEFGMNPSUX';
   FormatChar = '%';
@@ -211,7 +212,7 @@ begin
       ArgumentError := Utf8Length(NewStr) + 1;
   end;
   Result := NewStr;
-end;
+end;}
 
 function IsMasterPoName(const Fn: String): Boolean;
 //Returns True if Fn is like '[Path/To/]somename.po'
@@ -257,6 +258,19 @@ begin
     Result := '';
 end;
 
+function ExtractLanguageFromChildName(const AChildName: string): String;
+Var
+  Mn: string;
+  P1,P2: Integer;
+begin
+  Mn := ExtractMasterNameFromChildName(AChildName);
+  Mn := ExtractFileNameWithoutExt(Mn);
+  P1 := Length(Mn);
+  P2 := Length(AChildName);
+  Result := Copy(AChildName,P1+2,P2-(P1+1));
+  Result := ExtractFileNameWithoutExt(Result);
+end;
+
 function FindAllTranslatedPoFiles(const Filename: string): TStringList;
 var
   Path: String;
@@ -299,7 +313,7 @@ end;
 
 
 
-function CompareFormatArgs(S1, S2: String): Boolean;
+{function CompareFormatArgs(S1, S2: String): Boolean;
 var
   Extr1, Extr2: String;
   ArgErr1, ArgErr2: Integer;
@@ -337,7 +351,7 @@ begin
     end;
     //writeln('CompareFormatArgs: Result = ',Result);
   end;
-end;
+end;}
 
 { TStat }
 
@@ -475,7 +489,7 @@ begin
   FMaster.Free;
   FMaster := nil;
   FMasterName := '';
-  if (AValue <> '') then FMaster := TSimplePoFile.Create(AValue{, True});
+  if (AValue <> '') then FMaster := TPOFile.Create(AValue, True);
   FMasterName := AValue;
 end;
 
@@ -506,7 +520,7 @@ begin
   FChild.Free;
   FChild := nil;
   FChildName := '';
-  if (AValue <> '') then FChild := TSimplePoFile.Create(AValue{, True});
+  if (AValue <> '') then FChild := TPOFile.Create(AValue, True);
   FChildName := AValue;
 end;
 
@@ -524,13 +538,13 @@ constructor TPoFamily.Create(const AMasterName, AChildName: String);
 begin
   if (AMasterName <> '') then
   begin
-    FMaster := TSimplePoFile.Create(AMasterName, True);
+    FMaster := TPOFile.Create(AMasterName, True);
     FMasterName := AMasterName;
     //debugln('TPoFamily.Create: created ',FMasterName);
   end;
   if (AChildName <> '') then
   begin
-    FChild := TSimplePoFile.Create(AChildName, True);
+    FChild := TPOFile.Create(AChildName, True);
     FChildName := AChildName;
     //debugln('TPoFamily.Create: created ',FChildName);
   end;
@@ -574,6 +588,7 @@ var
   i: Integer;
   CPoItem: TPOFileItem;
   IsFuzzy: Boolean;
+  IsBadFormat: Boolean;
 begin
   //debugln('TPoFamily.CheckFormatArgs');
   DoTestStart(PoTestTypeNames[pttCheckFormatArgs], ShortChildName);
@@ -584,12 +599,13 @@ begin
     //debugln('  i = ',DbgS(i));
     //MPoItem := FMaster.PoItems[i];
     CPoItem := FChild.PoItems[i];
-    //CPoItem := FChild.FindPoItem(MPoItem.Identifier);
+    //CPoItem := FChild.FindPoItem(MPoItem.IdentifierLow);
     if Assigned(CPoItem) then
     begin
       IsFuzzy := (Pos('fuzzy', CPoItem.Flags) > 0);
+      IsBadFormat := (Pos('badformat', CPoItem.Flags) > 0);
       //if (IgnoreFuzzyStrings and IsFuzzy) then debugln('Skipping fuzzy translation: ',CPoItem.Translation);
-      if (Length(CPoItem.Translation) > 0) and (not (IgnoreFuzzyStrings and IsFuzzy)) and (not CompareFormatArgs(CPoItem.Original, CPoItem.Translation)) then
+      if (Length(CPoItem.Translation) > 0) and (not (IgnoreFuzzyStrings and IsFuzzy)) and IsBadFormat then
       begin
         if (ErrorCount = 0) then
         begin
@@ -601,7 +617,7 @@ begin
         end;
         Inc(ErrorCount);
         ErrorLog.Add(Format(sIncompatibleFormatArgs,[CPoItem.LineNr]));
-        ErrorLog.Add(Format(sFormatArgsID,[sCommentIdentifier, CPoItem.Identifier]));
+        ErrorLog.Add(Format(sFormatArgsID,[sCommentIdentifier, CPoItem.IdentifierLow]));
         ErrorLog.Add(Format(sFormatArgsValues,[sMsgID,CPoItem.Original,sOriginal]));
         ErrorLog.Add(Format(sFormatArgsValues,[sMsgStr,CPoItem.Translation,sTranslation]));
         if IsFuzzy then ErrorLog.Add(sNoteTranslationIsFuzzy);
@@ -632,9 +648,9 @@ begin
   for i := 0 to FMaster.Count - 1 do
   begin
     MPoItem := FMaster.PoItems[i];
-    if Assigned(MPoItem) and (MPoItem.Identifier <> '') then
+    if Assigned(MPoItem) and (MPoItem.IdentifierLow <> '') then
     begin
-      CPoItem := FChild.FindPoItem(MPoItem.Identifier);
+      CPoItem := FChild.FindPoItem(MPoItem.IdentifierLow);
       if not Assigned(CPoItem) then
       begin
         if (ErrorCount = 0) then
@@ -649,7 +665,7 @@ begin
         ErrorLog.Add(Format(sLineInFileName,
                             [MPoItem.LineNr,ShortMasterName]));
         ErrorLog.Add(Format(sIdentifierNotFoundIn,
-                            [MPoItem.Identifier,ShortChildName]));
+                            [MPoItem.IdentifierLow,ShortChildName]));
         ErrorLog.Add('');
       end;
     end;
@@ -658,9 +674,9 @@ begin
   for i := 0 to FChild.Count - 1 do
   begin
     CPoItem := FChild.PoItems[i];
-    if Assigned(CPoItem) and (CPoItem.Identifier <> '') then
+    if Assigned(CPoItem) and (CPoItem.IdentifierLow <> '') then
     begin
-      MPoItem := FMaster.FindPoItem(CPoItem.Identifier);
+      MPoItem := FMaster.FindPoItem(CPoItem.IdentifierLow);
       if not Assigned(MPoItem) then
       begin
         if (ErrorCount = 0) then
@@ -675,7 +691,7 @@ begin
         ErrorLog.Add(Format(sLineNr,
                             [CPoItem.LineNr]));
         ErrorLog.Add(Format(sMissingMasterIdentifier,
-                            [CPoItem.Identifier,ShortChildName,ShortMasterName]));
+                            [CPoItem.IdentifierLow,ShortChildName,ShortMasterName]));
         ErrorLog.Add('');
       end;
     end;
@@ -703,7 +719,7 @@ begin
   for i := 0 to FMaster.Count - 1 do
   begin
     MPoItem := FMaster.PoItems[i];
-    CPoItem := FChild.FindPoItem(MpoItem.Identifier);
+    CPoItem := FChild.FindPoItem(MpoItem.IdentifierLow);
     if Assigned(CPoItem) then
     begin
       if (MPoItem.Original <> CPoItem.Original) then
@@ -718,7 +734,7 @@ begin
         end;
         Inc(ErrorCount);
         ErrorLog.Add(Format(sLineInFileName,[CpoItem.LineNr, ShortChildName]));
-        ErrorLog.Add(Format(sMismatchOriginalsID,[CPoItem.Identifier]));
+        ErrorLog.Add(Format(sMismatchOriginalsID,[CPoItem.IdentifierLow]));
         ErrorLog.Add(Format(sMismatchOriginalsM,[ShortMasterName,MPoItem.Original]));
         ErrorLog.Add(Format(sMismatchOriginalsC,[ShortChildName, CPoItem.Original]));
         ErrorLog.Add('');
@@ -774,8 +790,8 @@ begin
           ErrorLog.Add(Format(sDuplicateOriginals,[PoItem.Original]));
           //debugln(format('The (untranslated) value "%s" is used for more than 1 entry:',[PoItem.Original]));
         end;
-        ErrorLog.Add(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.Identifier]));
-        //debugln(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.Identifier]));
+        ErrorLog.Add(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
+        //debugln(format(sDuplicateLineNrWithValue,[PoItem.LineNr,PoItem.IdentifierLow]));
       end;
     end;
   end;
@@ -795,34 +811,13 @@ end;
 
 procedure TPoFamily.CheckStatistics(ErrorCnt: Integer);
 var
-  i: Integer;
-  CPoItem: TPOFileItem;
   NrTranslated, NrUntranslated, NrFuzzy, NrTotal: Integer;
 begin
   //debugln('TPoFamily.CheckStatistics');
   DoTestStart(sCheckStatistics, ShortChildName);
-  NrTranslated := 0;
-  NrUntranslated := 0;
-  NrFuzzy := 0;
-  for i := 0 to FChild.Count - 1 do
-  begin
-    //debugln('  i = ',DbgS(i));
-    CPoItem := FChild.PoItems[i];
-    if Assigned(CPoItem) then
-    begin
-      if (Length(CPoItem.Translation) > 0) then
-      begin
-        if (Pos('fuzzy', CPoItem.Flags) <> 0) then
-          Inc(NrFuzzy)
-        else
-          Inc(NrTranslated);
-      end
-      else
-      begin
-        Inc(NrUntranslated)
-      end;
-    end;
-  end;
+  NrTranslated := FChild.NrTranslated;
+  NrUntranslated := FChild.NrUntranslated;
+  NrFuzzy := FChild.NrFuzzy;
   NrTotal := NrTranslated + NrUntranslated + NrFuzzy;
   if (NrTotal > 0) then
   begin