Accept Merge Request #11 windows 下的快捷键:(yangzhen/ot -> ot)

Merge Request: windows 下的快捷键
Created By: @杨臻

Author: hackape

app/commands/keymaps.js

@@ -1,27 +1,65 @@
 // Unavailable shortcuts: shift / ctrl + (q|n|w|t|↹)
-export default {
-  'alt+n': 'file:new_file',
-  'alt+shift+n': 'file:new_folder',
-  'cmd+s': 'file:save',
-  'cmd+ctrl+c': 'git:commit',
-  'esc': 'modal:dismiss',
-  'cmd+shift+p': 'global:command_palette',
-  'cmd+p': 'global:file_palette',
-  'cmd+alt+1': 'editor:split_pane_1',
-  'cmd+alt+shift+1': 'editor:split_pane_1',
-  'cmd+alt+2': 'editor:split_pane_vertical_2',
-  'cmd+alt+shift+2': 'editor:split_pane_horizontal_2',
-  'cmd+alt+3': 'editor:split_pane_vertical_3',
-  'cmd+alt+shift+3': 'editor:split_pane_horizontal_3',
-  'cmd+alt+4': 'editor:split_pane_vertical_4',
-  'cmd+comma': 'global:show_settings',
-  'alt+b': 'global:show_branches',
+const os = (navigator.platform.match(/mac|win|linux/i) || ['other'])[0].toLowerCase()
+export const isMac = (os === 'mac')
+
+let keymaps
+let modifierKeysMap
+if (isMac) {
+  keymaps = {
+    'alt+n': 'file:new_file',
+    'alt+shift+n': 'file:new_folder',
+    'cmd+s': 'file:save',
+    'cmd+ctrl+c': 'git:commit',
+    'esc': 'modal:dismiss',
+    'cmd+shift+p': 'global:command_palette',
+    'cmd+p': 'global:file_palette',
+    'cmd+alt+1': 'editor:split_pane_1',
+    'cmd+alt+shift+1': 'editor:split_pane_1',
+    'cmd+alt+2': 'editor:split_pane_vertical_2',
+    'cmd+alt+shift+2': 'editor:split_pane_horizontal_2',
+    'cmd+alt+3': 'editor:split_pane_vertical_3',
+    'cmd+alt+shift+3': 'editor:split_pane_horizontal_3',
+    'cmd+alt+4': 'editor:split_pane_vertical_4',
+    'cmd+comma': 'global:show_settings',
+    'alt+b': 'global:show_branches',
+  }
+  modifierKeysMap = {
+    ctrl: '⌃',
+    alt: '⌥',
+    cmd: '⌘',
+    comma: ',',
+    shift: '⇧',
+  }
+} else {
+  keymaps = {
+    'alt+n': 'file:new_file',
+    'alt+shift+n': 'file:new_folder',
+    'ctrl+s': 'file:save',
+    'ctrl+alt+c': 'git:commit',
+    'esc': 'modal:dismiss',
+    'ctrl+shift+p': 'global:command_palette',
+    'ctrl+p': 'global:file_palette',
+    'ctrl+alt+1': 'editor:split_pane_1',
+    'ctrl+alt+shift+1': 'editor:split_pane_1',
+    'ctrl+alt+2': 'editor:split_pane_vertical_2',
+    'ctrl+alt+shift+2': 'editor:split_pane_horizontal_2',
+    'ctrl+alt+3': 'editor:split_pane_vertical_3',
+    'ctrl+alt+shift+3': 'editor:split_pane_horizontal_3',
+    'ctrl+alt+4': 'editor:split_pane_vertical_4',
+    'ctrl+comma': 'global:show_settings',
+    'alt+b': 'global:show_branches',
+  }
+  modifierKeysMap = {
+    ctrl: 'Ctrl',
+    alt: 'Alt',
+    cmd: 'Cmd',
+    comma: ',',
+    shift: 'Shift',
+  }
 }
 
-export const modifierKeysMap = {
-  ctrl: '⌃',
-  alt: '⌥',
-  cmd: '⌘',
-  comma: ',',
-  shift: '⇧',
+export default keymaps
+
+export {
+  modifierKeysMap
 }

app/components/MenuBar/utils.js

@@ -1,4 +1,4 @@
-import keyMapConfig, { modifierKeysMap } from '../../commands/keymaps'
+import keyMapConfig, { modifierKeysMap, isMac } from '../../commands/keymaps'
 
 
 const findKeyByValue = value => Object
@@ -8,8 +8,14 @@ const findKeyByValue = value => Object
       return p
     }, {})[value] || ''
 
-const withModifierKeys = value => value.split('+')
+const withModifierKeys = value => {
+  if (isMac) {
+    return value.split('+')
     .map(e => modifierKeysMap[e] || e.toUpperCase()).join('')
+  }
+  return value.split('+')
+    .map(e => modifierKeysMap[e] || e.toUpperCase()).join('+')
+}
 
 
 const mapShortcutToConfig = configs => configs.map(config => ({

app/components/Panel/PanelContent.jsx

@@ -37,7 +37,7 @@ const PanelContent = ({ panel }) => {
     case 'PANEL_RIGHT':
       return (
         <SidePanelContainer side='right'>
-          <SidePanelView key='collaborate' label={{ text: 'Collaborate', icon: 'fa fa-users', weight: 1000 }} active >
+          <SidePanelView key='collaborate' label={{ text: i18n`ot.sidebarLabel`, icon: 'fa fa-users', weight: 1000 }} active >
             <Collaboration />
           </SidePanelView>
         </SidePanelContainer>

app/i18n/en_US/ot.json

@@ -9,6 +9,7 @@
    "inviteBtn": "Invite",
    "sharePlaceHolder": "username or email",
    "groupChat": "Group Chat",
+   "sidebarLabel": "Collaborate",
    "shareWS": "Share this workspace",
    "chatPlaceHolder": "Your message here (Shift + Enter for new line)"
 }

app/i18n/zh_CN/ot.json

@@ -9,6 +9,7 @@
    "inviteBtn": "邀请",
    "sharePlaceHolder": "用户名或邮箱",
    "groupChat": "聊天",
+   "sidebarLabel": "协同编辑",
    "shareWS": "分享工作区",
    "chatPlaceHolder": "请输入消息 (Shift + Enter 换行)"
 }