Skip to content

Commit 5d243af

Browse files
committed
compose: Avoid translating Zulip message destinations
The '#channel > topic' style strings are not supposed to be translated into different languages as they are Zulip's language of expressing the desintation, not something bound to the English language. See also: zulip#1148 (comment) Signed-off-by: Zixuan James Li <[email protected]>
1 parent 92f38cb commit 5d243af

10 files changed

+20
-21
lines changed

Diff for: assets/l10n/app_en.arb

+2-3
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,11 @@
355355
"channel": {"type": "String", "example": "channel name"}
356356
}
357357
},
358-
"composeBoxChannelTopicContentHint": "Message #{channel} > {topic}",
358+
"composeBoxChannelTopicContentHint": "Message {destination}",
359359
"@composeBoxChannelTopicContentHint": {
360360
"description": "Hint text for content input when sending a message to a topic in a channel",
361361
"placeholders": {
362-
"channel": {"type": "String", "example": "channel name"},
363-
"topic": {"type": "String", "example": "topic name"}
362+
"destination": {"type": "String", "example": "#channel name > topic name"}
364363
}
365364
},
366365
"composeBoxSendTooltip": "Send",

Diff for: lib/generated/l10n/zulip_localizations.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ abstract class ZulipLocalizations {
576576
/// Hint text for content input when sending a message to a topic in a channel
577577
///
578578
/// In en, this message translates to:
579-
/// **'Message #{channel} > {topic}'**
580-
String composeBoxChannelTopicContentHint(String channel, String topic);
579+
/// **'Message {destination}'**
580+
String composeBoxChannelTopicContentHint(String destination);
581581

582582
/// Tooltip for send button in compose box.
583583
///

Diff for: lib/generated/l10n/zulip_localizations_ar.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_en.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_ja.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_nb.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_pl.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_ru.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/generated/l10n/zulip_localizations_sk.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
281281
}
282282

283283
@override
284-
String composeBoxChannelTopicContentHint(String channel, String topic) {
285-
return 'Message #$channel > $topic';
284+
String composeBoxChannelTopicContentHint(String destination) {
285+
return 'Message $destination';
286286
}
287287

288288
@override

Diff for: lib/widgets/compose_box.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ class _StreamContentInputState extends State<_StreamContentInput> {
591591
&& widget.controller.topic.isTopicEmpty
592592
? zulipLocalizations.composeBoxChannelContentHint(streamName)
593593
: zulipLocalizations.composeBoxChannelTopicContentHint(
594-
streamName, topic.displayName));
594+
'#$streamName > ${topic.displayName}'));
595595
}
596596
}
597597

@@ -650,7 +650,7 @@ class _FixedDestinationContentInput extends StatelessWidget {
650650
final streamName = store.streams[streamId]?.name
651651
?? zulipLocalizations.unknownChannelName;
652652
return zulipLocalizations.composeBoxChannelTopicContentHint(
653-
streamName, topic.displayName);
653+
'#$streamName > ${topic.displayName}');
654654

655655
case DmNarrow(otherRecipientIds: []): // The self-1:1 thread.
656656
return zulipLocalizations.composeBoxSelfDmContentHint;

0 commit comments

Comments
 (0)