From c321f5778597eff136f4703a69040895e71e46c7 Mon Sep 17 00:00:00 2001
From: evykassirer <evy.kassirer@gmail.com>
Date: Thu, 19 May 2022 12:37:54 -0700
Subject: [PATCH] settings: Explain that Google blob emojis are deprecated.

Part of fixing #19371.
---
 docs/subsystems/emoji.md                               | 4 ++--
 static/styles/settings.css                             | 2 +-
 static/templates/settings/display_settings.hbs         | 4 ++++
 tools/lib/capitalization.py                            | 3 +++
 zerver/migrations/0344_alter_emojiset_default_value.py | 8 ++++----
 zerver/models.py                                       | 4 ++--
 zerver/openapi/zulip.yaml                              | 4 ++--
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/docs/subsystems/emoji.md b/docs/subsystems/emoji.md
index d15a9c0a1a..4130d37221 100644
--- a/docs/subsystems/emoji.md
+++ b/docs/subsystems/emoji.md
@@ -6,10 +6,10 @@ document discusses a number of these issues.
 
 Currently, Zulip supports these four display formats for emoji:
 
-- Google modern
-- Google classic
+- Google
 - Twitter
 - Plain text
+- Google blob (deprecated)
 
 ## Emoji codes
 
diff --git a/static/styles/settings.css b/static/styles/settings.css
index b9d54762dd..90030bd068 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -961,7 +961,7 @@ input[type="checkbox"] {
 }
 
 .emojiset_choices {
-    width: 250px;
+    width: 350px;
 
     .emoji {
         height: 22px;
diff --git a/static/templates/settings/display_settings.hbs b/static/templates/settings/display_settings.hbs
index e08f0ba70e..d4cdd5e40b 100644
--- a/static/templates/settings/display_settings.hbs
+++ b/static/templates/settings/display_settings.hbs
@@ -59,6 +59,10 @@
                             <img class="emoji" src="/static/generated/emoji/images-{{this.key}}-64/1f389.png" />
                             {{/if}}
                         </span>
+                        {{#if (eq this.key "google-blob")}}
+                        <span>(<em>{{t "deprecated" }}</em>)</span>
+                        {{> ../help_link_widget link="/help/emoji-and-emoticons#change-your-emoji-set" }}
+                        {{/if}}
                     </label>
                 {{/each}}
             </div>
diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py
index 6858ce1f26..fe4d099e5e 100644
--- a/tools/lib/capitalization.py
+++ b/tools/lib/capitalization.py
@@ -32,6 +32,7 @@ IGNORED_PHRASES = [
     r"PM",
     r"PMs",
     r"Slack",
+    r"Google",
     r"Terms of Service",
     r"Tuesday",
     r"URL",
@@ -74,6 +75,8 @@ IGNORED_PHRASES = [
     # SPECIAL CASES
     # Because topics usually are lower-case, this would look weird if it were capitalized
     r"more topics",
+    # Used alone in a parenthetical where capitalized looks worse.
+    r"^deprecated$",
     # Capital 'i' looks weird in reminders popover
     r"in 1 hour",
     r"in 20 minutes",
diff --git a/zerver/migrations/0344_alter_emojiset_default_value.py b/zerver/migrations/0344_alter_emojiset_default_value.py
index 7a66a11fa6..128fe22b28 100644
--- a/zerver/migrations/0344_alter_emojiset_default_value.py
+++ b/zerver/migrations/0344_alter_emojiset_default_value.py
@@ -15,10 +15,10 @@ class Migration(migrations.Migration):
             name="emojiset",
             field=models.CharField(
                 choices=[
-                    ("google", "Google modern"),
-                    ("google-blob", "Google classic"),
+                    ("google", "Google"),
                     ("twitter", "Twitter"),
                     ("text", "Plain text"),
+                    ("google-blob", "Google blobs"),
                 ],
                 default="google",
                 max_length=20,
@@ -29,10 +29,10 @@ class Migration(migrations.Migration):
             name="emojiset",
             field=models.CharField(
                 choices=[
-                    ("google", "Google modern"),
-                    ("google-blob", "Google classic"),
+                    ("google", "Google"),
                     ("twitter", "Twitter"),
                     ("text", "Plain text"),
+                    ("google-blob", "Google blobs"),
                 ],
                 default="google",
                 max_length=20,
diff --git a/zerver/models.py b/zerver/models.py
index d751dfa031..99e7499917 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -1547,10 +1547,10 @@ class UserBaseSettings(models.Model):
     TEXT_EMOJISET = "text"
     TWITTER_EMOJISET = "twitter"
     EMOJISET_CHOICES = (
-        (GOOGLE_EMOJISET, "Google modern"),
-        (GOOGLE_BLOB_EMOJISET, "Google classic"),
+        (GOOGLE_EMOJISET, "Google"),
         (TWITTER_EMOJISET, "Twitter"),
         (TEXT_EMOJISET, "Plain text"),
+        (GOOGLE_BLOB_EMOJISET, "Google blobs"),
     )
     emojiset: str = models.CharField(
         default=GOOGLE_EMOJISET, choices=EMOJISET_CHOICES, max_length=20
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index a9523b8be4..f9e8c984e9 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -8585,10 +8585,10 @@ paths:
             The user's configured [emoji set](/help/emoji-and-emoticons#use-emoticons),
             used to display emoji to the user everywhere they appear in the UI.
 
-            - "google" - Google modern
-            - "google-blob" - Google classic
+            - "google" - Google
             - "twitter" - Twitter
             - "text" - Plain text
+            - "google-blob" - Google blobs
           schema:
             type: string
           example: "google"