[MonoDevelop] Little patch

Lluis Sanchez lluis@ximian.com
Sat, 03 Apr 2004 14:21:37 +0200


--=-jq3cEuZe78TltoLWTq1H
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi!

This fixes some little bugs in the gettexification.

Lluis.

--=-jq3cEuZe78TltoLWTq1H
Content-Disposition: attachment; filename=text.diff
Content-Type: text/x-patch; name=text.diff; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Index: src/Main/Base/Commands/RunCommands.cs
===================================================================
--- src/Main/Base/Commands/RunCommands.cs	(revision 1359)
+++ src/Main/Base/Commands/RunCommands.cs	(working copy)
@@ -90,8 +90,9 @@
 							}
 						}
 					}
-					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
+					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
 				} catch (Exception e) {
+					Console.WriteLine (e);
 					IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
 				}
@@ -164,8 +165,9 @@
 							}
 						}
 					}
-					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 				} catch (Exception e) {
+					Console.WriteLine (e);
 					IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
 				}
@@ -277,7 +279,7 @@
 			
 						projectService.OnStartBuild();
 						projectService.CompileProject(projectService.CurrentSelectedProject);
-						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 					} catch (Exception e) {
 						IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 						messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
@@ -311,7 +313,7 @@
 				
 						projectService.OnStartBuild();
 						projectService.RecompileProject(projectService.CurrentSelectedProject);
-						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 					} catch (Exception e) {
 						IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 						messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
Index: src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- src/Main/Base/Internal/Project/Combine/CombineEntry.cs	(revision 1359)
+++ src/Main/Base/Internal/Project/Combine/CombineEntry.cs	(working copy)
@@ -129,7 +129,7 @@
 				
 				AbstractProjectConfiguration conf = project.ActiveConfiguration as AbstractProjectConfiguration;
 
-				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: ${Project} Configuration: ${Config} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
+				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: {0} Configuration: {1} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
 				
 				if (conf != null && File.Exists(conf.ExecuteBeforeBuild)) {
 					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteBeforeBuild);
@@ -171,7 +171,7 @@
 					++BuildProjects;
 				}
 				
-				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- ${0} errors, ${1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
+				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- {0} errors, {1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
 			}
 		}
 		
Index: po/en_CA.po
===================================================================
--- po/en_CA.po	(revision 1359)
+++ po/en_CA.po	(working copy)
@@ -1231,7 +1231,7 @@
 msgid ""
 "---------------------- Done ----------------------\n"
 "\n"
-"Build: ${0} succeeded, ${1} failed\n"
+"Build: {0} succeeded, {1} failed\n"
 msgstr ""
 
 #: src/Main/Base/Commands/RunCommands.cs:96

--=-jq3cEuZe78TltoLWTq1H--