Better key equivalent handling on non-ASCII keyboard layouts.

See #60 for a discussion. In short, keyCodeStringForKeyEquivalent
should be now correct even with non-ASCII keyboard layouts such as
Russian.

2 files changed, 6 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 2031116..5231f01 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Not released yet:
+    - Better key equivalent handling for non-ASCII layouts.
+      [Dmitry Obukhov]
+
 2.1.1 2015/1/16
     - Another headerdoc fix for CocoaDocs, hopefully the last one.
 
diff --git a/Framework/MASShortcut.m b/Framework/MASShortcut.m
index e6fa63d..ef3385d 100644
--- a/Framework/MASShortcut.m
+++ b/Framework/MASShortcut.m
@@ -139,10 +139,10 @@ static NSString *const MASShortcutModifierFlags = @"ModifierFlags";
         case 115: return NSStringFromMASKeyCode(kMASShortcutGlyphNorthwestArrow);
     }
     
-    // Everything else should be printable so look it up in the current keyboard
+    // Everything else should be printable so look it up in the current ASCII capable keyboard layout
     OSStatus error = noErr;
     NSString *keystroke = nil;
-    TISInputSourceRef inputSource = TISCopyCurrentKeyboardLayoutInputSource();
+    TISInputSourceRef inputSource = TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
     if (inputSource) {
         CFDataRef layoutDataRef = TISGetInputSourceProperty(inputSource, kTISPropertyUnicodeKeyLayoutData);
         if (layoutDataRef) {