LazBuild: fix some forgotten Format() params in .lpr file. Formatting.

git-svn-id: trunk@45557 -
This commit is contained in:
juha 2014-06-16 20:26:51 +00:00
parent e648faaa3c
commit e602528f78
2 changed files with 9 additions and 8 deletions

View File

@ -3776,8 +3776,9 @@ resourcestring
lisPkgMangPackage = 'Package: %s';
lisPkgMangProject = 'Project: %s';
lisPkgMangDependencyWithoutOwner = 'Dependency without Owner: %s';
lisLazbuildIsNonInteractiveAbortingNow = '%s%s%s%slazbuild is non '
+'interactive, aborting now.';
lisLazbuildIsNonInteractiveAbortingNow = '%s'
+'%s%s'
+'%slazbuild is non interactive, aborting now.';
lisPkgMangSavePackageLpk = 'Save Package %s (*.lpk)';
lisPkgMangInvalidPackageFileExtension = 'Invalid package file extension';
lisPkgMangPackagesMustHaveTheExtensionLpk = 'Packages must have the '
@ -3871,8 +3872,8 @@ resourcestring
lisPkgMangUnableToOpenThePackage = 'Unable to open the package "%s".%s'
+'This package was marked for installation.';
lisOpenPackage2 = 'Open package %s';
lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name "%s" of%s'
+'the file "%s" is invalid.';
lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name "%s" of'
+'%sthe file "%s" is invalid.';
lisPkgMangPackageConflicts = 'Package conflicts';
lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a package "%s" loaded'
+'%sfrom file "%s".'

View File

@ -354,7 +354,7 @@ function TLazBuildApplication.OnIDEMessageDialog(const aCaption, aMsg: string;
begin
DumpStack;
Error(ErrorBuildFailed, Format(lisLazbuildIsNonInteractiveAbortingNow, [
aCaption, #13, aMsg, #13]));
aCaption, LineEnding, aMsg, LineEnding]));
Result:=mrCancel;
end;
@ -364,7 +364,7 @@ function TLazBuildApplication.OnIDEQuestionDialog(const aCaption, aMsg: string;
begin
DumpStack;
Error(ErrorBuildFailed, Format(lisLazbuildIsNonInteractiveAbortingNow, [
aCaption, #13, aMsg, #13]));
aCaption, LineEnding, aMsg, LineEnding]));
Result:=mrCancel;
end;
@ -497,7 +497,7 @@ begin
if (Result.Name='') or (not IsValidIdent(Result.Name)) then begin
Error(ErrorPackageNameInvalid,
Format(lisPkgMangThePackageNameOfTheFileIsInvalid,
['"', Result.Name,'"', #13, '"', Result.Filename, '"']));
[Result.Name, LineEnding, Result.Filename]));
end;
// check if Package with same name is already loaded
ConflictPkg:=PackageGraph.FindPackageWithName(Result.Name,nil);
@ -669,7 +669,7 @@ begin
if OldDependency.LoadPackageResult<>lprSuccess then begin
raise Exception.Create(Format(
lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound, [
'"', OldDependency.AsString, '"', #13]));
OldDependency.AsString, LineEnding]));
end;
end;