rename Language/LanguageService to UILanguage/UILanguageService

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -525,7 +525,7 @@
     <Compile Include="Src\Services\LanguageBinding\ILanguageBinding.cs" />
     <Compile Include="Src\Services\LanguageBinding\LanguageBindingDoozer.cs" />
     <Compile Include="Src\Services\LanguageBinding\LanguageBindingService.cs" />
-    <Compile Include="Src\Services\Language\LanguageService.cs" />
+    <Compile Include="Src\Services\Language\UILanguageService.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WindowActiveEvaluator.cs" />
     <Compile Include="Src\Internal\Doozers\DefaultOptionPanelDescriptor.cs" />
     <Compile Include="Src\Internal\Doozers\OptionPanelDoozer.cs" />
@@ -545,7 +545,7 @@
     <Compile Include="Src\Services\ProjectBinding\ProjectBindingService.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\CombineOpenEvaluator.cs" />
     <Compile Include="Src\Services\ProjectBinding\ProjectBindingDoozer.cs" />
-    <Compile Include="Src\Services\Language\Language.cs" />
+    <Compile Include="Src\Services\Language\UILanguage.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\ProjectActiveEvaluator.cs" />
     <Compile Include="Src\Services\AmbienceService\AmbienceService.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WindowOpenEvaluator.cs" />

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.xaml.cs

@@ -22,20 +22,20 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		public SelectCulturePanel()
 		{
 			InitializeComponent();
-			listView.ItemsSource = LanguageService.Languages;
+			listView.ItemsSource = UILanguageService.Languages;
 		}
 		
 		static readonly string langPropName = "CoreProperties.UILanguage";
 		
-		public static Language CurrentLanguage {
+		public static UILanguage CurrentLanguage {
 			get { return GetCulture(PropertyService.Get(langPropName, "en")); }
 			set { PropertyService.Set(langPropName, value.Code); }
 		}
 		
-		static Language GetCulture(string languageCode)
+		static UILanguage GetCulture(string languageCode)
 		{
-			return LanguageService.Languages.FirstOrDefault(x => x.Code.StartsWith(languageCode))
-				?? LanguageService.Languages.First(x => x.Code.StartsWith("en"));
+			return UILanguageService.Languages.FirstOrDefault(x => x.Code.StartsWith(languageCode))
+				?? UILanguageService.Languages.First(x => x.Code.StartsWith("en"));
 		}
 	}
 	

src/Main/Base/Project/Src/Services/Language/UILanguage.cs

@@ -5,7 +5,7 @@ using System;
 
 namespace ICSharpCode.SharpDevelop
 {
-	public class Language
+	public class UILanguage
 	{
 		string name;
 		string code;
@@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop
 			get { return isRightToLeft; }
 		}
 		
-		public Language(string name, string code, string imagePath, bool isRightToLeft)
+		public UILanguage(string name, string code, string imagePath, bool isRightToLeft)
 		{
 			this.name       = name;
 			this.code       = code;

src/Main/Base/Project/Src/Services/Language/UILanguageService.cs

@@ -11,34 +11,34 @@ using ICSharpCode.Core;
 
 namespace ICSharpCode.SharpDevelop
 {
-	public static class LanguageService
+	static class UILanguageService
 	{
 		static string languagePath = Path.Combine(PropertyService.DataDirectory, "resources", "languages");
 		
-		static ReadOnlyCollection<Language> languages = null;
+		static ReadOnlyCollection<UILanguage> languages = null;
 		
-		public static ReadOnlyCollection<Language> Languages {
+		public static ReadOnlyCollection<UILanguage> Languages {
 			get {
 				return languages;
 			}
 		}
 		
-		public static Language GetLanguage(string code)
+		public static UILanguage GetLanguage(string code)
 		{
-			foreach (Language l in languages) {
+			foreach (UILanguage l in languages) {
 				if (l.Code == code)
 					return l;
 			}
-			foreach (Language l in languages) {
+			foreach (UILanguage l in languages) {
 				if (l.Code.StartsWith(code, StringComparison.Ordinal))
 					return l;
 			}
 			return languages[0];
 		}
 		
-		static LanguageService()
+		static UILanguageService()
 		{
-			List<Language> languages = new List<Language>();
+			List<UILanguage> languages = new List<UILanguage>();
 			
 			XmlDocument doc = new XmlDocument();
 			doc.Load(Path.Combine(languagePath, "LanguageDefinition.xml"));
@@ -48,7 +48,7 @@ namespace ICSharpCode.SharpDevelop
 			foreach (XmlNode node in nodes) {
 				XmlElement el = node as XmlElement;
 				if (el != null) {
-					languages.Add(new Language(
+					languages.Add(new UILanguage(
 						el.Attributes["name"].InnerText,
 						el.Attributes["code"].InnerText,
 						Path.Combine(languagePath, el.Attributes["icon"].InnerText),
@@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop
 					));
 				}
 			}
-			LanguageService.languages = languages.AsReadOnly();
+			UILanguageService.languages = languages.AsReadOnly();
 		}
 		
 		/// <summary>

src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs

@@ -43,7 +43,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 		{
 			SD.Services.AddService(typeof(IWorkbench), workbench);
 			
-			LanguageService.ValidateLanguage();
+			UILanguageService.ValidateLanguage();
 			
 			TaskService.Initialize();
 			Project.CustomToolsService.Initialize();

src/Main/SharpDevelop/Workbench/WpfWorkbench.cs

@@ -222,7 +222,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 		
 		void UpdateFlowDirection()
 		{
-			Language language = LanguageService.GetLanguage(ResourceService.Language);
+			UILanguage language = UILanguageService.GetLanguage(ResourceService.Language);
 			Core.WinForms.RightToLeftConverter.IsRightToLeft = language.IsRightToLeft;
 			this.FlowDirection = language.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
 			App.Current.Resources[GlobalStyles.FlowDirectionKey] = this.FlowDirection;