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

IDE: Hard-code '"' in some SourceFileManager resourcestrings.

Browse Source 
git-svn-id: trunk@45461 -
This commit is contained in:
juha 2014-06-10 16:10:51 +00:00
parent 7138d69f4a
commit e4079b2d24
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/lazarusidestrconsts.pas
View File

@ -717,10 +717,10 @@ resourcestring
lisSourceDirectoryDoesNotExist = 'Source directory %s%s%s does not exist.';
lisUnableToCopyFileTo = 'Unable to copy file %s%s%s%sto %s%s%s';
lisSorryThisTypeIsNotYetImplemented = 'Sorry, this type is not yet implemented';
lisFileHasChangedSave = 'File %s%s%s has changed. Save?';
lisUnitHasChangedSave = 'Unit %s%s%s has changed. Save?';
lisSourceOfPageHasChangedSave = 'Source of page %s%s%s has changed. Save?';
lisSourceOfPageHasChangedSaveExtended = 'Sources of more than one page have changed. Save page %s%s%s? (%d more)';
lisFileHasChangedSave = 'File "%s" has changed. Save?';
lisUnitHasChangedSave = 'Unit "%s" has changed. Save?';
lisSourceOfPageHasChangedSave = 'Source of page "%s" has changed. Save?';
lisSourceOfPageHasChangedSaveExtended = 'Sources of more than one page have changed. Save page "%s"? (%d more)';
lisSourceModified = 'Source modified';
lisOpenProject = 'Open Project?';
lisOpenTheProject = 'Open the project %s?';

18
ide/sourcefilemanager.pas
View File

@ -1257,12 +1257,11 @@ begin
if not (cfQuiet in Flags) then begin
// ask user
if AnUnitInfo.Filename<>'' then
AText:=Format(lisFileHasChangedSave, ['"', AnUnitInfo.Filename, '"'])
AText:=Format(lisFileHasChangedSave, [AnUnitInfo.Filename])
else if AnUnitInfo.Unit_Name<>'' then
AText:=Format(lisUnitHasChangedSave, ['"', AnUnitInfo.Unit_name, '"'])
AText:=Format(lisUnitHasChangedSave, [AnUnitInfo.Unit_name])
else
AText:=Format(lisSourceOfPageHasChangedSave, ['"',
TSourceEditor(AEditor).PageName, '"']);
AText:=Format(lisSourceOfPageHasChangedSave, [TSourceEditor(AEditor).PageName]);
ACaption:=lisSourceModified;
Result:=IDEQuestionDialog(ACaption, AText,
mtConfirmation, [mrYes, lisMenuSave, mrNo, lisDiscardChanges, mrAbort
@ -3447,7 +3446,7 @@ begin
if NeedSave = 1 then begin
Ed := TSourceEditor(SourceEditorManager.UniqueSourceEditors[Idx]);
r := IDEQuestionDialog(lisSourceModified,
Format(lisSourceOfPageHasChangedSave, ['"', Ed.PageName, '"']),
Format(lisSourceOfPageHasChangedSave, [Ed.PageName]),
mtConfirmation,
[mrYes, lisMenuSave, mrNo, lisDiscardChanges, mrAbort]);
case r of
@ -3462,7 +3461,7 @@ begin
dec(NeedSave);
Ed := TSourceEditor(SourceEditorManager.UniqueSourceEditors[i]);
r := IDEQuestionDialog(lisSourceModified,
Format(lisSourceOfPageHasChangedSaveExtended, ['"', Ed.PageName, '"', NeedSave]),
Format(lisSourceOfPageHasChangedSaveExtended, [Ed.PageName, NeedSave]),
mtConfirmation,
[mrYes, lisMenuSave, mrAll, lisSaveAll,
mrNo, lisDiscardChanges, mrIgnore, lisDiscardChangesAll,
@ -5736,8 +5735,7 @@ begin
end;
// try the base designer classes
if not FindBaseComponentClass(AncestorClassName,DescendantClassName,
AncestorClass) then
if not FindBaseComponentClass(AncestorClassName,DescendantClassName,AncestorClass) then
begin
DebugLn(['TLazSourceFileManager.LoadAncestorDependencyHidden FindUnitComponentClass failed for AncestorClassName=',AncestorClassName]);
exit(mrCancel);
@ -6726,7 +6724,7 @@ begin
if NeedSave = 1 then begin
Ed := SrcNoteBook.Editors[Idx];
r := IDEQuestionDialog(lisSourceModified,
Format(lisSourceOfPageHasChangedSave, ['"', Ed.PageName, '"']),
Format(lisSourceOfPageHasChangedSave, [Ed.PageName]),
mtConfirmation,
[mrYes, lisMenuSave, mrNo, lisDiscardChanges, mrAbort]);
case r of
@ -6741,7 +6739,7 @@ begin
dec(NeedSave);
Ed := SrcNoteBook.Editors[i];
r := IDEQuestionDialog(lisSourceModified,
Format(lisSourceOfPageHasChangedSaveExtended, ['"', Ed.PageName, '"', NeedSave]),
Format(lisSourceOfPageHasChangedSaveExtended, [Ed.PageName, NeedSave]),
mtConfirmation,
[mrYes, lisMenuSave, mrAll, lisSaveAll,
mrNo, lisDiscardChanges, mrIgnore, lisDiscardChangesAll,