[Monodevelop-patches-list] r1342 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Gui/Dialogs/OptionPanels
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 05:09:34 EST 2004
Author: tberman
Date: 2004-04-02 05:09:34 -0500 (Fri, 02 Apr 2004)
New Revision: 1342
Modified:
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
Log:
gettextification
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 10:09:34 UTC (rev 1342)
@@ -1,5 +1,12 @@
2004-04-02 Todd Berman <tberman at sevenl.net>
+ * Gui/Dialogs/NewProjectDialog.cs:
+ * Gui/Dialogs/CommonAboutDialog.cs:
+ * Gui/Dialogs/OptionPanels/EditTemplateDialog.cs:
+ * Gui/Dialogs/NewFileDialog.cs: gettextified
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
* Services/GettextCatalog.cs: changed to use static methods.
* Gui/Dialogs/CommonAboutDialog.cs: reflecting above change.
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-02 10:09:34 UTC (rev 1342)
@@ -142,10 +142,10 @@
//changelog = new ChangeLogTabPage ();
VersionInformationTabPage vinfo = new VersionInformationTabPage ();
- nb.AppendPage (new AboutMonoDevelopTabPage (), new Label ("About MonoDevelop"));
+ nb.AppendPage (new AboutMonoDevelopTabPage (), new Label (GettextCatalog.GetString ("About MonoDevelop")));
//nb.AppendPage (aatp, new Label ("Authors"));
//nb.AppendPage (changelog, new Label ("ChangeLog"));
- nb.AppendPage (vinfo, new Label ("Version Info"));
+ nb.AppendPage (vinfo, new Label (GettextCatalog.GetString ("Version Info")));
this.VBox.PackStart (nb);
this.AddButton (Gtk.Stock.Close, (int) ResponseType.Close);
this.ShowAll ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-04-02 10:09:34 UTC (rev 1342)
@@ -48,7 +48,6 @@
public NewFileDialog () : base ()
{
- this.Title = "New file";
this.TransientFor = (Window) WorkbenchSingleton.Workbench;
this.BorderWidth = 6;
this.HasSeparator = false;
@@ -82,7 +81,7 @@
imglist.Add(bitmap);
tmp[entry.Key] = ++i;
} else {
- Console.WriteLine("can't load bitmap " + entry.Key.ToString() + " using default");
+ Console.WriteLine(GettextCatalog.GetString ("Can't load bitmap {0} using default"), entry.Key.ToString ());
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-04-02 10:09:34 UTC (rev 1342)
@@ -158,7 +158,7 @@
void PathChanged (object sender, EventArgs e)
{
ActivateIfReady ();
- lbl_will_save_in.Text = resourceService.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
+ lbl_will_save_in.Text = GettextCatalog.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
}
public bool IsFilenameAvailable(string fileName)
@@ -203,7 +203,7 @@
//The one below seemed to be failing sometimes.
if(solution.IndexOfAny("$#@!%^&*/?\\|'\";:}{".ToCharArray()) > -1) {
- messageService.ShowError("Illegal project name. \nOnly use letters, digits, space, '.' or '_'.");
+ messageService.ShowError(GettextCatalog.GetString ("Illegal project name. \nOnly use letters, digits, space, '.' or '_'."));
dialog.Respond(Gtk.ResponseType.Reject);
dialog.Hide();
return;
@@ -213,14 +213,14 @@
&& (!fileUtilityService.IsValidFileName (solution) || solution.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0)) ||
!fileUtilityService.IsValidFileName(name) || name.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0 ||
!fileUtilityService.IsValidFileName(location)) {
- messageService.ShowError("Illegal project name.\nOnly use letters, digits, space, '.' or '_'.");
+ messageService.ShowError(GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
dialog.Respond(Gtk.ResponseType.Reject);
dialog.Hide();
return;
}
if(projService.ExistsEntryWithName(name)) {
- messageService.ShowError("A Project with that name is already in your Project Space");
+ messageService.ShowError(GettextCatalog.GetString ("A Project with that name is already in your Project Space"));
dialog.Respond(Gtk.ResponseType.Reject);
dialog.Hide();
return;
@@ -277,7 +277,7 @@
NewCombineLocation = fileUtilityService.GetDirectoryNameWithSeparator(ProjectLocation) + ((TextBox)ControlDictionary["nameTextBox"]).Text + ".cmbx";
if (File.Exists(NewCombineLocation)) {
- DialogResult result = MessageBox.Show("Combine file " + NewCombineLocation + " already exists, do you want to overwrite\nthe existing file ?", "File already exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+ DialogResult result = MessageBox.Show(String.Format (Gettext.GetString ("Combine file {0} already exists, do you want to overwrite\nthe existing file ?"), NewCombineLocation), Gettext.GetString ("File already exists"), MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
switch(result) {
case DialogResult.Yes:
cmb.SaveCombine(NewCombineLocation);
@@ -289,7 +289,7 @@
cmb.SaveCombine(NewCombineLocation);
}
} else {
- MessageBox.Show(resourceService.GetString("Dialog.NewProject.EmptyProjectFieldWarning"), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ MessageBox.Show(GettextCatalog.GetString ("The project or source entry is empty, can't create project."), GettextCatalog.GetString ("Warning"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
#endif
}
@@ -347,12 +347,7 @@
TemplateView = new IconView ();
hbox_template.PackStart (TemplateView, true, true, 0);
- //string label = stringParserService.Parse ("${res:Dialog.NewProject.NewSolutionLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.LocationLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.NameLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.checkBox1Text}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.autoCreateSubDirCheckBox}");
- entry_location = new FolderEntry ("Combine Location");
+ entry_location = new FolderEntry (GettextCatalog.GetString ("Combine Location"));
hbox_for_browser.PackStart (entry_location, true, true, 0);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-04-02 10:09:34 UTC (rev 1342)
@@ -10,6 +10,7 @@
using MonoDevelop.Internal.Templates;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Gui.Dialogs
{
@@ -55,14 +56,13 @@
{
// set up this actual dialog
this.Modal = true;
- this.Title = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DialogName}");
// set up the dialog fields and add them
templateTextBox = new Gtk.Entry();
descriptionTextBox = new Gtk.Entry();
descriptionTextBox.ActivatesDefault = true;
- Gtk.Label label1 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DescriptionLabel}"));
- Gtk.Label label2 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.TemplateLabel}"));
+ Gtk.Label label1 = new Gtk.Label(GettextCatalog.GetString ("_Description"));
+ Gtk.Label label2 = new Gtk.Label(GettextCatalog.GetString ("_Template"));
label1.Xalign = 0;
label2.Xalign = 0;
templateTextBox.Text = codeTemplate.Shortcut;
More information about the Monodevelop-patches-list
mailing list