Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

message_list: Convert bookend_content messages to FormatJS. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-04-12 16:47:27 -07:00 committed by Tim Abbott
parent a70061d91f
commit 70bf9914b2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/message_list.js
View File

@ -2,7 +2,7 @@ import autosize from "autosize";
import $ from "jquery"; import $ from "jquery";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import {i18n} from "./i18n"; import {$t} from "./i18n";
import {MessageListData} from "./message_list_data"; import {MessageListData} from "./message_list_data";
import {MessageListView} from "./message_list_view"; import {MessageListView} from "./message_list_view";
import * as narrow_banner from "./narrow_banner"; import * as narrow_banner from "./narrow_banner";
@ -232,19 +232,22 @@ export class MessageList {
} }
subscribed_bookend_content(stream_name) { subscribed_bookend_content(stream_name) {
return i18n.t("You subscribed to stream __stream__", {stream: stream_name}); return $t({defaultMessage: "You subscribed to stream {stream}"}, {stream: stream_name});
} }
unsubscribed_bookend_content(stream_name) { unsubscribed_bookend_content(stream_name) {
return i18n.t("You unsubscribed from stream __stream__", {stream: stream_name}); return $t({defaultMessage: "You unsubscribed from stream {stream}"}, {stream: stream_name});
} }
not_subscribed_bookend_content(stream_name) { not_subscribed_bookend_content(stream_name) {
return i18n.t("You are not subscribed to stream __stream__", {stream: stream_name}); return $t(
{defaultMessage: "You are not subscribed to stream {stream}"},
{stream: stream_name},
);
} }
deactivated_bookend_content() { deactivated_bookend_content() {
return i18n.t("This stream has been deactivated"); return $t({defaultMessage: "This stream has been deactivated"});
} }
// Maintains a trailing bookend element explaining any changes in // Maintains a trailing bookend element explaining any changes in

2
static/templates/bookend.hbs
View File

@ -2,7 +2,7 @@
{{#if bookend_content}} {{#if bookend_content}}
<div class="{{#if trailing}}trailing_bookend{{/if}} bookend sub-unsub-message"> <div class="{{#if trailing}}trailing_bookend{{/if}} bookend sub-unsub-message">
<span>{{{bookend_content}}}</span> <span>{{bookend_content}}</span>
{{#if trailing}} {{#if trailing}}
<div class="sub_button_row new-style"> <div class="sub_button_row new-style">
<button class="button white rounded stream_sub_unsub_button {{#unless subscribed}}sea-green{{/unless}}" type="button" name="subscription"> <button class="button white rounded stream_sub_unsub_button {{#unless subscribed}}sea-green{{/unless}}" type="button" name="subscription">