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

IDE: fixed i18n flags for packages

Browse Source 
git-svn-id: trunk@12547 -
This commit is contained in:
mattias 2007-10-21 22:16:26 +00:00
parent 6911f11c59
commit 5fa66be34e
20 changed files with 167 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/cgi/cgilaz.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="cgiLaz"/>
<Author Value="Mattias Gaertner"/>
<CompilerOptions>
@ -27,7 +27,10 @@
<UnitName Value="cgiModules"/>
</Item1>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="1">
<Item1>

17
components/h2pas/h2paswizard.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="H2PasWizard"/>
<CompilerOptions>
<Version Value="5"/>
@ -45,24 +45,27 @@
<UnitName Value="IDETextConvListAdd"/>
</Item7>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="5">
<Item1>
<PackageName Value="CodeTools"/>
<PackageName Value="LCL"/>
</Item1>
<Item2>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
<PackageName Value="SynEdit"/>
</Item2>
<Item3>
<PackageName Value="IDEIntf"/>
</Item3>
<Item4>
<PackageName Value="SynEdit"/>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item4>
<Item5>
<PackageName Value="LCL"/>
<PackageName Value="CodeTools"/>
</Item5>
</RequiredPkgs>
<UsageOptions>

24
components/lazreport/source/lazreport.lpk
View File

@ -1,14 +1,12 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<PathDelim Value="\"/>
<Package Version="3">
<Name Value="lazreport"/>
<Author Value="Olivier Guilbaud, Jesus Reyes A. "/>
<CompilerOptions>
<Version Value="5"/>
<PathDelim Value="\"/>
<SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
@ -188,32 +186,34 @@ See license.txt and license-lazreport.txt for details.
<UnitName Value="LR_Dopt"/>
</Item40>
</Files>
<RST OutDir="..\languages"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="5">
<Item1>
<PackageName Value="SynEdit"/>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
<Item2>
<PackageName Value="printer4lazarus"/>
<PackageName Value="IDEIntf"/>
</Item2>
<Item3>
<PackageName Value="LCL"/>
</Item3>
<Item4>
<PackageName Value="IDEIntf"/>
<PackageName Value="printer4lazarus"/>
</Item4>
<Item5>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
<PackageName Value="SynEdit"/>
</Item5>
</RequiredPkgs>
<UsageOptions>
<UnitPath Value="$(PkgOutDir)\"/>
<UnitPath Value="$(PkgOutDir)/"/>
</UsageOptions>
<PublishOptions>
<Version Value="2"/>
<DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
<IgnoreBinaries Value="False"/>
</PublishOptions>
</Package>

11
components/memds/memdslaz.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="MemDSLaz"/>
<Author Value="Michael Van Canneyt"/>
<CompilerOptions>
@ -45,14 +45,17 @@
<Type Value="LRS"/>
</Item5>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="2">
<Item1>
<PackageName Value="LCL"/>
<PackageName Value="IDEIntf"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
<PackageName Value="LCL"/>
</Item2>
</RequiredPkgs>
<UsageOptions>

13
components/prettyformat/prettyformat.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="prettyformat"/>
<CompilerOptions>
<Version Value="5"/>
@ -25,15 +25,18 @@
<UnitName Value="pfidesource"/>
</Item2>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="2">
<Item1>
<PackageName Value="IDEIntf"/>
</Item1>
<Item2>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
</Item2>
</RequiredPkgs>
<UsageOptions>

13
components/printers/design/printers4lazide.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="printers4lazide"/>
<CompilerOptions>
<Version Value="5"/>
@ -23,18 +23,21 @@
<UnitName Value="ideprinting"/>
</Item1>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="DesignTime"/>
<RequiredPkgs Count="3">
<Item1>
<PackageName Value="printer4lazarus"/>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
</Item2>
<Item3>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
<PackageName Value="printer4lazarus"/>
</Item3>
</RequiredPkgs>
<UsageOptions>

4
components/projecttemplates/frmtemplatevariables.pas
View File

@ -69,6 +69,8 @@ Var
begin
For I:=0 to FVariables.Count-1 do
begin
V:='';
N:='';
FVariables.GetNameValue(I,N,V);
V:=SGVariables.Cells[1,I+1];
FVariables[i]:=N+'='+V;
@ -87,6 +89,8 @@ begin
SGVariables.RowCount:=FVariables.Count+1;
For I:=1 to FVariables.Count do
begin
V:='';
N:='';
FVariables.GetNameValue(I-1,N,V);
SGVariables.Cells[0,I]:=N;
SGVariables.Cells[1,I]:='';

9
components/projecttemplates/idetemplateproject.pp
View File

@ -37,11 +37,10 @@ procedure Register;
implementation
uses
ContNrs, frmTemplateSettings, frmTemplateVariables, LazConfigStorage,
NewItemIntf, MenuIntf, IDECommands;
ContNrs, frmTemplateSettings, frmTemplateVariables,
NewItemIntf, MenuIntf;
Var
TemplateProjectDescriptor : TTemplateProjectDescriptor;
IDETemplates : TProjectTemplates = nil;
itmFileNewFromTemplate : TIDEMenuSection;
MenuList : TObjectList;
@ -281,7 +280,6 @@ Var
AFile: TLazProjectFile;
FN : String;
B : Boolean;
RFN : String;
L : TStringList;
begin
@ -322,8 +320,7 @@ Function TTemplateProjectDescriptor.CreateStartFiles(AProject: TLazProject) : TM
Var
I : Integer;
E,FN,FN2 : String;
B : Boolean;
E,FN : String;
begin
if Assigned(FTemplate) then

14
components/projecttemplates/languages/frmtemplatevariables.po
View File

@ -1,12 +1,18 @@
#: frmtemplatevariables:svariable
msgid "Variable"
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: frmtemplatevariables:sdescription
msgid "Description"
msgstr ""
#: frmtemplatevariables:svalue
msgid "Value"
msgstr ""
#: frmtemplatevariables:sdescription
msgid "Description"
#: frmtemplatevariables:svariable
msgid "Variable"
msgstr ""

10
components/projecttemplates/languages/idetemplateproject.po
View File

@ -1,8 +1,14 @@
#: idetemplateproject:sprojecttemplatesettings
msgid "Project templates options"
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: idetemplateproject:snewfromtemplate
msgid "New project from template"
msgstr ""
#: idetemplateproject:sprojecttemplatesettings
msgid "Project templates options"
msgstr ""

6
components/projecttemplates/languages/projecttemplates.po
View File

@ -1,3 +1,9 @@
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: projecttemplates:serrnosuchtemplate
msgid "\"%s\": No such template."
msgstr ""

3
components/projecttemplates/projecttemplates.pp
View File

@ -352,9 +352,6 @@ end;
function TProjectTemplate.TargetFileName(FN: String; Values: TStrings): String;
Var
RFN : String;
begin
Result:=ExtractRelativePath(Directory,FN);
Result:=SubstituteString(Result,Values);

13
components/projecttemplates/projtemplates.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="ProjTemplates"/>
<Author Value="Michael Van Canneyt"/>
<CompilerOptions>
@ -57,15 +57,18 @@
<UnitName Value="frmtemplatesettings"/>
</Item8>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="DesignTime"/>
<RequiredPkgs Count="2">
<Item1>
<PackageName Value="IDEIntf"/>
</Item1>
<Item2>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
</Item2>
</RequiredPkgs>
<UsageOptions>

25
components/synunihighlighter/synuni.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="SynUni"/>
<Author Value="Vit (Vitaly Nevzorov nevzorov@yahoo.com); Fantasist (Kirill Burtsev walking_in_the_sky@yahoo.com)"/>
<CompilerOptions>
@ -46,21 +46,24 @@ see http://www.mozilla.org/MPL/
<UnitName Value="SynUniReg"/>
</Item3>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="4">
<Item1>
<PackageName Value="SynEdit"/>
</Item1>
<Item2>
<PackageName Value="LCL"/>
</Item2>
<Item3>
<PackageName Value="IDEIntf"/>
</Item3>
<Item4>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
</Item2>
<Item3>
<PackageName Value="LCL"/>
</Item3>
<Item4>
<PackageName Value="SynEdit"/>
</Item4>
</RequiredPkgs>
<UsageOptions>

11
components/tdbf/dbflaz.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="DBFLaz"/>
<Author Value="Michael Van Canneyt"/>
<CompilerOptions>
@ -37,14 +37,17 @@
<UnitName Value="Dbf"/>
</Item3>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="2">
<Item1>
<PackageName Value="LCL"/>
<PackageName Value="IDEIntf"/>
</Item1>
<Item2>
<PackageName Value="IDEIntf"/>
<PackageName Value="LCL"/>
</Item2>
</RequiredPkgs>
<UsageOptions>

7
components/turbopower_ipro/turbopoweripro.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="TurboPowerIPro"/>
<Author Value="Turbopower, portiert fuer Lazarus von Mattias Gaertner"/>
<CompilerOptions>
@ -68,7 +68,10 @@
<UnitName Value="IpUtils"/>
</Item10>
</Files>
<RST OutDir="languages/"/>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="1">
<Item1>

1
ide/uniteditor.pp
View File

@ -3772,6 +3772,7 @@ var
SelAvailAndWritable: Boolean;
CurFilename: String;
begin
//DebugLn(['TSourceNotebook.SrcPopUpMenuPopup ',dbgsName(Sender)]);
//SourceEditorMenuRoot.WriteDebugReport('TSourceNotebook.SrcPopUpMenuPopup START ',true);
//SourceEditorMenuRoot.ConsistencyCheck;

18
lcl/include/customform.inc
View File

@ -1191,9 +1191,9 @@ begin
TWSCustomFormClass(WidgetSetClass).SetFormBorderStyle(Self, NewStyle);
end;
{------------------------------------------------------------------------------}
{ TCustomForm UpdateWindowState }
{------------------------------------------------------------------------------}
{------------------------------------------------------------------------------
TCustomForm UpdateWindowState
------------------------------------------------------------------------------}
Procedure TCustomForm.UpdateWindowState;
Begin
@ -1201,9 +1201,9 @@ Begin
Assert(False, 'Trace:TODO: [TCustomForm.UpdateWindowState]');
end;
{------------------------------------------------------------------------------}
{ TCustomForm SetWindowState }
{------------------------------------------------------------------------------}
{------------------------------------------------------------------------------
TCustomForm SetWindowState
------------------------------------------------------------------------------}
Procedure TCustomForm.SetWindowState(Value : TWindowState);
const
ShowCommands: array[TWindowState] of Integer =
@ -1228,9 +1228,9 @@ begin
WindowState := prevWindowState;
end;
{------------------------------------------------------------------------------}
{ TCustomForm SetActiveControl }
{------------------------------------------------------------------------------}
{------------------------------------------------------------------------------
TCustomForm SetActiveControl
------------------------------------------------------------------------------}
Procedure TCustomForm.SetActiveControl(AWinControl: TWinControl);
Begin
if FActiveControl <> AWinControl then

38
packager/packagedefs.pas
View File

@ -686,7 +686,9 @@ type
procedure WriteInheritedUnparsedOptions;
// files
function IndexOfPkgFile(PkgFile: TPkgFile): integer;
function SearchFile(const ShortFilename: string;
function SearchShortFilename(const ShortFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
function SearchFilename(const AFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
procedure ShortenFilename(var ExpandedFilename: string; UseUp: boolean);
procedure LongenFilename(var AFilename: string);
@ -2555,7 +2557,7 @@ begin
// i18n
if FileVersion<3 then begin
FPOOutputDirectory := SwitchPathDelims(
xmlconfig.GetValue(Path+'RST/OutDir/Value', ''),PathDelimChanged);
xmlconfig.GetValue(Path+'RST/OutDir', ''),PathDelimChanged);
EnableI18N := FPOOutputDirectory <> '';
end else begin
EnableI18N := xmlconfig.GetValue(Path+'i18n/EnableI18N/Value', False);
@ -3274,7 +3276,7 @@ begin
while (Files[Result]<>PkgFile) do dec(Result);
end;
function TLazPackage.SearchFile(const ShortFilename: string;
function TLazPackage.SearchShortFilename(const ShortFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
var
SearchedFilename: String;
@ -3304,6 +3306,36 @@ begin
Result:=nil;
end;
function TLazPackage.SearchFilename(const AFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
var
SearchedFilename: String;
i: Integer;
function FilenameFits(TheFilename: string): boolean;
begin
if siffIgnoreExtension in SearchFlags then
TheFileName:=ExtractFileNameWithoutExt(TheFileName);
//debugln('TLazPackage.SearchFile A ',SearchedFilename,' ',TheFilename);
if siffCaseSensitive in SearchFlags then
Result:=SearchedFilename=TheFilename
else
Result:=CompareText(SearchedFilename,TheFilename)=0;
end;
begin
SearchedFilename:=AFilename;
if siffIgnoreExtension in SearchFlags then
SearchedFilename:=ExtractFileNameWithoutExt(SearchedFilename);
// search in files
for i:=0 to FileCount-1 do begin
Result:=Files[i];
if FilenameFits(Result.GetFullFilename) then exit;
end;
Result:=nil;
end;
{ TPkgComponent }
procedure TPkgComponent.SetPkgFile(const AValue: TPkgFile);

10
packager/pkgmanager.pas
View File

@ -1997,7 +1997,7 @@ var
FallbackLang: String;
Language: String;
begin
//DebugLn(['TPkgManager.DoTranslatePackage ', APackage.Name, 'from ', APackage.RSTOutputDirectory]);
//DebugLn(['TPkgManager.DoTranslatePackage ', APackage.Name, 'from ', APackage.POOutputDirectory]);
if (APackage.POOutputDirectory='') then exit;
Directory:=AppendPathDelim(APackage.GetPOOutDirectory);
@ -2015,6 +2015,7 @@ begin
TranslatedUnits:=nil;
try
//DebugLn(['TPkgManager.DoTranslatePackage ',APackage.Name,' Directory=',Directory,' Lang=',Lang,' FallbackLang=',FallbackLang]);
TranslateWithFileMask(APackage,Directory,Lang);
TranslateWithFileMask(APackage,Directory,FallbackLang);
finally
@ -3060,7 +3061,6 @@ var
begin
SrcEdit:=SourceNotebook.GetActiveSE;
if SrcEdit<>nil then begin
//debugln('TPkgManager.GetPackageOfCurrentSourceEditor ',SrcEdit.Filename);
Result:=SearchFile(SrcEdit.Filename,[],nil);
end else
SrcEdit:=nil;
@ -3139,7 +3139,7 @@ begin
APackage:=TLazPackage(InObject);
CurFilename:=AFilename;
APackage.ShortenFilename(CurFilename,true);
Result:=APackage.SearchFile(CurFilename,SearchFlags);
Result:=APackage.SearchShortFilename(CurFilename,SearchFlags);
if Result<>nil then exit;
end;
if not (siffDoNotCheckAllPackages in SearchFlags) then begin
@ -3147,8 +3147,8 @@ begin
APackage:=PackageGraph[i];
CurFilename:=AFilename;
APackage.ShortenFilename(CurFilename,true);
Result:=APackage.SearchFile(CurFilename,SearchFlags);
//debugln('TPkgManager.SearchFile Pkg=',APackage.Filename,' CurFilename="',CurFilename,'"');
Result:=APackage.SearchShortFilename(CurFilename,SearchFlags);
//debugln(['TPkgManager.SearchFile Pkg=',APackage.Filename,' CurFilename="',CurFilename,'" ',Result<>nil]);
if Result<>nil then exit;
end;
end;