fix CommandBar localization. closes #2226

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -11,7 +11,6 @@
 using System.Windows.Forms;
 using Rubberduck.Inspections.Resources;
 using Rubberduck.UI.Command;
-using Rubberduck.UI.Command.MenuItems.CommandBars;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VersionCheck;
 using Application = System.Windows.Forms.Application;
@@ -24,7 +23,6 @@ public sealed class App : IDisposable
         private readonly AutoSave.AutoSave _autoSave;
         private readonly IGeneralConfigService _configService;
         private readonly IAppMenu _appMenus;
-        private readonly RubberduckCommandBar _stateBar;
         private readonly IRubberduckHooks _hooks;
         private readonly IVersionCheck _version;
         private readonly CommandBase _checkVersionCommand;
@@ -37,7 +35,6 @@ public App(IVBE vbe,
             IMessageBox messageBox,
             IGeneralConfigService configService,
             IAppMenu appMenus,
-            RubberduckCommandBar stateBar,
             IRubberduckHooks hooks,
             IVersionCheck version,
             CommandBase checkVersionCommand)
@@ -46,7 +43,6 @@ public App(IVBE vbe,
             _configService = configService;
             _autoSave = new AutoSave.AutoSave(vbe, _configService);
             _appMenus = appMenus;
-            _stateBar = stateBar;
             _hooks = hooks;
             _version = version;
             _checkVersionCommand = checkVersionCommand;
@@ -62,7 +58,6 @@ private void _configService_SettingsChanged(object sender, ConfigurationChangedE
             _hooks.HookHotkeys();
             // also updates the ShortcutKey text
             _appMenus.Localize();
-            _stateBar.Localize();
             UpdateLoggingLevel();
 
             if (e.LanguageChanged)
@@ -98,7 +93,6 @@ public void Startup()
             LoadConfig();
             CheckForLegacyIndenterSettings();
             _appMenus.Initialize();
-            _stateBar.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
 
@@ -134,7 +128,6 @@ private void LoadConfig()
                 RubberduckUI.Culture = CultureInfo.CurrentUICulture;
                 InspectionsUI.Culture = CultureInfo.CurrentUICulture;
                 _appMenus.Localize();
-                _stateBar.Localize();
             }
             catch (CultureNotFoundException exception)
             {

RetailCoder.VBE/AppMenu.cs

@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
+using Rubberduck.UI.Command.MenuItems.CommandBars;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck
@@ -14,19 +15,22 @@ public class AppMenu : IAppMenu, IDisposable
         private readonly IReadOnlyList<IParentMenuItem> _menus;
         private readonly IParseCoordinator _parser;
         private readonly ISelectionChangeService _selectionService;
+        private readonly RubberduckCommandBar _stateBar;
 
-        public AppMenu(IEnumerable<IParentMenuItem> menus, IParseCoordinator parser, ISelectionChangeService selectionService)
+        public AppMenu(IEnumerable<IParentMenuItem> menus, IParseCoordinator parser, ISelectionChangeService selectionService, RubberduckCommandBar stateBar)
         {
             _menus = menus.ToList();
             _parser = parser;
             _selectionService = selectionService;
+            _stateBar = stateBar;
 
             _parser.State.StateChanged += OnParserStateChanged;
             _selectionService.SelectedDeclarationChanged += OnSelectedDeclarationChange;
         }
 
         public void Initialize()
         {
+            _stateBar.Initialize();
             foreach (var menu in _menus)
             {
                 menu.Initialize();
@@ -53,6 +57,8 @@ public void EvaluateCanExecute(RubberduckParserState state)
 
         public void Localize()
         {
+            _stateBar.Localize();
+            _stateBar.SetStatusLabelCaption(_parser.State.Status);
             foreach (var menu in _menus)
             {
                 menu.Localize();

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -25,7 +25,7 @@ protected AppCommandBarBase(string name, CommandBarPosition position, IEnumerabl
 
         protected ICommandMenuItem FindChildByTag(string tag)
         {
-            var child = _items.FirstOrDefault(kvp => kvp.Value.Tag == tag);
+            var child = _items.FirstOrDefault(kvp => kvp.Value != null && kvp.Value.Tag == tag);
             return Equals(child, default(KeyValuePair<ICommandMenuItem, ICommandBarControl>)) 
                 ? null 
                 : child.Key;

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
@@ -91,7 +92,7 @@ private void OnParserStateChanged(object sender, EventArgs e)
 
         public void SetStatusLabelCaption(ParserState state, int? errorCount = null)
         {
-            var caption = RubberduckUI.ResourceManager.GetString("ParserState_" + state, Settings.Settings.Culture);
+            var caption = RubberduckUI.ResourceManager.GetString("ParserState_" + state, CultureInfo.CurrentUICulture);
             SetStatusLabelCaption(caption, errorCount);
         }