diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-11-28 22:32:27 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-28 14:32:27 +0100 |
commit | 2b3b44ebbcd07ac0841d3d9d5d6d551d088edc6b (patch) | |
tree | 8f9a408f0f834e26886fdadcdbf6104da8eb444a /app/javascript/mastodon/features/keyboard_shortcuts | |
parent | 1b57d4dd3a64cdafd74a12ff67502795b06a4eb2 (diff) |
Refactor KeyboardShortcuts component (#5835)
Diffstat (limited to 'app/javascript/mastodon/features/keyboard_shortcuts')
-rw-r--r-- | app/javascript/mastodon/features/keyboard_shortcuts/index.js | 94 |
1 files changed, 61 insertions, 33 deletions
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js index 00771b79c..8ab85dde9 100644 --- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js +++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js @@ -1,28 +1,11 @@ import React from 'react'; import Column from '../ui/components/column'; -import { defineMessages, injectIntl } from 'react-intl'; +import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; const messages = defineMessages({ heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' }, - hotkey: { id: 'keyboard_shortcuts.hotkey', defaultMessage: 'Hotkey' }, - description: { id: 'keyboard_shortcuts.description', defaultMessage: 'Description' }, - reply: { id: 'keyboard_shortcuts.reply', defaultMessage: 'to reply' }, - mention: { id: 'keyboard_shortcuts.mention', defaultMessage: 'to mention author' }, - favourite: { id: 'keyboard_shortcuts.favourite', defaultMessage: 'to favourite' }, - boost: { id: 'keyboard_shortcuts.boost', defaultMessage: 'to boost' }, - enter: { id: 'keyboard_shortcuts.enter', defaultMessage: 'to open status' }, - profile: { id: 'keyboard_shortcuts.profile', defaultMessage: 'to open author\'s profile' }, - up: { id: 'keyboard_shortcuts.up', defaultMessage: 'to move up in the list' }, - down: { id: 'keyboard_shortcuts.down', defaultMessage: 'to move down in the list' }, - column: { id: 'keyboard_shortcuts.column', defaultMessage: 'to focus a status in one of the columns' }, - compose: { id: 'keyboard_shortcuts.compose', defaultMessage: 'to focus the compose textarea' }, - toot: { id: 'keyboard_shortcuts.toot', defaultMessage: 'to start a brand new toot' }, - back: { id: 'keyboard_shortcuts.back', defaultMessage: 'to navigate back' }, - search: { id: 'keyboard_shortcuts.search', defaultMessage: 'to focus search' }, - unfocus: { id: 'keyboard_shortcuts.unfocus', defaultMessage: 'to un-focus compose textarea/search' }, - legend: { id: 'keyboard_shortcuts.legend', defaultMessage: 'to display this legend' }, }); @injectIntl @@ -41,23 +24,68 @@ export default class KeyboardShortcuts extends ImmutablePureComponent { <div className='keyboard-shortcuts scrollable optionally-scrollable'> <table> <thead> - <tr><th>{intl.formatMessage(messages.hotkey)}</th><th>{intl.formatMessage(messages.description)}</th></tr> + <tr> + <th><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th> + <th><FormattedMessage id='keyboard_shortcuts.description' defaultMessage='Description' /></th> + </tr> </thead> <tbody> - <tr><td><code>r</code></td><td>{intl.formatMessage(messages.reply)}</td></tr> - <tr><td><code>m</code></td><td>{intl.formatMessage(messages.mention)}</td></tr> - <tr><td><code>f</code></td><td>{intl.formatMessage(messages.favourite)}</td></tr> - <tr><td><code>b</code></td><td>{intl.formatMessage(messages.boost)}</td></tr> - <tr><td><code>enter</code></td><td>{intl.formatMessage(messages.enter)}</td></tr> - <tr><td><code>up</code></td><td>{intl.formatMessage(messages.up)}</td></tr> - <tr><td><code>down</code></td><td>{intl.formatMessage(messages.down)}</td></tr> - <tr><td><code>1</code>-<code>9</code></td><td>{intl.formatMessage(messages.column)}</td></tr> - <tr><td><code>n</code></td><td>{intl.formatMessage(messages.compose)}</td></tr> - <tr><td><code>alt</code>+<code>n</code></td><td>{intl.formatMessage(messages.toot)}</td></tr> - <tr><td><code>backspace</code></td><td>{intl.formatMessage(messages.back)}</td></tr> - <tr><td><code>s</code></td><td>{intl.formatMessage(messages.search)}</td></tr> - <tr><td><code>esc</code></td><td>{intl.formatMessage(messages.unfocus)}</td></tr> - <tr><td><code>?</code></td><td>{intl.formatMessage(messages.legend)}</td></tr> + <tr> + <td><code>r</code></td> + <td><FormattedMessage id='keyboard_shortcuts.reply' defaultMessage='to reply' /></td> + </tr> + <tr> + <td><code>m</code></td> + <td><FormattedMessage id='keyboard_shortcuts.mention' defaultMessage='to mention author' /></td> + </tr> + <tr> + <td><code>f</code></td> + <td><FormattedMessage id='keyboard_shortcuts.favourite' defaultMessage='to favourite' /></td> + </tr> + <tr> + <td><code>b</code></td> + <td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td> + </tr> + <tr> + <td><code>enter</code></td> + <td><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open status' /></td> + </tr> + <tr> + <td><code>up</code></td> + <td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td> + </tr> + <tr> + <td><code>down</code></td> + <td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td> + </tr> + <tr> + <td><code>1</code>-<code>9</code></td> + <td><FormattedMessage id='keyboard_shortcuts.column' defaultMessage='to focus a status in one of the columns' /></td> + </tr> + <tr> + <td><code>n</code></td> + <td><FormattedMessage id='keyboard_shortcuts.compose' defaultMessage='to focus the compose textarea' /></td> + </tr> + <tr> + <td><code>alt</code>+<code>n</code></td> + <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new toot' /></td> + </tr> + <tr> + <td><code>backspace</code></td> + <td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td> + </tr> + <tr> + <td><code>s</code></td> + <td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td> + </tr> + <tr> + <td><code>esc</code></td> + <td><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></td> + </tr> + <tr> + <td><code>?</code></td> + <td><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></td> + </tr> </tbody> </table> </div> |