Author: msierad
Date: 2007-01-19 11:04:00 -0500 (Fri, 19 Jan 2007)
New Revision: 71340
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineDescriptor.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
Log:
2007-01-19 Marek Sieradzki <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/CombineDescriptor.cs,
MonoDevelop.Ide.Templates/FileTemplate.cs,
MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs,
MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs,
MonoDevelop.Ide.Templates/ProjectTemplate.cs,
MonoDevelop.Ide.Templates/ProjectDescriptor.cs,
MonoDevelop.Ide.Commands/FileCommands.cs,
MonoDevelop.Ide.Commands/ToolsCommands.cs,
MonoDevelop.Ide.Commands/ProjectCommands.cs,
MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs,
MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs,
MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs,
MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs,
MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs,
MonoDevelop.Ide.Gui/Document.cs,
MonoDevelop.Ide.Gui/ProjectOperations.cs,
MonoDevelop.Ide.Gui/Workbench.cs,
MonoDevelop.Ide.Gui/SdStatusBar.cs,
MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs:
Removed redundant String.Format ().
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-01-19
16:00:17 UTC (rev 71339)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-01-19
16:04:00 UTC (rev 71340)
@@ -1,3 +1,33 @@
+2007-01-19 Marek Sieradzki <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/CombineDescriptor.cs,
+ MonoDevelop.Ide.Templates/FileTemplate.cs,
+ MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs,
+ MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs,
+ MonoDevelop.Ide.Templates/ProjectTemplate.cs,
+ MonoDevelop.Ide.Templates/ProjectDescriptor.cs,
+ MonoDevelop.Ide.Commands/FileCommands.cs,
+ MonoDevelop.Ide.Commands/ToolsCommands.cs,
+ MonoDevelop.Ide.Commands/ProjectCommands.cs,
+ MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs,
+ MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs,
+ MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs,
+ MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs,
+ MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs,
+ MonoDevelop.Ide.Gui/Document.cs,
+ MonoDevelop.Ide.Gui/ProjectOperations.cs,
+ MonoDevelop.Ide.Gui/Workbench.cs,
+ MonoDevelop.Ide.Gui/SdStatusBar.cs,
+ MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs:
+ Removed redundant String.Format ().
+
2007-01-16 Lluis Sanchez Gual <[EMAIL PROTECTED]>
Added check for null file names.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -264,7 +264,7 @@
RecentItem ri =
recentOpen.RecentProject[i];
string label = ((ri.Private == null ||
ri.Private.Length < 1) ? Path.GetFileNameWithoutExtension (ri.ToString ()) :
ri.Private);
CommandInfo cmd = new CommandInfo
(accelaratorKeyPrefix + label.Replace ("_", "__"));
- cmd.Description = String.Format
(GettextCatalog.GetString ("load solution {0}"), ri.ToString ());
+ cmd.Description =
GettextCatalog.GetString ("load solution {0}", ri.ToString ());
info.Add (cmd, ri);
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -229,11 +229,11 @@
CombineEntry entry =
IdeApp.ProjectOperations.CurrentSelectedCombineEntry;
if (entry != null) {
info.Enabled =
IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted;
- info.Text = string.Format
(GettextCatalog.GetString ("Build {0}"), entry.Name);
+ info.Text = GettextCatalog.GetString
("Build {0}", entry.Name);
if (entry is Combine)
- info.Description =
string.Format (GettextCatalog.GetString ("Build Solution {0}"), entry.Name);
+ info.Description =
GettextCatalog.GetString ("Build Solution {0}", entry.Name);
else if (entry is Project)
- info.Description =
string.Format (GettextCatalog.GetString ("Build Project {0}"), entry.Name);
+ info.Description =
GettextCatalog.GetString ("Build Project {0}", entry.Name);
else
info.Description = info.Text;
} else {
@@ -243,7 +243,7 @@
if (IdeApp.Workbench.ActiveDocument != null &&
IdeApp.Workbench.ActiveDocument.IsBuildTarget) {
info.Enabled =
IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted;
string file = Path.GetFileName
(IdeApp.Workbench.ActiveDocument.FileName);
- info.Text = info.Description =
string.Format (GettextCatalog.GetString ("Build {0}"), file);
+ info.Text = info.Description =
GettextCatalog.GetString ("Build {0}", file);
} else {
info.Enabled = false;
}
@@ -272,7 +272,7 @@
CombineEntry entry =
IdeApp.ProjectOperations.CurrentSelectedCombineEntry;
if (entry != null) {
info.Enabled =
IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted;
- info.Text = info.Description =
string.Format (GettextCatalog.GetString ("Rebuild {0}"), entry.Name);
+ info.Text = info.Description =
GettextCatalog.GetString ("Rebuild {0}", entry.Name);
} else {
info.Enabled = false;
}
@@ -280,7 +280,7 @@
if (IdeApp.Workbench.ActiveDocument != null &&
IdeApp.Workbench.ActiveDocument.IsBuildTarget) {
info.Enabled =
IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted;
string file = Path.GetFileName
(IdeApp.Workbench.ActiveDocument.FileName);
- info.Text = info.Description =
string.Format (GettextCatalog.GetString ("Rebuild {0}"), file);
+ info.Text = info.Description =
GettextCatalog.GetString ("Rebuild {0}", file);
} else {
info.Enabled = false;
}
@@ -340,7 +340,7 @@
{
if
(IdeApp.ProjectOperations.CurrentSelectedCombineEntry != null) {
info.Enabled =
IdeApp.ProjectOperations.CurrentSelectedCombineEntry != null;
- info.Text = info.Description = string.Format
(GettextCatalog.GetString ("Clean {0}"),
IdeApp.ProjectOperations.CurrentSelectedCombineEntry.Name);
+ info.Text = info.Description =
GettextCatalog.GetString ("Clean {0}",
IdeApp.ProjectOperations.CurrentSelectedCombineEntry.Name);
} else {
info.Enabled = false;
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -64,7 +64,9 @@
string args = stringParserService.Parse(tool.Arguments);
// prompt for args if needed
if (tool.PromptForArguments) {
- args =
Services.MessageService.GetTextResponse(String.Format (GettextCatalog.GetString
("Enter any arguments you want to use while launching tool, {0}:"),
tool.MenuCommand), String.Format (GettextCatalog.GetString ("Command Arguments
for {0}"), tool.MenuCommand), args);
+ args = Services.MessageService.GetTextResponse (
+ GettextCatalog.GetString ("Enter any
arguments you want to use while launching tool, {0}:", tool.MenuCommand),
+ GettextCatalog.GetString ("Command
Arguments for {0}", tool.MenuCommand), args);
// if user selected cancel string will be null
if (args == null) {
@@ -100,7 +102,7 @@
}
} catch (Exception ex) {
- monitor.ReportError (String.Format
(GettextCatalog.GetString ("External program execution failed.\nError while
starting:\n '{0} {1}'"), command, args), ex);
+ monitor.ReportError (GettextCatalog.GetString
("External program execution failed.\nError while starting:\n '{0} {1}'",
command, args), ex);
} finally {
monitor.Dispose ();
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -166,12 +166,12 @@
}
if (!Runtime.FileService.IsValidFileName (filename)) {
-
Services.MessageService.ShowMessage(String.Format (GettextCatalog.GetString
("File name {0} is invalid"), filename));
+ Services.MessageService.ShowMessage
(GettextCatalog.GetString ("File name {0} is invalid", filename));
return;
}
// detect preexisting file
if(File.Exists(filename)){
-
if(!Services.MessageService.AskQuestion(String.Format (GettextCatalog.GetString
("File {0} already exists. Overwrite?"), filename))){
+ if(!Services.MessageService.AskQuestion
(GettextCatalog.GetString ("File {0} already exists. Overwrite?", filename))){
return;
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -279,7 +279,7 @@
try {
if (!File.Exists (filename)) {
- monitor.ReportError (string.Format
(GettextCatalog.GetString ("File not found: {0}"), filename), null);
+ monitor.ReportError
(GettextCatalog.GetString ("File not found: {0}", filename), null);
return;
}
@@ -486,7 +486,7 @@
res = AddCombineEntry (parentCombine,
npdlg.NewCombineEntryLocation);
}
catch {
- Services.MessageService.ShowError
(string.Format (GettextCatalog.GetString ("The file '{0}' could not be
loaded."), npdlg.NewCombineEntryLocation));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("The file '{0}' could not be loaded.",
npdlg.NewCombineEntryLocation));
res = null;
}
}
@@ -509,7 +509,7 @@
res = AddCombineEntry
(parentCombine, fdiag.Filename);
}
catch {
-
Services.MessageService.ShowError (string.Format (GettextCatalog.GetString
("The file '{0}' could not be loaded."), fdiag.Filename));
+
Services.MessageService.ShowError (GettextCatalog.GetString ("The file '{0}'
could not be loaded.", fdiag.Filename));
}
}
@@ -830,7 +830,7 @@
aop.Completed += new OperationHandler (h.Run);
return aop;
} else {
- Services.MessageService.ShowError
(string.Format (GettextCatalog.GetString ("The file {0} can't be compiled."),
file));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("The file {0} can't be compiled.", file));
return NullAsyncOperation.Failure;
}
}
@@ -931,7 +931,7 @@
if (result != null) {
lastResult = result;
monitor.Log.WriteLine ();
- monitor.Log.WriteLine (String.Format
(GettextCatalog.GetString ("---------------------- Done
----------------------")));
+ monitor.Log.WriteLine
(GettextCatalog.GetString ("---------------------- Done
----------------------"));
foreach (CompilerError err in
result.CompilerResults.Errors) {
Services.TaskService.Add (new
Task (null, err));
@@ -993,7 +993,7 @@
filesToMove = col;
}
} catch (Exception ex) {
- monitor.ReportError (string.Format
(GettextCatalog.GetString ("Could not get any file from '{0}'."), sourcePath),
ex);
+ monitor.ReportError (GettextCatalog.GetString
("Could not get any file from '{0}'.", sourcePath), ex);
return;
}
@@ -1005,7 +1005,7 @@
if (Directory.Exists (sourcePath) &&
!Directory.Exists (newFolder) && !movingFolder)
Runtime.FileService.CreateDirectory
(newFolder);
} catch (Exception ex) {
- monitor.ReportError (string.Format
(GettextCatalog.GetString ("Could not create directory '{0}'."), targetPath),
ex);
+ monitor.ReportError (GettextCatalog.GetString
("Could not create directory '{0}'.", targetPath), ex);
return;
}
@@ -1016,7 +1016,7 @@
try {
Runtime.FileService.MoveDirectory
(sourcePath, newFolder);
} catch (Exception ex) {
- monitor.ReportError (string.Format
(GettextCatalog.GetString ("Directory '{0}' could not be deleted."),
sourcePath), ex);
+ monitor.ReportError
(GettextCatalog.GetString ("Directory '{0}' could not be deleted.",
sourcePath), ex);
}
}
@@ -1037,7 +1037,7 @@
else
Runtime.FileService.CopyFile (sourceFile, newFile);
} catch (Exception ex) {
- monitor.ReportError
(string.Format (GettextCatalog.GetString ("File '{0}' could not be created."),
newFile), ex);
+ monitor.ReportError
(GettextCatalog.GetString ("File '{0}' could not be created.", newFile), ex);
monitor.Step (1);
continue;
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -96,18 +96,18 @@
public void ShowErrorMessage(string message)
{
- SetMessage (String.Format (GettextCatalog.GetString
("Error : {0}"), message));
+ SetMessage (GettextCatalog.GetString ("Error : {0}",
message));
}
public void ShowErrorMessage(Image image, string message)
{
- SetMessage (String.Format (GettextCatalog.GetString
("Error : {0}"), message));
+ SetMessage (GettextCatalog.GetString ("Error : {0}",
message));
}
public void SetCursorPosition (int ln, int col, int ch)
{
cursorStatusBarPanel.ShowAll ();
- cursorLabel.Markup = String.Format
(GettextCatalog.GetString (" ln <span font_family='fixed'>{0,-4}</span> col
<span font_family='fixed'>{1,-3}</span> ch <span
font_family='fixed'>{2,-3}</span> "), ln, col, ch);
+ cursorLabel.Markup = GettextCatalog.GetString (" ln
<span font_family='fixed'>{0,-4}</span> col <span
font_family='fixed'>{1,-3}</span> ch <span font_family='fixed'>{2,-3}</span>
", ln, col, ch);
}
public void SetMessage (string message)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -314,7 +314,7 @@
}
}
- IProgressMonitor pm =
ProgressMonitors.GetStatusProgressMonitor (string.Format
(GettextCatalog.GetString ("Opening {0}"), fileName), Stock.OpenFileIcon, true);
+ IProgressMonitor pm =
ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString ("Opening
{0}", fileName), Stock.OpenFileIcon, true);
FileInformation openFileInfo = new FileInformation();
openFileInfo.ProgressMonitor = pm;
openFileInfo.FileName = fileName;
@@ -484,7 +484,7 @@
//Debug.Assert(Runtime.FileService.IsValidFileName(fileName));
if (Runtime.FileService.IsDirectory (fileName))
{
- monitor.ReportError (string.Format
(GettextCatalog.GetString ("{0} is a directory"), fileName), null);
+ monitor.ReportError
(GettextCatalog.GetString ("{0} is a directory", fileName), null);
return;
}
// test, if file fileName exists
@@ -500,7 +500,7 @@
}
}
if (!File.Exists (fileName)) {
- monitor.ReportError
(string.Format (GettextCatalog.GetString ("File not found: {0}"), fileName),
null);
+ monitor.ReportError
(GettextCatalog.GetString ("File not found: {0}", fileName), null);
return;
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -26,7 +26,7 @@
TreeIter topCombineIter = TreeIter.Zero;
Hashtable projectIters = new Hashtable ();
if (IdeApp.ProjectOperations.CurrentOpenCombine !=
null) {
- topCombineIter = tsFiles.AppendValues
(String.Format (GettextCatalog.GetString ("Solution: {0}"),
IdeApp.ProjectOperations.CurrentOpenCombine.Name), true, null, false);
+ topCombineIter = tsFiles.AppendValues
(GettextCatalog.GetString ("Solution: {0}",
IdeApp.ProjectOperations.CurrentOpenCombine.Name), true, null, false);
}
foreach (Document doc in IdeApp.Workbench.Documents) {
if (!doc.IsDirty)
@@ -40,9 +40,9 @@
projIter = (TreeIter)
projectIters[viewcontent.Project];
else {
if (topCombineIter.Equals
(TreeIter.Zero))
- projIter =
tsFiles.AppendValues (String.Format (GettextCatalog.GetString ("Project: {0}"),
viewcontent.Project.Name), true, null, false);
+ projIter =
tsFiles.AppendValues (GettextCatalog.GetString ("Project: {0}",
viewcontent.Project.Name), true, null, false);
else
- projIter =
tsFiles.AppendValues (topCombineIter, String.Format (GettextCatalog.GetString
("Project: {0}"), viewcontent.Project.Name), true, null, false);
+ projIter =
tsFiles.AppendValues (topCombineIter, GettextCatalog.GetString ("Project: {0}",
viewcontent.Project.Name), true, null, false);
projectIters[viewcontent.Project] = projIter;
}
tsFiles.AppendValues (projIter,
viewcontent.PathRelativeToProject, true, viewcontent.WorkbenchWindow);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeFilesDialog.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -47,7 +47,7 @@
glade.Autoconnect (this);
// set up dialog title
- this.IncludeFilesDialogWidget.Title = String.Format
(GettextCatalog.GetString ("Found new files in {0}"), project.Name);
+ this.IncludeFilesDialogWidget.Title =
GettextCatalog.GetString ("Found new files in {0}", project.Name);
newFilesOnlyRadioButton.Active = true;
this.newFiles = newFiles;
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -333,12 +333,12 @@
}
catch (IOException)
{
- Services.MessageService.ShowError
(dialog, String.Format (GettextCatalog.GetString ("Could not create directory
{0}. File already exists."), ProjectLocation));
+ Services.MessageService.ShowError
(dialog, GettextCatalog.GetString ("Could not create directory {0}. File
already exists.", ProjectLocation));
return;
}
catch (UnauthorizedAccessException)
{
- Services.MessageService.ShowError
(dialog, String.Format (GettextCatalog.GetString ("You do not have permission
to create to {0}"), ProjectLocation));
+ Services.MessageService.ShowError
(dialog, GettextCatalog.GetString ("You do not have permission to create to
{0}", ProjectLocation));
return;
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SharpDevelopAboutPanels.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -30,7 +30,7 @@
hboxVersion.PackStart (versionLabel, false, false, 5);
HBox hboxLicense = new HBox ();
- licenseLabel.Markup = String.Format
(GettextCatalog.GetString ("<b>License</b>\n {0}"), GettextCatalog.GetString
("Released under the GNU General Public license."));
+ licenseLabel.Markup = GettextCatalog.GetString
("<b>License</b>\n {0}", GettextCatalog.GetString ("Released under the GNU
General Public license."));
hboxLicense.PackStart (licenseLabel, false, false, 5);
HBox hboxCopyright = new HBox ();
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -60,7 +60,7 @@
public override void BuildNode (ITreeBuilder treeBuilder,
object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf
closedIcon)
{
Combine combine = dataObject as Combine;
- label = String.Format (GettextCatalog.GetString
("Solution {0}"), combine.Name);
+ label = GettextCatalog.GetString ("Solution {0}",
combine.Name);
icon = Context.GetIcon (Stock.CombineIcon);
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/CombineNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -82,13 +82,13 @@
switch (combine.Entries.Count) {
case 0:
- label = String.Format
(GettextCatalog.GetString ("Solution {0}"), combine.Name);
+ label = GettextCatalog.GetString
("Solution {0}", combine.Name);
break;
case 1:
- label = String.Format
(GettextCatalog.GetString ("Solution {0} (1 entry)"), combine.Name);
+ label = GettextCatalog.GetString
("Solution {0} (1 entry)", combine.Name);
break;
default:
- label = String.Format
(GettextCatalog.GetString ("Solution {0} ({1} entries)"), combine.Name,
combine.Entries.Count);
+ label = GettextCatalog.GetString
("Solution {0} ({1} entries)", combine.Name, combine.Entries.Count);
break;
}
@@ -177,7 +177,7 @@
public override void RenameItem (string newName)
{
if (newName.IndexOfAny (new char [] { '\'', '(', ')',
'"', '{', '}', '|' } ) != -1) {
- Services.MessageService.ShowError
(String.Format (GettextCatalog.GetString ("Solution name may not contain any of
the following characters: {0}"), "', (, ), \", {, }, |"));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("Solution name may not contain any of the following
characters: {0}", "', (, ), \", {, }, |"));
return;
}
@@ -207,7 +207,7 @@
Combine parent = CurrentNode.GetParentDataItem
(typeof(Combine), false) as Combine;
if (parent == null) return;
- bool yes = Services.MessageService.AskQuestion
(String.Format (GettextCatalog.GetString ("Do you really want to remove
solution {0} from solution {1}?"), combine.Name, parent.Name));
+ bool yes = Services.MessageService.AskQuestion
(GettextCatalog.GetString ("Do you really want to remove solution {0} from
solution {1}?", combine.Name, parent.Name));
if (yes) {
parent.Entries.Remove (combine);
IdeApp.ProjectOperations.SaveCombine();
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -197,14 +197,14 @@
if (operation == DragOperation.Move) {
if (filesToSave.Count == 1)
- question = string.Format
(GettextCatalog.GetString ("Do you want to save the file '{0}' before the move
operation?"), sb.ToString ());
+ question =
GettextCatalog.GetString ("Do you want to save the file '{0}' before the move
operation?", sb.ToString ());
else
- question = string.Format
(GettextCatalog.GetString ("Do you want to save the following files before the
move operation?\n\n{0}"), sb.ToString ());
+ question =
GettextCatalog.GetString ("Do you want to save the following files before the
move operation?\n\n{0}", sb.ToString ());
} else {
if (filesToSave.Count == 1)
- question = string.Format
(GettextCatalog.GetString ("Do you want to save the file '{0}' before the copy
operation?"), sb.ToString ());
+ question =
GettextCatalog.GetString ("Do you want to save the file '{0}' before the copy
operation?", sb.ToString ());
else
- question = string.Format
(GettextCatalog.GetString ("Do you want to save the following files before the
copy operation?\n\n{0}"), sb.ToString ());
+ question =
GettextCatalog.GetString ("Do you want to save the following files before the
copy operation?\n\n{0}", sb.ToString ());
}
switch
(Services.MessageService.AskQuestionWithCancel (question)) {
@@ -263,7 +263,7 @@
IdeApp.Workbench.RootWindow,
DialogFlags.Modal | DialogFlags.DestroyWithParent,
MessageType.Question, ButtonsType.None,
- String.Format
(GettextCatalog.GetString ("{0} is outside the project directory, what should I
do?"), file)))
+
GettextCatalog.GetString ("{0} is outside the project directory, what should I
do?", file)))
{
CheckButton
remember = null;
if
(fdiag.Filenames.Length > 1) {
@@ -328,7 +328,7 @@
if (filename != newfilename) {
if (File.Exists (newfilename)) {
- if
(!Services.MessageService.AskQuestion (string.Format (GettextCatalog.GetString
("The file '{0}' already exists. Do you want to replace it?"), newfilename),
"MonoDevelop"))
+ if
(!Services.MessageService.AskQuestion (GettextCatalog.GetString ("The file
'{0}' already exists. Do you want to replace it?", newfilename), "MonoDevelop"))
return;
}
Runtime.FileService.CopyFile (filename,
newfilename);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -138,7 +138,7 @@
ProjectFile file = CurrentNode.DataItem as ProjectFile;
Project project = CurrentNode.GetParentDataItem
(typeof(Project), false) as Project;
- bool yes = Services.MessageService.AskQuestion
(String.Format (GettextCatalog.GetString ("Are you sure you want to remove file
{0} from project {1}?"), Path.GetFileName (file.Name), project.Name));
+ bool yes = Services.MessageService.AskQuestion
(GettextCatalog.GetString ("Are you sure you want to remove file {0} from
project {1}?", Path.GetFileName (file.Name), project.Name));
if (!yes) return;
if (!file.IsExternalToProject) {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -166,7 +166,7 @@
{
ProjectFolder folder = (ProjectFolder)
CurrentNode.DataItem as ProjectFolder;
- bool yes = Services.MessageService.AskQuestion
(String.Format (GettextCatalog.GetString ("Do you want to remove folder {0}?"),
folder.Name));
+ bool yes = Services.MessageService.AskQuestion
(GettextCatalog.GetString ("Do you want to remove folder {0}?", folder.Name));
if (!yes) return;
Project project = folder.Project;
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -301,7 +301,8 @@
public override void RenameItem (string newName)
{
if (newName.IndexOfAny (new char [] { '\'', '(', ')',
'"', '{', '}', '|' } ) != -1) {
- Services.MessageService.ShowError
(String.Format (GettextCatalog.GetString ("Project name may not contain any of
the following characters: {0}"), "', (, ), \", {, }, |"));
+ Services.MessageService.ShowError
(GettextCatalog.GetString (
+ "Project name may not contain any of
the following characters: {0}", "', (, ), \", {, }, |"));
return;
}
@@ -331,7 +332,9 @@
Combine cmb = CurrentNode.GetParentDataItem
(typeof(Combine), false) as Combine;;
Project prj = CurrentNode.DataItem as Project;
- bool yes = Services.MessageService.AskQuestion
(String.Format (GettextCatalog.GetString ("Do you really want to remove project
{0} from solution {1}"), prj.Name, cmb.Name));
+ bool yes = Services.MessageService.AskQuestion
(GettextCatalog.GetString (
+ "Do you really want to remove project {0} from
solution {1}", prj.Name, cmb.Name));
+
if (yes) {
cmb.RemoveEntry (prj);
IdeApp.ProjectOperations.SaveCombine();
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -140,7 +140,7 @@
{
foreach (string file in files) {
if (!System.IO.File.Exists (file)) {
- Services.MessageService.ShowError
(String.Format (GettextCatalog.GetString ("Resource file '{0}' does not
exist"), file));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("Resource file '{0}' does not exist", file));
return false;
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -120,13 +120,13 @@
{
SystemFile file = CurrentNode.DataItem as SystemFile;
- bool yes = Services.MessageService.AskQuestion
(String.Format (GettextCatalog.GetString ("Are you sure you want to permanently
delete the file {0}?"), file.Path));
+ bool yes = Services.MessageService.AskQuestion
(GettextCatalog.GetString ("Are you sure you want to permanently delete the
file {0}?", file.Path));
if (!yes) return;
try {
Runtime.FileService.DeleteFile (file.Path);
} catch {
- Services.MessageService.ShowError
(string.Format (GettextCatalog.GetString ("The file {0} could not be deleted"),
file.Path));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("The file {0} could not be deleted", file.Path));
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceInFilesManager.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -70,7 +70,7 @@
}
searchMonitor.ReportResult (result.FileName,
result.Line, result.Column, text);
} else {
- string msg = string.Format
(GettextCatalog.GetString ("Match at offset {0}"), result.DocumentOffset);
+ string msg = GettextCatalog.GetString ("Match
at offset {0}", result.DocumentOffset);
searchMonitor.ReportResult (result.FileName, 0,
0, msg);
}
}
@@ -105,7 +105,7 @@
{
string msg;
if (searchError != null)
- msg = string.Format (GettextCatalog.GetString
("The search could not be finished: {0}"), searchError);
+ msg = GettextCatalog.GetString ("The search
could not be finished: {0}", searchError);
else if (cancelled)
msg = GettextCatalog.GetString ("Search
cancelled.");
else
@@ -136,7 +136,7 @@
return;
}
- string msg = string.Format (GettextCatalog.GetString
("Replacing '{0}' in {1}."), searchOptions.SearchPattern,
searchOptions.SearchDirectory);
+ string msg = GettextCatalog.GetString ("Replacing '{0}'
in {1}.", searchOptions.SearchPattern, searchOptions.SearchDirectory);
searchMonitor.ReportResult (null, 0, 0, msg);
timer = DateTime.Now;
@@ -182,7 +182,7 @@
return;
}
- string msg = string.Format (GettextCatalog.GetString
("Looking for '{0}' in {1}."), searchOptions.SearchPattern,
searchOptions.SearchDirectory);
+ string msg = GettextCatalog.GetString ("Looking for
'{0}' in {1}.", searchOptions.SearchPattern, searchOptions.SearchDirectory);
searchMonitor.ReportResult (null, 0, 0, msg);
timer = DateTime.Now;
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineDescriptor.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineDescriptor.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineDescriptor.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -52,7 +52,7 @@
if (typeName != null && typeName.Length > 0) {
Type type = Type.GetType (typeName);
if (type == null) {
-
Services.MessageService.ShowError(String.Format (GettextCatalog.GetString
("Can't create solution with type: {0}"), typeName));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("Can't create solution with type: {0}", typeName));
return String.Empty;
}
newCombine = (Combine) Activator.CreateInstance
(type);
@@ -91,7 +91,7 @@
string combineLocation =
Runtime.FileService.GetDirectoryNameWithSeparator(projectCreateInformation.CombinePath)
+ newCombineName + ".mds";
if (File.Exists(combineLocation)) {
IMessageService messageService
=(IMessageService)ServiceManager.GetService(typeof(IMessageService));
- if
(messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Solution
file {0} already exists, do you want to overwrite\nthe existing file?"),
combineLocation))) {
+ if (messageService.AskQuestion
(GettextCatalog.GetString ("Solution file {0} already exists, do you want to
overwrite\nthe existing file?", combineLocation))) {
newCombine.Save
(combineLocation, monitor);
}
} else {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineEntryDescriptor.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -65,7 +65,7 @@
Type type = Type.GetType (typeName);
if (type == null) {
- Services.MessageService.ShowError(String.Format
(GettextCatalog.GetString ("Can't create project with type : {0}"), typeName));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("Can't create project with type : {0}", typeName));
return String.Empty;
}
@@ -86,7 +86,9 @@
using (IProgressMonitor monitor = new
NullProgressMonitor ()) {
if (File.Exists (fileName)) {
- if
(Services.MessageService.AskQuestion(String.Format (GettextCatalog.GetString
("Project file {0} already exists, do you want to overwrite\nthe existing
file?"), fileName), GettextCatalog.GetString ("File already exists"))) {
+ if (Services.MessageService.AskQuestion
(GettextCatalog.GetString (
+ "Project file {0} already
exists, do you want to overwrite\nthe existing file?", fileName),
+ GettextCatalog.GetString ("File
already exists"))) {
entry.Save (fileName, monitor);
}
} else {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -212,7 +212,7 @@
t.id = codon.ID;
fileTemplates.Add (t);
} catch (Exception e) {
- Services.MessageService.ShowError (e,
String.Format (GettextCatalog.GetString ("Error loading template from resource
{0}"), codon.Resource));
+ Services.MessageService.ShowError (e,
GettextCatalog.GetString ("Error loading template from resource {0}",
codon.Resource));
}
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -79,7 +79,7 @@
Project_ project =
Services.ProjectService.CreateProject (projectType, projectCreateInformation,
projectOptions);
if (project == null) {
- Services.MessageService.ShowError(String.Format
(GettextCatalog.GetString ("Can't create project with type : {0}"),
projectType));
+ Services.MessageService.ShowError
(GettextCatalog.GetString ("Can't create project with type : {0}",
projectType));
return String.Empty;
}
@@ -107,7 +107,7 @@
resource.BuildAction =
BuildAction.EmbedAsResource;
project.ProjectFiles.Add(resource);
} catch (Exception ex) {
- Services.MessageService.ShowError(ex,
String.Format (GettextCatalog.GetString ("File {0} could not be written."),
file.Name));
+ Services.MessageService.ShowError (ex,
GettextCatalog.GetString ("File {0} could not be written.", file.Name));
}
}
@@ -116,7 +116,7 @@
try {
file.AddToProject (project,
defaultLanguage, project.BaseDirectory, null);
} catch (Exception ex) {
- Services.MessageService.ShowError(ex,
String.Format (GettextCatalog.GetString ("File {0} could not be written."),
file.Name));
+ Services.MessageService.ShowError (ex,
GettextCatalog.GetString ("File {0} could not be written.", file.Name));
}
}
@@ -124,7 +124,9 @@
using (IProgressMonitor monitor = new
NullProgressMonitor ()) {
if (File.Exists (project.FileName)) {
- if
(Services.MessageService.AskQuestion(String.Format (GettextCatalog.GetString
("Project file {0} already exists, do you want to overwrite\nthe existing
file?"), project.FileName), GettextCatalog.GetString ("File already exists")))
{
+ if (Services.MessageService.AskQuestion
(GettextCatalog.GetString (
+ "Project file {0} already
exists, do you want to overwrite\nthe existing file?", project.FileName),
+ GettextCatalog.GetString
("File already exists"))) {
project.Save (project.FileName,
monitor);
}
} else {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -172,7 +172,7 @@
language = (string)
templateLangs [i];
ProjectTemplates.Add (new
ProjectTemplate (addin, id, doc, language, language+"/"+category));
} catch (Exception e) {
-
Services.MessageService.ShowError (e, String.Format (GettextCatalog.GetString
("Error loading template from resource {0}"), fileName));
+
Services.MessageService.ShowError (e, GettextCatalog.GetString ("Error loading
template from resource {0}", fileName));
}
}
} else {
@@ -286,7 +286,7 @@
try {
ProjectTemplates.Add (new
ProjectTemplate (codon.AddIn, codon.ID, codon.Resource));
} catch (Exception e) {
- Services.MessageService.ShowError (e,
String.Format (GettextCatalog.GetString ("Error loading template from resource
{0}"), codon.Resource));
+ Services.MessageService.ShowError (e,
GettextCatalog.GetString ("Error loading template from resource {0}",
codon.Resource));
}
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2007-01-19 16:00:17 UTC (rev 71339)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2007-01-19 16:04:00 UTC (rev 71340)
@@ -86,7 +86,9 @@
string file = GetFileName (project, language,
baseDirectory, entryName);
if (File.Exists (file)) {
- if
(!Services.MessageService.AskQuestion(String.Format (GettextCatalog.GetString
("File {0} already exists, do you want to overwrite\nthe existing file?"),
file), GettextCatalog.GetString ("File already exists"))) {
+ if (!Services.MessageService.AskQuestion
(GettextCatalog.GetString (
+ "File {0} already exists, do you want
to overwrite\nthe existing file?", file),
+ GettextCatalog.GetString ("File already
exists"))) {
return null;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
