Merge pull request #1297 from INOPIAE/translationHotkeys

retailcoder · retailcoder · commit ebe8705500ec · 2016-04-03T20:52:10.000-04:00
Translation
diff --git a/RetailCoder.VBE/Common/Hotkeys/Hotkey.cs b/RetailCoder.VBE/Common/Hotkeys/Hotkey.cs
@@ -53,7 +53,7 @@ public void Attach()
 
             if (key == Keys.None)
             {
-                throw new InvalidOperationException("Invalid key.");
+                throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_InvalidKey);
             }
 
             HookKey(key, shift);
@@ -63,7 +63,7 @@ public void Detach()
         {
             if (!IsAttached)
             {
-                throw new InvalidOperationException("Hook is already detached.");
+                throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_HookDetached);
             }
 
             User32.UnregisterHotKey(_hWndVbe, HotkeyInfo.HookId);
@@ -76,20 +76,20 @@ private void HookKey(Keys key, uint shift)
         {
             if (IsAttached)
             {
-                throw new InvalidOperationException("Hook is already attached.");
+                throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_HookAttached);
             }
 
             var hookId = (IntPtr)Kernel32.GlobalAddAtom(Guid.NewGuid().ToString());
             var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
             if (!success)
             {
-                Debug.WriteLine("Hotkey ({0}) not registered.", key);
-                //throw new Win32Exception("HotKey was not registered.");
+                Debug.WriteLine(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
+                //throw new Win32Exception(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
             }
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);
             IsAttached = true;
-            Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());
+            Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());  //no translation needed for Debug.Writeline
         }
 
         private static readonly IDictionary<char,uint> Modifiers = new Dictionary<char, uint>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.de.resx b/RetailCoder.VBE/UI/RubberduckUI.de.resx
@@ -1459,4 +1459,16 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
   <data name="UnitTest_NewMethod_ErrorNotRaised" xml:space="preserve">
     <value>Der erwartete Fehler wurde nicht gefunden</value>
   </data>
+  <data name="CommonHotkey_InvalidKey" xml:space="preserve">
+    <value>Ungültiges Zeichen.</value>
+  </data>
+  <data name="CommonHotkey_HookDetached" xml:space="preserve">
+    <value>Hook ist nicht mehr aktiv.</value>
+  </data>
+  <data name="CommonHotkey_HookAttached" xml:space="preserve">
+    <value>Hook ist schon hinzugefügt.</value>
+  </data>
+  <data name="CommonHotkey_KeyNotRegistered" xml:space="preserve">
+    <value>Hotkey ({0}) ist nicht registriert.</value>
+  </data>
 </root>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1477,4 +1477,16 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="UnitTest_NewMethod_ErrorNotRaised" xml:space="preserve">
     <value>Expected error was not raised</value>
   </data>
+  <data name="CommonHotkey_InvalidKey" xml:space="preserve">
+    <value>Invalid key.</value>
+  </data>
+  <data name="CommonHotkey_HookDetached" xml:space="preserve">
+    <value>Hook is already detached.</value>
+  </data>
+  <data name="CommonHotkey_HookAttached" xml:space="preserve">
+    <value>Hook is already attached.</value>
+  </data>
+  <data name="CommonHotkey_KeyNotRegistered" xml:space="preserve">
+    <value>Hotkey ({0}) not registered.</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void Attach()`
`53`	`53`
`54`	`54`	`if (key == Keys.None)`
`55`	`55`	`{`
`56`		`- throw new InvalidOperationException("Invalid key.");`
	`56`	`+ throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_InvalidKey);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`HookKey(key, shift);`
`@@ -63,7 +63,7 @@ public void Detach()`
`63`	`63`	`{`
`64`	`64`	`if (!IsAttached)`
`65`	`65`	`{`
`66`		`- throw new InvalidOperationException("Hook is already detached.");`
	`66`	`+ throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_HookDetached);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`User32.UnregisterHotKey(_hWndVbe, HotkeyInfo.HookId);`
`@@ -76,20 +76,20 @@ private void HookKey(Keys key, uint shift)`
`76`	`76`	`{`
`77`	`77`	`if (IsAttached)`
`78`	`78`	`{`
`79`		`- throw new InvalidOperationException("Hook is already attached.");`
	`79`	`+ throw new InvalidOperationException(Rubberduck.UI.RubberduckUI.CommonHotkey_HookAttached);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`var hookId = (IntPtr)Kernel32.GlobalAddAtom(Guid.NewGuid().ToString());`
`83`	`83`	`var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);`
`84`	`84`	`if (!success)`
`85`	`85`	`{`
`86`		`- Debug.WriteLine("Hotkey ({0}) not registered.", key);`
`87`		`- //throw new Win32Exception("HotKey was not registered.");`
	`86`	`+ Debug.WriteLine(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);`
	`87`	`+ //throw new Win32Exception(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`HotkeyInfo = new HotkeyInfo(hookId, Combo);`
`91`	`91`	`IsAttached = true;`
`92`		`- Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());`
	`92`	`+ Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType()); //no translation needed for Debug.Writeline`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private static readonly IDictionary<char,uint> Modifiers = new Dictionary<char, uint>`