Browse Source

Validate language when starting up SharpDevelop.

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

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

@ -62,7 +62,9 @@ namespace ICSharpCode.SharpDevelop.Gui
public static void InitializeWorkbench(IWorkbench workbench, IWorkbenchLayout layout) public static void InitializeWorkbench(IWorkbench workbench, IWorkbenchLayout layout)
{ {
WorkbenchSingleton.workbench = workbench; WorkbenchSingleton.workbench = workbench;
LanguageService.ValidateLanguage();
DisplayBindingService.InitializeService(); DisplayBindingService.InitializeService();
LayoutConfiguration.LoadLayoutConfiguration(); LayoutConfiguration.LoadLayoutConfiguration();
FileService.InitializeService(); FileService.InitializeService();

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

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

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

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

Loading…
Cancel
Save