Skip to content

Commit

Permalink
keys: Standardize choice of words in hotkey help texts.
Browse files Browse the repository at this point in the history
Previously, there was mixed use of "add/remove" and "toggle".
Now, all of them use "toggle".

All menus and popups now use "show/hide".

Removed the only explicit usage of 'popup', as it is redundant,
and does not add clarity.

Hotkeys document regenerated.
  • Loading branch information
Niloth-p authored and neiljp committed Jun 1, 2024
1 parent 4b697ec commit e5e9010
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions docs/hotkeys.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
|Open draft message saved in this session|<kbd>d</kbd>|
|Redraw screen|<kbd>Ctrl</kbd> + <kbd>l</kbd>|
|Quit|<kbd>Ctrl</kbd> + <kbd>c</kbd>|
|View user information (from users list)|<kbd>i</kbd>|
|Show/hide user information (from users list)|<kbd>i</kbd>|

## Navigation
|Command|Key Combination|
Expand All @@ -39,7 +39,7 @@
|Search messages|<kbd>/</kbd>|
|Search streams|<kbd>q</kbd>|
|Search topics in a stream|<kbd>q</kbd>|
|Search emojis from emoji picker popup|<kbd>p</kbd>|
|Search emojis from emoji picker|<kbd>p</kbd>|

## Message actions
|Command|Key Combination|
Expand All @@ -51,13 +51,13 @@
|Edit message's content or topic|<kbd>e</kbd>|
|New message to a stream|<kbd>c</kbd>|
|New message to a person or group of people|<kbd>x</kbd>|
|Show/hide emoji picker popup for current message|<kbd>:</kbd>|
|Show/hide emoji picker for current message|<kbd>:</kbd>|
|Narrow to the stream of the current message|<kbd>s</kbd>|
|Narrow to the topic of the current message|<kbd>S</kbd>|
|Narrow to a topic/direct-chat, or stream/all-direct-messages|<kbd>z</kbd>|
|Toggle first emoji reaction on selected message|<kbd>=</kbd>|
|Add/remove thumbs-up reaction to the current message|<kbd>+</kbd>|
|Add/remove star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
|Toggle thumbs-up reaction to the current message|<kbd>+</kbd>|
|Toggle star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
|Show/hide message information|<kbd>i</kbd>|
|Show/hide message sender information|<kbd>u</kbd>|
|Show/hide edit history (from message information)|<kbd>e</kbd>|
Expand Down
10 changes: 5 additions & 5 deletions zulipterminal/config/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class KeyBinding(TypedDict):
},
'ADD_REACTION': {
'keys': [':'],
'help_text': 'Show/hide emoji picker popup for current message',
'help_text': 'Show/hide emoji picker for current message',
'key_category': 'msg_actions',
},
'STREAM_NARROW': {
Expand Down Expand Up @@ -240,7 +240,7 @@ class KeyBinding(TypedDict):
},
'SEARCH_EMOJIS': {
'keys': ['p'],
'help_text': 'Search emojis from emoji picker popup',
'help_text': 'Search emojis from emoji picker',
'excluded_from_random_tips': True,
'key_category': 'searching',
},
Expand All @@ -256,12 +256,12 @@ class KeyBinding(TypedDict):
},
'THUMBS_UP': {
'keys': ['+'],
'help_text': 'Add/remove thumbs-up reaction to the current message',
'help_text': 'Toggle thumbs-up reaction to the current message',
'key_category': 'msg_actions',
},
'TOGGLE_STAR_STATUS': {
'keys': ['ctrl s', '*'],
'help_text': 'Add/remove star status of the current message',
'help_text': 'Toggle star status of the current message',
'key_category': 'msg_actions',
},
'MSG_INFO': {
Expand Down Expand Up @@ -317,7 +317,7 @@ class KeyBinding(TypedDict):
},
'USER_INFO': {
'keys': ['i'],
'help_text': 'View user information (from users list)',
'help_text': 'Show/hide user information (from users list)',
'key_category': 'general',
},
'BEGINNING_OF_LINE': {
Expand Down

0 comments on commit e5e9010

Please sign in to comment.