Skip to content

Commit e5e9010

Browse files
Niloth-pneiljp
authored andcommitted
keys: Standardize choice of words in hotkey help texts.
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.
1 parent 4b697ec commit e5e9010

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

docs/hotkeys.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
|Open draft message saved in this session|<kbd>d</kbd>|
1313
|Redraw screen|<kbd>Ctrl</kbd> + <kbd>l</kbd>|
1414
|Quit|<kbd>Ctrl</kbd> + <kbd>c</kbd>|
15-
|View user information (from users list)|<kbd>i</kbd>|
15+
|Show/hide user information (from users list)|<kbd>i</kbd>|
1616

1717
## Navigation
1818
|Command|Key Combination|
@@ -39,7 +39,7 @@
3939
|Search messages|<kbd>/</kbd>|
4040
|Search streams|<kbd>q</kbd>|
4141
|Search topics in a stream|<kbd>q</kbd>|
42-
|Search emojis from emoji picker popup|<kbd>p</kbd>|
42+
|Search emojis from emoji picker|<kbd>p</kbd>|
4343

4444
## Message actions
4545
|Command|Key Combination|
@@ -51,13 +51,13 @@
5151
|Edit message's content or topic|<kbd>e</kbd>|
5252
|New message to a stream|<kbd>c</kbd>|
5353
|New message to a person or group of people|<kbd>x</kbd>|
54-
|Show/hide emoji picker popup for current message|<kbd>:</kbd>|
54+
|Show/hide emoji picker for current message|<kbd>:</kbd>|
5555
|Narrow to the stream of the current message|<kbd>s</kbd>|
5656
|Narrow to the topic of the current message|<kbd>S</kbd>|
5757
|Narrow to a topic/direct-chat, or stream/all-direct-messages|<kbd>z</kbd>|
5858
|Toggle first emoji reaction on selected message|<kbd>=</kbd>|
59-
|Add/remove thumbs-up reaction to the current message|<kbd>+</kbd>|
60-
|Add/remove star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
59+
|Toggle thumbs-up reaction to the current message|<kbd>+</kbd>|
60+
|Toggle star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
6161
|Show/hide message information|<kbd>i</kbd>|
6262
|Show/hide message sender information|<kbd>u</kbd>|
6363
|Show/hide edit history (from message information)|<kbd>e</kbd>|

zulipterminal/config/keys.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class KeyBinding(TypedDict):
154154
},
155155
'ADD_REACTION': {
156156
'keys': [':'],
157-
'help_text': 'Show/hide emoji picker popup for current message',
157+
'help_text': 'Show/hide emoji picker for current message',
158158
'key_category': 'msg_actions',
159159
},
160160
'STREAM_NARROW': {
@@ -240,7 +240,7 @@ class KeyBinding(TypedDict):
240240
},
241241
'SEARCH_EMOJIS': {
242242
'keys': ['p'],
243-
'help_text': 'Search emojis from emoji picker popup',
243+
'help_text': 'Search emojis from emoji picker',
244244
'excluded_from_random_tips': True,
245245
'key_category': 'searching',
246246
},
@@ -256,12 +256,12 @@ class KeyBinding(TypedDict):
256256
},
257257
'THUMBS_UP': {
258258
'keys': ['+'],
259-
'help_text': 'Add/remove thumbs-up reaction to the current message',
259+
'help_text': 'Toggle thumbs-up reaction to the current message',
260260
'key_category': 'msg_actions',
261261
},
262262
'TOGGLE_STAR_STATUS': {
263263
'keys': ['ctrl s', '*'],
264-
'help_text': 'Add/remove star status of the current message',
264+
'help_text': 'Toggle star status of the current message',
265265
'key_category': 'msg_actions',
266266
},
267267
'MSG_INFO': {
@@ -317,7 +317,7 @@ class KeyBinding(TypedDict):
317317
},
318318
'USER_INFO': {
319319
'keys': ['i'],
320-
'help_text': 'View user information (from users list)',
320+
'help_text': 'Show/hide user information (from users list)',
321321
'key_category': 'general',
322322
},
323323
'BEGINNING_OF_LINE': {

0 commit comments

Comments
 (0)