Browse Source

Validate language when starting up SharpDevelop.

pull/1/head
Daniel Grunwald 16 years ago
parent
commit
2607159591
  1. 2
      src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
  2. 8
      src/Main/Base/Project/Src/Services/Language/LanguageService.cs
  3. 2
      src/Main/Core/Project/Src/Services/ResourceService/ResourceService.cs

2
src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs

@ -63,6 +63,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -63,6 +63,8 @@ namespace ICSharpCode.SharpDevelop.Gui
{
WorkbenchSingleton.workbench = workbench;
LanguageService.ValidateLanguage();
DisplayBindingService.InitializeService();
LayoutConfiguration.LoadLayoutConfiguration();
FileService.InitializeService();

8
src/Main/Base/Project/Src/Services/Language/LanguageService.cs

@ -58,5 +58,13 @@ namespace ICSharpCode.SharpDevelop @@ -58,5 +58,13 @@ namespace ICSharpCode.SharpDevelop
}
LanguageService.languages = languages.AsReadOnly();
}
/// <summary>
/// Ensures that the active language exists
/// </summary>
public static void ValidateLanguage()
{
ResourceService.Language = GetLanguage(ResourceService.Language).Code;
}
}
}

2
src/Main/Core/Project/Src/Services/ResourceService/ResourceService.cs

@ -42,9 +42,11 @@ namespace ICSharpCode.Core @@ -42,9 +42,11 @@ namespace ICSharpCode.Core
return PropertyService.Get(uiLanguageProperty, Thread.CurrentThread.CurrentUICulture.Name);
}
set {
if (Language != value) {
PropertyService.Set(uiLanguageProperty, value);
}
}
}
static readonly object loadLock = new object();

Loading…
Cancel
Save