sync with main repo

RetailCoder.VBE/App.cs

@@ -18,6 +18,7 @@
 using System.Runtime.InteropServices.ComTypes;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Rubberduck.Common.Hotkeys;
 
 namespace Rubberduck
 {
@@ -132,9 +133,9 @@ private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserSta
         private void _configService_SettingsChanged(object sender, EventArgs e)
         {
             _config = _configService.LoadConfiguration();
+            _hooks.HookHotkeys();
             // also updates the ShortcutKey text
             _appMenus.Localize();
-            _hooks.HookHotkeys();
             UpdateLoggingLevel();
         }
 
@@ -147,9 +148,9 @@ public void Startup()
         {
             CleanReloadConfig();
             _appMenus.Initialize();
+            _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
             Task.Delay(1000).ContinueWith(t => UiDispatcher.Invoke(() => _parser.State.OnParseRequested(this))).ConfigureAwait(false);
-            _hooks.HookHotkeys();
             UpdateLoggingLevel();
         }
 

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -5,6 +5,7 @@
 using System.Windows.Input;
 using Rubberduck.Common.WinAPI;
 using NLog;
+using Rubberduck.UI.Command;
 
 namespace Rubberduck.Common.Hotkeys
 {
@@ -58,6 +59,7 @@ public void Attach()
             }
 
             HookKey(key, shift);
+            SetCommandShortcutText();
         }
 
         public void Detach()
@@ -71,6 +73,7 @@ public void Detach()
             Kernel32.GlobalDeleteAtom(HotkeyInfo.HookId);
 
             IsAttached = false;
+            ClearCommandShortcutText();
         }
 
         private void HookKey(Keys key, uint shift)
@@ -90,9 +93,29 @@ private void HookKey(Keys key, uint shift)
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);
             IsAttached = true;
+
             _logger.Debug("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());  //no translation needed for Debug.Writeline
         }
 
+        private void SetCommandShortcutText()
+        {
+            var command = Command as CommandBase;
+            if (command != null)
+            {
+                command.ShortcutText = HotkeyInfo.ToString();
+            }
+        }
+
+        private void ClearCommandShortcutText()
+        {
+            var command = Command as CommandBase;
+            if (command != null)
+            {
+                command.ShortcutText = string.Empty;
+            }
+        }
+
+
         private static readonly IDictionary<char,uint> Modifiers = new Dictionary<char, uint>
         {
             { '+', (uint)KeyModifier.SHIFT },

RetailCoder.VBE/Common/Hotkeys/HotkeyInfo.cs

@@ -25,17 +25,17 @@ public override string ToString()
             var builder = new StringBuilder();
             if (_keys.HasFlag(Keys.Alt))
             {
-                builder.Append("Alt");
+                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyAlt);
                 builder.Append('+');
             }
             if (_keys.HasFlag(Keys.Control))
             {
-                builder.Append("Ctrl");
+                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyCtrl);
                 builder.Append('+');
             }
             if (_keys.HasFlag(Keys.Shift))
             {
-                builder.Append("Shift");
+                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyShift);
                 builder.Append('+');
             }
             builder.Append(_keys & ~Modifiers);

RetailCoder.VBE/Inspections/InspectionsUI.de.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>