* MonoDevelop.Ide.Templates/ProjectTemplate.cs: Categorise all

  templates by language. Fixes regression from de-gpl-ification.

svn path=/trunk/monodevelop/; revision=140084

1 files changed, 8 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
index c5fd610707..40f905d865 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
@@ -159,15 +159,16 @@ namespace MonoDevelop.Ide.Templates
 				ExpandLanguageWildcards (listLanguages);
 
 				this.languagename = listLanguages [0];
+				
+				if (!String.IsNullOrEmpty (languagename) && !category.StartsWith (languagename + "/"))
+					category = languagename + "/" + category;
 
-				int i = 0;
-				foreach (string language in listLanguages) {
+				for (int i = 1; i < listLanguages.Count; i++) {
+					string language = listLanguages[i];
 					try {
-						if (i++ != 0)
-							ProjectTemplates.Add (new ProjectTemplate (addin, id, codon, language));
-					}
-					catch (Exception e) {
-						LoggingService.LogFatalError (GettextCatalog.GetString ("Error loading template {0}", codon.Id), e);
+						ProjectTemplates.Add (new ProjectTemplate (addin, id, codon, language));
+					} catch (Exception e) {
+						LoggingService.LogError (GettextCatalog.GetString ("Error loading template {0} for language {1}", codon.Id, language), e);
 					}
 				}
 			}