[Monodevelop-patches-list] r1356 - in trunk/MonoDevelop: po src/Main/Base src/Main/Base/Services src/Main/Base/Services/DisplayBinding src/Main/Base/Services/File src/Main/Base/Services/ParserService src/Main/Base/Services/Project src/Main/Base/Services/StatusBar
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 22:57:34 EST 2004
Author: tberman
Date: 2004-04-02 22:57:34 -0500 (Fri, 02 Apr 2004)
New Revision: 1356
Modified:
trunk/MonoDevelop/po/POTFILES.in
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs
trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs
trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs
trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
trunk/MonoDevelop/src/Main/Base/Services/ResourceNotFoundException.cs
trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
Log:
finish gettextifyin the base dll
Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/po/POTFILES.in 2004-04-03 03:57:34 UTC (rev 1356)
@@ -1,5 +1,20 @@
[encoding: UTF-8]
data/resources/glade/Base.glade
+data/resources/glade/CSharp.glade
+data/resources/glade/EditorBindings.glade
+data/resources/glade/texteditoraddin.glade
+gdldock/sources/gdl/gdl-dock-bar.c
+gdldock/sources/gdl/gdl-dock-item-grip.c
+gdldock/sources/gdl/gdl-dock-item.c
+gdldock/sources/gdl/gdl-dock-layout.c
+gdldock/sources/gdl/gdl-dock-master.c
+gdldock/sources/gdl/gdl-dock-notebook.c
+gdldock/sources/gdl/gdl-dock-object.c
+gdldock/sources/gdl/gdl-dock-paned.c
+gdldock/sources/gdl/gdl-dock-placeholder.c
+gdldock/sources/gdl/gdl-dock-tablabel.c
+gdldock/sources/gdl/gdl-dock.c
+gdldock/sources/gdl/layout.glade
src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
src/Main/Base/Gui/Dialogs/NewFileDialog.cs
@@ -59,3 +74,10 @@
src/Main/Base/Internal/Templates/FileTemplate.cs
src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
+src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs
+src/Main/Base/Services/File/DefaultFileService.cs
+src/Main/Base/Services/MessageService.cs
+src/Main/Base/Services/ParserService/DefaultParserService.cs
+src/Main/Base/Services/Project/DefaultProjectService.cs
+src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
+src/Main/Base/Services/ResourceNotFoundException.cs
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-03 03:57:34 UTC (rev 1356)
@@ -1,5 +1,16 @@
2004-04-02 Todd Berman <tberman at sevenl.net>
+ * Services/File/DefaultFileService.cs:
+ * Services/ResourceNotFoundException.cs:
+ * Services/DisplayBinding/DisplayBindingService.cs:
+ * Services/Project/DefaultProjectService.cs:
+ * Services/StatusBar/DefaultStatusBarService.cs:
+ * Services/MessageService.cs:
+ * Services/ParserService/DefaultParserService.cs:
+ Finished gettextifyin the base dll.
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
* Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs:
* Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
phantom commit, no one saw this
Modified: trunk/MonoDevelop/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -58,7 +58,7 @@
}
}
}
- Console.WriteLine ("Didnt match on mimetype: " + mimetype + ", trying filename");
+ Console.WriteLine (String.Format (GettextCatalog.GetString ("Didnt match on mimetype: {0}, trying filename"), mimetype));
foreach (DisplayBindingCodon binding in bindings) {
if (binding.DisplayBinding != null && binding.DisplayBinding.CanCreateContentForFile(filename)) {
return binding;
Modified: trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -243,7 +243,7 @@
Directory.Delete(fileName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't remove directory " + fileName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove directory {0}"), fileName));
return;
}
OnFileRemoved(new FileEventArgs(fileName, true));
@@ -252,7 +252,7 @@
File.Delete(fileName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't remove file " + fileName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove file {0}"), fileName));
return;
}
OnFileRemoved(new FileEventArgs(fileName, false));
@@ -267,7 +267,7 @@
Directory.Move(oldName, newName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't rename directory " + oldName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename directory {0}"), oldName));
return;
}
OnFileRenamed(new FileEventArgs(oldName, newName, true));
@@ -276,7 +276,7 @@
File.Move(oldName, newName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't rename file " + oldName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename file {0}"), oldName));
return;
}
OnFileRenamed(new FileEventArgs(oldName, newName, false));
Modified: trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -11,6 +11,7 @@
using MonoDevelop.Gui;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
+using MonoDevelop.Services;
namespace MonoDevelop.Core.Services
{
@@ -52,7 +53,7 @@
msg += "Exception occurred: " + ex.ToString();
}
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, stringParserService.Parse(msg))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
@@ -60,7 +61,7 @@
public void ShowWarning(string message)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Warning, Gtk.ButtonsType.Ok, stringParserService.Parse(message))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Warning, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
@@ -73,7 +74,7 @@
public bool AskQuestion(string question, string caption)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, stringParserService.Parse(question))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, question)) {
int response = md.Run ();
md.Hide ();
@@ -96,7 +97,7 @@
public bool AskQuestion(string question)
{
- return AskQuestion(stringParserService.Parse(question), stringParserService.Parse("${res:Global.QuestionText}"));
+ return AskQuestion(stringParserService.Parse(question), GettextCatalog.GetString ("Question"));
}
public int ShowCustomDialog(string caption, string dialogText, params string[] buttontexts)
@@ -122,7 +123,7 @@
public void ShowMessage(string message, string caption)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, stringParserService.Parse(message))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -161,7 +161,7 @@
BinaryWriter classWriter = new BinaryWriter(new BufferedStream(new FileStream(codeCompletionMainFile, FileMode.Create, FileAccess.Write, FileShare.None)));
BinaryWriter proxyWriter = new BinaryWriter(new BufferedStream(new FileStream(codeCompletionProxyFile, FileMode.Create, FileAccess.Write, FileShare.None)));
if (progressMonitor != null) {
- progressMonitor.BeginTask("generate code completion database", assemblyList.Length);
+ progressMonitor.BeginTask(GettextCatalog.GetString ("Generate code completion database"), assemblyList.Length);
}
// convert all assemblies
@@ -185,7 +185,7 @@
}
if (progressMonitor != null) {
- progressMonitor.Worked(i, "Writing class");
+ progressMonitor.Worked(i, GettextCatalog.GetString ("Writing class"));
}
if (!ContinueWithProcess(progressMonitor))
return;
Modified: trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -133,7 +133,7 @@
return;
}
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.OpeningCombineMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Opening Combine..."));
if (Path.GetExtension(filename).ToUpper() == ".PRJX") {
string validcombine = Path.ChangeExtension(filename, ".cmbx");
@@ -152,7 +152,7 @@
} else {
LoadCombine(filename);
}
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
}
void LoadCombine(string filename)
@@ -274,7 +274,7 @@
// cut&pasted from CombineEntry.cs
stringParserService.Properties["Project"] = project.Name;
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.CompilingMessage}");
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling {0}"), project.Name));
string outputDir = ((AbstractProjectConfiguration)project.ActiveConfiguration).OutputDirectory;
try {
@@ -332,7 +332,7 @@
if (content.ContentName != null && content.IsDirty) {
if (!save) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Save changed files?")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Save changed files?"))) {
save = true;
} else {
break;
Modified: trunk/MonoDevelop/src/Main/Base/Services/ResourceNotFoundException.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ResourceNotFoundException.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/ResourceNotFoundException.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -7,6 +7,8 @@
using System;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Core.Services
{
/// <summary>
@@ -15,7 +17,7 @@
/// </summary>
public class ResourceNotFoundException : Exception
{
- public ResourceNotFoundException(string resource) : base("Resource not found : " + resource)
+ public ResourceNotFoundException(string resource) : base(String.Format (GettextCatalog.GetString("Resource not found: {0}"), resource))
{
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-04-03 02:55:22 UTC (rev 1355)
+++ trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-04-03 03:57:34 UTC (rev 1356)
@@ -11,6 +11,7 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Gui.Components;
using MonoDevelop.Gui;
+using MonoDevelop.Services;
namespace MonoDevelop.Services
{
@@ -64,7 +65,7 @@
public void SetInsertMode (bool insertMode)
{
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- statusBar.ModeStatusBarPanel.Push (1, insertMode ? stringParserService.Parse("${res:StatusBarService.CaretModes.Insert}") : stringParserService.Parse("${res:StatusBarService.CaretModes.Overwrite}"));
+ statusBar.ModeStatusBarPanel.Push (1, insertMode ? GettextCatalog.GetString ("INS") : GettextCatalog.GetString ("OVR"));
}
public void ShowErrorMessage (string message)
More information about the Monodevelop-patches-list
mailing list