Skip to content

Commit 2e908b1

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. The string needs to be re-translated in other languages, as the placeholder is now different. See also: zulip#1148 (comment) Signed-off-by: Zixuan James Li <[email protected]>
1 parent 1fd7d8a commit 2e908b1

12 files changed

+20
-49
lines changed

assets/l10n/app_en.arb

+2-3
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,11 @@
340340
"@composeBoxSelfDmContentHint": {
341341
"description": "Hint text for content input when sending a message to yourself."
342342
},
343-
"composeBoxChannelContentHint": "Message #{channel} > {topic}",
343+
"composeBoxChannelContentHint": "Message {destination}",
344344
"@composeBoxChannelContentHint": {
345345
"description": "Hint text for content input when sending a message to a channel",
346346
"placeholders": {
347-
"channel": {"type": "String", "example": "channel name"},
348-
"topic": {"type": "String", "example": "topic name"}
347+
"destination": {"type": "String", "example": "#channel name > topic name"}
349348
}
350349
},
351350
"composeBoxSendTooltip": "Send",

assets/l10n/app_pl.arb

-14
Original file line numberDiff line numberDiff line change
@@ -263,20 +263,6 @@
263263
"@composeBoxSelfDmContentHint": {
264264
"description": "Hint text for content input when sending a message to yourself."
265265
},
266-
"composeBoxChannelContentHint": "Wiadomość #{channel} > {topic}",
267-
"@composeBoxChannelContentHint": {
268-
"description": "Hint text for content input when sending a message to a channel",
269-
"placeholders": {
270-
"channel": {
271-
"type": "String",
272-
"example": "channel name"
273-
},
274-
"topic": {
275-
"type": "String",
276-
"example": "topic name"
277-
}
278-
}
279-
},
280266
"composeBoxUnknownChannelName": "(nieznany kanał)",
281267
"@composeBoxUnknownChannelName": {
282268
"description": "Replacement name for channel when it cannot be found in the store."

assets/l10n/app_ru.arb

-14
Original file line numberDiff line numberDiff line change
@@ -373,20 +373,6 @@
373373
"@composeBoxGenericContentHint": {
374374
"description": "Hint text for content input when sending a message."
375375
},
376-
"composeBoxChannelContentHint": "Сообщение для #{channel} > {topic}",
377-
"@composeBoxChannelContentHint": {
378-
"description": "Hint text for content input when sending a message to a channel",
379-
"placeholders": {
380-
"channel": {
381-
"type": "String",
382-
"example": "channel name"
383-
},
384-
"topic": {
385-
"type": "String",
386-
"example": "topic name"
387-
}
388-
}
389-
},
390376
"composeBoxSendTooltip": "Отправить",
391377
"@composeBoxSendTooltip": {
392378
"description": "Tooltip for send button in compose box."

lib/generated/l10n/zulip_localizations.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ abstract class ZulipLocalizations {
564564
/// Hint text for content input when sending a message to a channel
565565
///
566566
/// In en, this message translates to:
567-
/// **'Message #{channel} > {topic}'**
568-
String composeBoxChannelContentHint(String channel, String topic);
567+
/// **'Message {destination}'**
568+
String composeBoxChannelContentHint(String destination);
569569

570570
/// Tooltip for send button in compose box.
571571
///

lib/generated/l10n/zulip_localizations_ar.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Jot down something';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Message #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_en.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Jot down something';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Message #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_ja.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Jot down something';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Message #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_nb.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Jot down something';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Message #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_pl.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Zanotuj coś na przyszłość';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Wiadomość #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_ru.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Сделать заметку';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Сообщение для #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/generated/l10n/zulip_localizations_sk.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
271271
String get composeBoxSelfDmContentHint => 'Jot down something';
272272

273273
@override
274-
String composeBoxChannelContentHint(String channel, String topic) {
275-
return 'Message #$channel > $topic';
274+
String composeBoxChannelContentHint(String destination) {
275+
return 'Message $destination';
276276
}
277277

278278
@override

lib/widgets/compose_box.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ class _StreamContentInputState extends State<_StreamContentInput> {
589589
destination: TopicNarrow(widget.narrow.streamId, topic),
590590
controller: widget.controller,
591591
hint: Text(zulipLocalizations.composeBoxChannelContentHint(
592-
streamName, topic.displayName)));
592+
'#$streamName > ${topic.displayName}')));
593593
}
594594
}
595595

@@ -648,7 +648,7 @@ class _FixedDestinationContentInput extends StatelessWidget {
648648
final streamName = store.streams[streamId]?.name
649649
?? zulipLocalizations.unknownChannelName;
650650
return Text(zulipLocalizations.composeBoxChannelContentHint(
651-
streamName, topic.displayName));
651+
'#$streamName > ${topic.displayName}'));
652652

653653
case DmNarrow(otherRecipientIds: []): // The self-1:1 thread.
654654
return Text(zulipLocalizations.composeBoxSelfDmContentHint);

0 commit comments

Comments
 (0)