paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

notifications: Convert capitalization-exempt messages to FormatJS.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-04-12 21:51:07 -07:00
committed by Tim Abbott
parent 7974007fa6
commit 24646907dc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
static/js/notifications.js
View File

@@ -7,7 +7,7 @@ import * as alert_words from "./alert_words";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import * as channel from "./channel"; import * as channel from "./channel";
import * as favicon from "./favicon"; import * as favicon from "./favicon";
import {i18n} from "./i18n"; import {$t, i18n} from "./i18n";
import * as message_lists from "./message_lists"; import * as message_lists from "./message_lists";
import * as message_store from "./message_store"; import * as message_store from "./message_store";
import * as muting from "./muting"; import * as muting from "./muting";
@@ -509,14 +509,18 @@ function get_message_header(message) {
return message.stream + " > " + message.topic; return message.stream + " > " + message.topic;
} }
if (message.display_recipient.length > 2) { if (message.display_recipient.length > 2) {
return i18n.t("group private messages with __- recipient__", { return $t(
recipient: message.display_reply_to, {defaultMessage: "group private messages with {recipient}"},
}); {recipient: message.display_reply_to},
);
} }
if (people.is_current_user(message.reply_to)) { if (people.is_current_user(message.reply_to)) {
return i18n.t("private messages with yourself"); return i18n.t("private messages with yourself");
} }
return i18n.t("private messages with __- recipient__", {recipient: message.display_reply_to}); return $t(
{defaultMessage: "private messages with {recipient}"},
{recipient: message.display_reply_to},
);
} }
export function get_local_notify_mix_reason(message) { export function get_local_notify_mix_reason(message) {

4
tools/lib/capitalization.py
View File

@@ -140,8 +140,8 @@ IGNORED_PHRASES = [
r"\bN\b", r"\bN\b",
# Capital c feels obtrusive in clear status option # Capital c feels obtrusive in clear status option
r"clear", r"clear",
r"group private messages with __- recipient__", r"group private messages with {recipient}",
r"private messages with __- recipient__", r"private messages with {recipient}",
r"private messages with yourself", r"private messages with yourself",
# TO CLEAN UP # TO CLEAN UP
# Just want to avoid churning login.html right now # Just want to avoid churning login.html right now