pochecker: using new Translation unit. Disable -dUSE_NEW_TRANSLATIONS to get old behaviour. patch #26877 from G. Colla

git-svn-id: trunk@46579 -
This commit is contained in:
mattias 2014-10-17 16:52:58 +00:00
parent c6766fa690
commit 9889acf86b
5 changed files with 21 additions and 7 deletions

View File

@ -18,6 +18,9 @@
<VersionInfo> <VersionInfo>
<StringTable ProductVersion=""/> <StringTable ProductVersion=""/>
</VersionInfo> </VersionInfo>
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<BuildModes Count="2"> <BuildModes Count="2">
<Item1 Name="Release" Default="True"/> <Item1 Name="Release" Default="True"/>
<Item2 Name="Debug"> <Item2 Name="Debug">
@ -50,6 +53,9 @@
</Other> </Other>
</CompilerOptions> </CompilerOptions>
</Item2> </Item2>
<SharedMatrixOptions Count="1">
<Item1 ID="187391036578" Modes="Release" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
</SharedMatrixOptions>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -121,7 +127,6 @@
<Unit8> <Unit8>
<Filename Value="..\pofamilylists.pp"/> <Filename Value="..\pofamilylists.pp"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="PoFamilyLists"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="..\pocheckermemodlg.pp"/> <Filename Value="..\pocheckermemodlg.pp"/>
@ -129,7 +134,6 @@
<ComponentName Value="MemoForm"/> <ComponentName Value="MemoForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="PoCheckerMemoDlg"/>
</Unit9> </Unit9>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
@ -152,7 +156,7 @@
</Options> </Options>
</Linking> </Linking>
<Other> <Other>
<CustomOptions Value="-dPoCheckerStandAlone"/> <CustomOptions Value="-dPoCheckerStandAlone -dUSE_NEW_TRANSLATIONS"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>

View File

@ -10,7 +10,7 @@
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other> <Other>
<CustomOptions Value="$(IDEBuildOptions)"/> <CustomOptions Value="$(IDEBuildOptions) -dUSE_NEW_TRANSLATIONS"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Description Value="Check the validity of translated PO files. <Description Value="Check the validity of translated PO files.

View File

@ -30,7 +30,7 @@ uses
{$IFDEF POCHECKERSTANDALONE} {$IFDEF POCHECKERSTANDALONE}
Translations, Translations,
{$ELSE} {$ELSE}
IDEIntf, MenuIntf, IDEIntf, MenuIntf,{$IFDEF USE_NEW_TRANSLATIONS}Translations,{$ENDIF}
{$ENDIF} {$ENDIF}
SimplePoFiles, PoFamilies, ResultDlg, pocheckerconsts, PoCheckerSettings, SimplePoFiles, PoFamilies, ResultDlg, pocheckerconsts, PoCheckerSettings,
PoFamilyLists, PoCheckerMemoDlg; PoFamilyLists, PoCheckerMemoDlg;

View File

@ -8,7 +8,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, FileUtil, StringHashList, ContNrs, Math, Classes, SysUtils, LCLProc, FileUtil, StringHashList, ContNrs, Math,
Masks, SimplePoFiles, PoCheckerConsts; Masks,{$IFDEF USE_NEW_TRANSLATIONS}Translations ,{$ENDIF}SimplePoFiles, PoCheckerConsts;
Type Type

View File

@ -36,7 +36,17 @@ unit SimplePoFiles;
{ $include include/lcl_defines.inc} { $include include/lcl_defines.inc}
interface interface
{$IFDEF USE_NEW_TRANSLATIONS}
uses
Classes,sysutils,Translations;
type
TSimplePOFile = class (TPOFile)
end;
implementation
{$ELSE}
uses uses
Classes, SysUtils, LCLProc, FileUtil, StringHashList Classes, SysUtils, LCLProc, FileUtil, StringHashList
{, LConvEncoding} {, LConvEncoding}
@ -141,7 +151,6 @@ function UTF8ToSystemCharSet(const s: string): string; inline;
const const
tgHasDup = $01; tgHasDup = $01;
implementation implementation
{$ifdef DebugSimplePoFiles} {$ifdef DebugSimplePoFiles}
@ -1295,6 +1304,7 @@ begin
F.Free; F.Free;
end; end;
end; end;
{$ENDIF}
end. end.