From 721b4e83733b0e5f569737cb1469deb1526b9af8 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Wed, 4 Apr 2018 11:16:56 -0700
Subject: [PATCH] i18n: Fix strings for wildcard mentions.

First, "Notify stream" is a lot clearer than "Notify everyone";
second, these strings should be tagged for translation.
---
 frontend_tests/node_tests/composebox_typeahead.js | 9 +++++----
 static/js/composebox_typeahead.js                 | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend_tests/node_tests/composebox_typeahead.js b/frontend_tests/node_tests/composebox_typeahead.js
index 5cc548138a..d5aef12494 100644
--- a/frontend_tests/node_tests/composebox_typeahead.js
+++ b/frontend_tests/node_tests/composebox_typeahead.js
@@ -1,3 +1,4 @@
+set_global('i18n', global.stub_i18n);
 zrequire('compose_state');
 zrequire('ui_util');
 zrequire('pm_conversations');
@@ -894,13 +895,13 @@ user_pill.get_user_ids = function () {
 
     var all_items = [
         {
-            special_item_text: 'all (Notify everyone)',
+            special_item_text: 'translated: all (Notify stream)',
             email: 'all',
             pm_recipient_count: Infinity,
             full_name: 'all',
         },
         {
-            special_item_text: 'everyone (Notify everyone)',
+            special_item_text: 'translated: everyone (Notify stream)',
             email: 'everyone',
             pm_recipient_count: Infinity,
             full_name: 'everyone',
@@ -1092,13 +1093,13 @@ user_pill.get_user_ids = function () {
 (function test_typeahead_results() {
     var all_items = [
         {
-            special_item_text: 'all (Notify everyone)',
+            special_item_text: 'all (translated: Notify stream)',
             email: 'all',
             pm_recipient_count: Infinity,
             full_name: 'all',
         },
         {
-            special_item_text: 'everyone (Notify everyone)',
+            special_item_text: 'everyone (translated: Notify stream)',
             email: 'everyone',
             pm_recipient_count: Infinity,
             full_name: 'everyone',
diff --git a/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js
index 2a23da3e55..f31d0e3b7b 100644
--- a/static/js/composebox_typeahead.js
+++ b/static/js/composebox_typeahead.js
@@ -375,7 +375,8 @@ exports.compose_content_begins_typeahead = function (query) {
         this.completing = 'mention';
         this.token = current_token;
         var all_item = {
-            special_item_text: "all (Notify everyone)",
+            special_item_text: i18n.t("__wildcard_mention_token__ (Notify stream)",
+                                      {wildcard_mention_token: "all"}),
             email: "all",
             // Always sort above, under the assumption that names will
             // be longer and only contain "all" as a substring.
@@ -383,7 +384,8 @@ exports.compose_content_begins_typeahead = function (query) {
             full_name: "all",
         };
         var everyone_item = {
-            special_item_text: "everyone (Notify everyone)",
+            special_item_text: i18n.t("__wildcard_mention_token__ (Notify stream)",
+                                      {wildcard_mention_token: "everyone"}),
             email: "everyone",
             pm_recipient_count: Infinity,
             full_name: "everyone",