[Monodevelop-patches-list] r1349 - in trunk/MonoDevelop: po src/Main/Base src/Main/Base/Commands src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Internal/ExternalTool src/Main/Base/Internal/Project/Combine src/Main/Base/Internal/Project/Project src/Main/Base/Internal/Project/Project/Deployment src/Main/Base/Internal/Templates src/Main/Base/Internal/Templates/ProjectTemplates
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 12:06:37 EST 2004
Author: tberman
Date: 2004-04-02 12:06:37 -0500 (Fri, 02 Apr 2004)
New Revision: 1349
Modified:
trunk/MonoDevelop/po/POTFILES.in
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
Log:
gettextify lovin Internal/ and some other stuff, almost done with the first assembly.
Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/po/POTFILES.in 2004-04-02 17:06:37 UTC (rev 1349)
@@ -47,3 +47,15 @@
src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
src/Main/Base/Commands/ProjectCommands.cs
src/Main/Base/Commands/RunCommands.cs
+src/Main/Base/Internal/ExternalTool/ToolLoader.cs
+src/Main/Base/Internal/Project/Combine/Combine.cs
+src/Main/Base/Internal/Project/Combine/CombineEntry.cs
+src/Main/Base/Internal/Project/Project/AbstractProject.cs
+src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
+src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
+src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
+src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
+src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
+src/Main/Base/Internal/Templates/FileTemplate.cs
+src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
+src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 17:06:37 UTC (rev 1349)
@@ -1,5 +1,25 @@
2004-04-02 Todd Berman <tberman at sevenl.net>
+ * Commands/RunCommands.cs:
+ * Commands/FileCommands.cs:
+ * Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
+ * Internal/ExternalTool/ExternalTool.cs:
+ * Internal/ExternalTool/ToolLoader.cs:
+ * Internal/Project/Project/Deployment/FileDeploy.cs:
+ * Internal/Project/Project/Deployment/AssemblyDeploy.cs:
+ * Internal/Project/Project/Deployment/ScriptDeploy.cs:
+ * Internal/Project/Project/IncludeFilesDialog.cs:
+ * Internal/Project/Project/AbstractProject.cs:
+ * Internal/Project/Combine/Combine.cs:
+ * Internal/Project/Combine/CombineEntry.cs:
+ * Internal/Templates/FileTemplate.cs:
+ * Internal/Templates/CodeTemplateLoader.cs:
+ * Internal/Templates/ProjectTemplates/CombineDescriptor.cs:
+ * Internal/Templates/ProjectTemplates/ProjectDescriptor.cs:
+ gettextify, and actually COMPILE it before checking in this time...
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
* Commands/MenuItemBuilders.cs:
* Commands/RunCommands.cs:
* Commands/ClassBrowserCommands/ClassBrowserCommands.cs:
Modified: trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -101,7 +101,7 @@
if (window != null && window.ViewContent.ContentName != null && !window.ViewContent.IsViewOnly) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?"))) {
IXmlConvertable memento = null;
if (window.ViewContent is IMementoCapable) {
memento = ((IMementoCapable)window.ViewContent).CreateMemento();
Modified: trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -46,7 +46,7 @@
statusBarService.SetMessage(GettextCatalog.GetString ("Successful"));
} else {
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), taskService.Errors.ToString (); taskService.Warnings.ToString ());
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), taskService.Errors.ToString (), taskService.Warnings.ToString ()));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -22,6 +22,8 @@
using MonoDevelop.Gui.Widgets;
using Stock = MonoDevelop.Gui.Stock;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.Pads.ProjectBrowser
{
public class DefaultDotNetNodeBuilder : IProjectNodeBuilder
Modified: trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -9,6 +9,8 @@
using System.Diagnostics;
using System.Xml;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.ExternalTool
{
/// <summary>
@@ -17,7 +19,7 @@
/// </summary>
public class ExternalTool
{
- string menuCommand = "New Tool";
+ string menuCommand = GettextCatalog.GetString ("New Tool");
string command = "";
string arguments = "";
string initialDirectory = "";
Modified: trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -14,6 +14,8 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.ExternalTool
{
/// <summary>
@@ -85,7 +87,7 @@
Path.DirectorySeparatorChar + TOOLFILE)) {
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowWarning(resourceService.GetString("Internal.ExternalTool.CantLoadToolConfigWarining"));
+ messageService.ShowWarning(GettextCatalog.GetString ("Can't load external tools configuration file"));
}
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -165,7 +165,7 @@
ILanguageBinding binding = languageBindingService.GetBindingPerProjectFile(filename);
if (binding == null) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(stringParserService.Parse("Can't find language binding for ${FILENAME} ", new string[,] {{"FILENAME", filename}}));
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't find language binding for {0}"), filename));
return null;
}
@@ -298,19 +298,19 @@
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save),
filename,
- resourceService.GetString("Internal.Project.Combine.CantSaveCombineErrorText"),
- FileErrorPolicy.ProvideAlternative);
+ GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."),
+ FileErrorPolicy.ProvideAlternative);
}
public void SaveCombineAs()
{
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save Combine As...")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save Combine As..."))) {
fdiag.Filename = System.Environment.GetEnvironmentVariable ("HOME");
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
string filename = fdiag.Filename;
SaveCombine(filename);
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(filename, resourceService.GetString("Internal.Project.Combine.CombineSavedMessage"));
+ messageService.ShowMessage(filename, GettextCatalog.GetString ("Combine saved"));
}
fdiag.Hide ();
@@ -513,7 +513,7 @@
allProjects = TopologicalSort(allProjects);
} catch (CyclicBuildOrderException) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Cyclic dependencies can not be build with this version.\nBut we are working on it.");
+ messageService.ShowError(GettextCatalog.GetString ("Cyclic dependencies can not be build with this version.\nBut we are working on it."));
return;
}
TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -111,7 +111,7 @@
TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.CompilingMessage}");
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling: {0}"), Project.Name));
LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
// create output directory, if not exists
@@ -128,11 +128,11 @@
ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
AbstractProjectConfiguration conf = project.ActiveConfiguration as AbstractProjectConfiguration;
- taskService.CompilerOutput += stringParserService.Parse("${res:MainWindow.CompilerMessages.BuildStartedOutput}", new string[,] { {"PROJECT", Project.Name}, {"CONFIG", Project.ActiveConfiguration.Name} }) + "\n";
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.PerformingMainCompilationOutput") + "\n";
+
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: ${Project} Configuration: ${Config} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
if (conf != null && File.Exists(conf.ExecuteBeforeBuild)) {
- taskService.CompilerOutput += "Execute : " + conf.ExecuteBeforeBuild;
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteBeforeBuild);
ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteBeforeBuild);
ps.UseShellExecute = false;
ps.RedirectStandardOutput = true;
@@ -146,7 +146,7 @@
ICompilerResult res = csc.CompileProject(project);
if (conf != null && File.Exists(conf.ExecuteAfterBuild)) {
- taskService.CompilerOutput += "Execute : " + conf.ExecuteAfterBuild;
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteAfterBuild);
ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteAfterBuild);
ps.UseShellExecute = false;
ps.RedirectStandardOutput = true;
@@ -171,7 +171,7 @@
++BuildProjects;
}
- taskService.CompilerOutput += res.CompilerOutput + stringParserService.Parse("${res:MainWindow.CompilerMessages.ProjectStatsOutput}", new string[,] { {"ERRORS", taskService.Errors.ToString()}, {"WARNINGS", taskService.Warnings.ToString()} }) + "\n\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- ${0} errors, ${1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -255,8 +255,7 @@
if (version == "1.0") {
string tempFile = Path.GetTempFileName();
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage("Old project file format found.\n It will be automatically converted to " + currentProjectFileVersion,
- "Information");
+ messageService.ShowMessage(String.Format (GettextCatalog.GetString ("Old project file format found.\n It will be automatically converted to {0} information"), currentProjectFileVersion));
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
ConvertXml.Convert(fileName,
@@ -271,7 +270,7 @@
File.Delete(tempFile);
return;
} catch (Exception) {
- messageService.ShowError("Error writing the old project file.\nCheck if you have write permission on the project file (.prjx).\n A non persistent proxy project will be created but no changes will be saved.\nIt is better if you close SharpDevelop and correct the problem.");
+ messageService.ShowError(GettextCatalog.GetString ("Error writing the old project file.\nCheck if you have write permission on the project file (.prjx).\n A non persistent proxy project will be created but no changes will be saved.\nIt is better if you close SharpDevelop and correct the problem."));
if (File.Exists(tempFile)) {
doc.Load(tempFile);
File.Delete(tempFile);
@@ -495,8 +494,8 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save),
fileName,
- resourceService.GetString("Internal.Project.Project.CantSaveProjectErrorText"),
- FileErrorPolicy.ProvideAlternative);
+ GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."),
+ FileErrorPolicy.ProvideAlternative);
}
public virtual string GetParseableFileContent(string fileName)
@@ -510,7 +509,7 @@
public void SaveProjectAs()
{
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save Project As...")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save Project As..."))) {
fdiag.Filename = System.Environment.GetEnvironmentVariable ("HOME");
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
@@ -518,7 +517,7 @@
SaveProject(filename);
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(filename, resourceService.GetString("Internal.Project.DefaultProject.ProjectSavedMessage"));
+ messageService.ShowMessage(filename, GettextCatalog.GetString ("Project saved"));
}
fdiag.Hide ();
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -9,6 +9,7 @@
using System.IO;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -25,7 +26,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.AssemblyDeploy.DeployTargetNotSet"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deploy: no deployment target set"));
return;
}
try {
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -10,6 +10,7 @@
using System.CodeDom.Compiler;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -20,7 +21,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.DeployWithoutScriptError"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));
return;
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -10,6 +10,7 @@
using System.Diagnostics;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -20,7 +21,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployScript.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.DeployWithoutScriptError"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deply: you forgot to specify a deployment script"));
return;
}
try {
@@ -32,7 +33,7 @@
}
} catch (Exception e) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.ErrorWhileExecuteScript"));
+ messageService.ShowError(e, GettextCatalog.GetString ("Error while executing deploy script"));
}
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -12,6 +12,7 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using MonoDevelop.Gui;
using MonoDevelop.Internal.Project;
@@ -49,13 +50,10 @@
// we must do it from *here* otherwise, we get this assembly, not the caller
Glade.XML glade = new Glade.XML (null, "Base.glade", "IncludeFilesDialogWidget", null);
glade.Autoconnect (this);
- InitDialog ();
// set up dialog title
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- this.IncludeFilesDialogWidget.Title =
- stringParserService.Parse(resourceService.GetString("Dialog.IncludeFilesDialog.DialogName"),
- new string[,] {{ "PROJECT", project.Name}});
+ this.IncludeFilesDialogWidget.Title = String.Format (GettextCatalog.GetString ("Found new files in {0}"), project.Name);
newFilesOnlyRadioButton.Active = true;
this.newFiles = newFiles;
@@ -164,17 +162,6 @@
}
}
- private void InitDialog()
- {
- // setup all the strings
- this.deselectAllButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.DeselectAllButton");
- this.newFilesOnlyRadioButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.NewFilesRadioButton");
- this.allFilesRadioButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.AllFilesRadioButton");
- this.newFilesInProjectLabel.Text = resourceService.GetString("Dialog.IncludeFilesDialog.IncludeFilesLabel");
- this.selectAllButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.SelectAllButton");
- this.viewLabel.Markup = "<b>" + resourceService.GetString("Dialog.IncludeFilesDialog.ViewGroupBoxText") + "</b>";
- }
-
public void ShowDialog()
{
this.IncludeFilesDialogWidget.Run();
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -15,6 +15,8 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.Templates
{
/// <summary>
@@ -103,7 +105,7 @@
Path.DirectorySeparatorChar + "options" +
Path.DirectorySeparatorChar + TemplateFileName)) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowWarning("${res:Internal.Templates.CodeTemplateLoader.CantLoadTemplatesWarning}");
+ messageService.ShowWarning(GettextCatalog.GetString ("Can't load templates configuration file"));
}
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -162,7 +162,7 @@
try {
LoadFileTemplate(file);
} catch(Exception e) {
- messageService.ShowError(e, "Error loading template file " + file + ".");
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error loading template file {0}"), file));
}
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -16,6 +16,8 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Internal.Project;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.Templates
{
public class CombineDescriptor
@@ -94,7 +96,7 @@
string combineLocation = fileUtilityService.GetDirectoryNameWithSeparator(projectCreateInformation.CombinePath) + newCombineName + ".cmbx";
if (File.Exists(combineLocation)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Combine file " + combineLocation + " already exists, do you want to overwrite\nthe existing file ?")) {
+ if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Solution file {0} already exists, do you want to overwrite\nthe existing file ?"), combineLocation))) {
newCombine.SaveCombine(combineLocation);
}
} else {
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-04-02 15:46:33 UTC (rev 1348)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-04-02 17:06:37 UTC (rev 1349)
@@ -84,7 +84,7 @@
if (languageinfo == null) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Can't create project with type :" + language);
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't create project with type : {0}"), language));
return String.Empty;
}
@@ -110,7 +110,7 @@
if (File.Exists(fileName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (!messageService.AskQuestion("File " + fileName + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
}
@@ -124,7 +124,7 @@
sr.Close();
} catch (Exception ex) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(ex, "File " + fileName + " could not be written.");
+ messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -136,7 +136,7 @@
if (File.Exists(fileName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (!messageService.AskQuestion("File " + fileName + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
}
@@ -150,7 +150,7 @@
sr.Close();
} catch (Exception ex) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(ex, "File " + fileName + " could not be written.");
+ messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -159,7 +159,7 @@
if (File.Exists(projectLocation)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Project file " + projectLocation + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Project file {0} already exists, do you want to overwrite\nthe existing file ?"), projectLocation), GettextCatalog.GetString ("File already exists"))) {
project.SaveProject(projectLocation);
}
} else {
More information about the Monodevelop-patches-list
mailing list