Skip to content

Commit 98098ba

Browse files
committed
ui: Rename stream to channel in user-facing strings
Fixes: zulip#630
1 parent 53853ab commit 98098ba

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

assets/l10n/app_en.arb

+7-7
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
"@composeBoxDmContentHint": {
193193
"description": "Hint text for content input when sending a message to one other person.",
194194
"placeholders": {
195-
"user": {"type": "String", "example": "stream name"}
195+
"user": {"type": "String", "example": "channel name"}
196196
}
197197
},
198198
"composeBoxGroupDmContentHint": "Message group",
@@ -205,19 +205,19 @@
205205
},
206206
"composeBoxStreamContentHint": "Message #{stream} > {topic}",
207207
"@composeBoxStreamContentHint": {
208-
"description": "Hint text for content input when sending a message to a stream",
208+
"description": "Hint text for content input when sending a message to a channel",
209209
"placeholders": {
210-
"stream": {"type": "String", "example": "stream name"},
210+
"stream": {"type": "String", "example": "channel name"},
211211
"topic": {"type": "String", "example": "topic name"}
212212
}
213213
},
214214
"composeBoxSendTooltip": "Send",
215215
"@composeBoxSendTooltip": {
216216
"description": "Tooltip for send button in compose box."
217217
},
218-
"composeBoxUnknownStreamName": "(unknown stream)",
218+
"composeBoxUnknownStreamName": "(unknown channel)",
219219
"@composeBoxUnknownStreamName": {
220-
"description": "Replacement name for stream when it cannot be found in the store."
220+
"description": "Replacement name for channel when it cannot be found in the store."
221221
},
222222
"composeBoxTopicHintText": "Topic",
223223
"@composeBoxTopicHintText": {
@@ -344,9 +344,9 @@
344344
"@topicValidationErrorMandatoryButEmpty": {
345345
"description": "Topic validation error when topic is required but was empty."
346346
},
347-
"subscribedToNStreams": "Subscribed to {num, plural, =0{no streams} =1{1 stream} other{{num} streams}}",
347+
"subscribedToNStreams": "Subscribed to {num, plural, =0{no channels} =1{1 channel} other{{num} channels}}",
348348
"@subscribedToNStreams": {
349-
"description": "Test page label showing number of streams user is subscribed to.",
349+
"description": "Test page label showing number of channels user is subscribed to.",
350350
"placeholders": {
351351
"num": {"type": "int", "example": "4"}
352352
}

lib/notifications/display.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class NotificationDisplayManager {
9696
FcmMessageStreamRecipient(:var streamName?, :var topic) =>
9797
'$streamName > $topic',
9898
FcmMessageStreamRecipient(:var topic) =>
99-
'(unknown stream) > $topic', // TODO get stream name from data
99+
'(unknown channel) > $topic', // TODO get stream name from data
100100
FcmMessageDmRecipient(:var allRecipientIds) when allRecipientIds.length > 2 =>
101101
zulipLocalizations.notifGroupDmConversationLabel(
102102
data.senderFullName, allRecipientIds.length - 2), // TODO use others' names, from data

lib/widgets/app.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class HomePage extends StatelessWidget {
282282
ElevatedButton(
283283
onPressed: () => Navigator.push(context,
284284
SubscriptionListPage.buildRoute(context: context)),
285-
child: const Text("Subscribed streams")),
285+
child: const Text("Subscribed channels")),
286286
const SizedBox(height: 16),
287287
ElevatedButton(
288288
onPressed: () => Navigator.push(context,

lib/widgets/message_list.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ class MessageListAppBarTitle extends StatelessWidget {
148148
case StreamNarrow(:var streamId):
149149
final store = PerAccountStoreWidget.of(context);
150150
final stream = store.streams[streamId];
151-
final streamName = stream?.name ?? '(unknown stream)';
151+
final streamName = stream?.name ?? '(unknown channel)';
152152
return _buildStreamRow(stream, streamName);
153153

154154
case TopicNarrow(:var streamId, :var topic):
155155
final store = PerAccountStoreWidget.of(context);
156156
final stream = store.streams[streamId];
157-
final streamName = stream?.name ?? '(unknown stream)';
157+
final streamName = stream?.name ?? '(unknown channel)';
158158
return _buildStreamRow(stream, "$streamName > $topic");
159159

160160
case DmNarrow(:var otherRecipientIds):

lib/widgets/subscription_list.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class _SubscriptionListPageState extends State<SubscriptionListPage> with PerAcc
8181
unpinned.sortBy((subscription) => subscription.name.toLowerCase());
8282

8383
return Scaffold(
84-
appBar: AppBar(title: const Text("Streams")),
84+
appBar: AppBar(title: const Text("Channels")),
8585
body: SafeArea(
8686
// Don't pad the bottom here; we want the list content to do that.
8787
bottom: false,
@@ -115,7 +115,7 @@ class _NoSubscriptionsItem extends StatelessWidget {
115115
return SliverToBoxAdapter(
116116
child: Padding(
117117
padding: const EdgeInsets.all(10),
118-
child: Text("No streams found",
118+
child: Text("No channels found",
119119
textAlign: TextAlign.center,
120120
style: TextStyle(
121121
// TODO(#95) need dark-theme color

test/notifications/display_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void main() {
166166
final stream = eg.stream();
167167
final message = eg.streamMessage(stream: stream);
168168
await checkNotifications(async, messageFcmMessage(message, streamName: null),
169-
expectedTitle: '(unknown stream) > ${message.subject}',
169+
expectedTitle: '(unknown channel) > ${message.subject}',
170170
expectedTagComponent: 'stream:${message.streamId}:${message.subject}');
171171
}));
172172

0 commit comments

Comments
 (0)