Skip to content

Commit 2945e7a

Browse files
chore(ui): update terminology from 'stream' to 'channel'
- dynamically changing the terminology according to the feature_level in ui. - added dos for the changes. - not changed the terminologies in the code base. partially fixes #1510
1 parent 23a773c commit 2945e7a

File tree

13 files changed

+366
-314
lines changed

13 files changed

+366
-314
lines changed

Diff for: CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Zulip-terminal Changelog
22

3+
4+
5+
### Changes in the terminology from 'Stream' to 'channel'
6+
- **Terminology Update**: The term "Stream" has been replaced with "Channel" in the UI for servers supporting the updated terminology. Older servers will continue to display "Stream" to maintain consistency with the server's terminology.
7+
8+
### User Documentation Updates
9+
- Updated all references to "Stream" in the documentation to "Channel."
10+
- Added a FAQ entry to explain the terminology change and its behavior with older servers.
11+
312
## 0.7.0 - 20 May 2022
413

514
This long-awaited release includes contributions from our four 2021

Diff for: docs/FAQ.md

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- [Hotkeys don't work as described](#hotkeys-dont-work-as-described)
2323
- [Zulip-term crashed!](#zulip-term-crashed)
2424
- [Something looks wrong! Where's this feature? There's a bug!](#something-looks-wrong-wheres-this-feature-theres-a-bug)
25+
- [Why does the UI show "Channel" instead of "Stream"?](#why-does-the-ui-show-channel-instead-of-stream)
2526

2627
## What Python implementations are supported?
2728

@@ -497,3 +498,9 @@ Come meet us on the
497498
[#zulip-terminal](https://chat.zulip.org/#narrow/stream/206-zulip-terminal)
498499
stream on *chat.zulip.org*.
499500

501+
## Why does the UI show "Channel" instead of "Stream"?
502+
503+
Starting from a specific Zulip feature level, the term "Stream" has been renamed to "Channel" to align with modern terminology. If you are using an older Zulip server, the UI will still display "Stream" to match the server's terminology. This ensures consistency between the Zulip Terminal and the web or mobile apps.
504+
505+
If you encounter any issues or confusion, feel free to reach out on the [#zulip-terminal](https://chat.zulip.org/#narrow/stream/206-zulip-terminal) stream on *chat.zulip.org*.
506+

Diff for: docs/hotkeys.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
## Switching Messages View
3131
|Command|Key Combination|
3232
| :--- | :---: |
33-
|View the stream of the current message|<kbd>s</kbd>|
33+
|View the channel of the current message|<kbd>s</kbd>|
3434
|View the topic of the current message|<kbd>S</kbd>|
3535
|Zoom in/out the message's conversation context|<kbd>z</kbd>|
3636
|Switch message view to the compose box target|<kbd>Meta</kbd> + <kbd>.</kbd>|
@@ -46,8 +46,8 @@
4646
| :--- | :---: |
4747
|Search users|<kbd>w</kbd>|
4848
|Search messages|<kbd>/</kbd>|
49-
|Search streams|<kbd>q</kbd>|
50-
|Search topics in a stream|<kbd>q</kbd>|
49+
|Search channels|<kbd>q</kbd>|
50+
|Search topics in a channel|<kbd>q</kbd>|
5151
|Search emojis from emoji picker|<kbd>p</kbd>|
5252
|Submit search and browse results|<kbd>Enter</kbd>|
5353
|Clear search in current panel|<kbd>Esc</kbd>|
@@ -63,12 +63,12 @@
6363
|Show/hide message information|<kbd>i</kbd>|
6464
|Show/hide message sender information|<kbd>u</kbd>|
6565

66-
## Stream list actions
66+
## channel list actions
6767
|Command|Key Combination|
6868
| :--- | :---: |
69-
|Toggle topics in a stream|<kbd>t</kbd>|
70-
|Mute/unmute streams|<kbd>m</kbd>|
71-
|Show/hide stream information & modify settings|<kbd>i</kbd>|
69+
|Toggle topics in a channel|<kbd>t</kbd>|
70+
|Mute/unmute channels|<kbd>m</kbd>|
71+
|Show/hide channel information & modify settings|<kbd>i</kbd>|
7272

7373
## User list actions
7474
|Command|Key Combination|
@@ -84,7 +84,7 @@
8484
|Reply mentioning the sender of the current message|<kbd>@</kbd>|
8585
|Reply quoting the current message text|<kbd>></kbd>|
8686
|Reply directly to the sender of the current message|<kbd>R</kbd>|
87-
|New message to a stream|<kbd>c</kbd>|
87+
|New message to a channel|<kbd>c</kbd>|
8888
|New message to a person or group of people|<kbd>x</kbd>|
8989

9090
## Writing a message
@@ -93,7 +93,7 @@
9393
|Cycle through recipient and content boxes|<kbd>Tab</kbd>|
9494
|Send a message|<kbd>Ctrl</kbd> + <kbd>d</kbd> / <kbd>Meta</kbd> + <kbd>Enter</kbd>|
9595
|Save current message as a draft|<kbd>Meta</kbd> + <kbd>s</kbd>|
96-
|Autocomplete @mentions, #stream_names, :emoji: and topics|<kbd>Ctrl</kbd> + <kbd>f</kbd>|
96+
|Autocomplete @mentions, #channel_names, :emoji: and topics|<kbd>Ctrl</kbd> + <kbd>f</kbd>|
9797
|Cycle through autocomplete suggestions in reverse|<kbd>Ctrl</kbd> + <kbd>r</kbd>|
9898
|Exit message compose box|<kbd>Esc</kbd>|
9999
|Insert new line|<kbd>Enter</kbd>|
@@ -123,11 +123,11 @@
123123
|Delete previous character|<kbd>Ctrl</kbd> + <kbd>h</kbd>|
124124
|Swap with previous character|<kbd>Ctrl</kbd> + <kbd>t</kbd>|
125125

126-
## Stream information (press i to view info of a stream)
126+
## channel information (press i to view info of a channel)
127127
|Command|Key Combination|
128128
| :--- | :---: |
129-
|Show/hide stream members|<kbd>m</kbd>|
130-
|Copy stream email to clipboard|<kbd>c</kbd>|
129+
|Show/hide channel members|<kbd>m</kbd>|
130+
|Copy channel email to clipboard|<kbd>c</kbd>|
131131

132132
## Message information (press i to view info of a message)
133133
|Command|Key Combination|

Diff for: zulipterminal/cli/run.py

+1
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ def print_setting(setting: str, data: SettingData, suffix: str = "") -> None:
623623
**boolean_settings,
624624
debug_path=debug_path,
625625
editor_command=editor_command,
626+
626627
).main()
627628
except ServerConnectionFailure as e:
628629
# Acts as separator between logs

0 commit comments

Comments
 (0)