From fa50f68ec53992a76fcf7d08e4dc3c545c63da9c Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Wed, 15 Aug 2018 15:05:25 -0700 Subject: [PATCH] settings: Rename emoji settings. --- static/js/settings.js | 4 ++-- templates/zerver/help/display-emoji-as-text.md | 2 +- templates/zerver/help/enable-emoticon-translations.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/settings.js b/static/js/settings.js index 60168262c4..98db30989f 100644 --- a/static/js/settings.js +++ b/static/js/settings.js @@ -111,8 +111,8 @@ function setup_settings_label() { left_side_userlist: i18n.t("User list on left sidebar in narrow windows"), night_mode: i18n.t("Night mode"), twenty_four_hour_time: i18n.t("24-hour time (17:00 instead of 5:00 PM)"), - translate_emoji_to_text: i18n.t("Translate emoji to text (Convert 😃 to :smile:)"), - translate_emoticons: i18n.t("Translate emoticons (convert :) to 😃 in messages)"), + translate_emoji_to_text: i18n.t("View emoji as text (see :smile: when others write 😃)"), + translate_emoticons: i18n.t("Convert emoticons before sending (:) becomes 😃)"), }; } diff --git a/templates/zerver/help/display-emoji-as-text.md b/templates/zerver/help/display-emoji-as-text.md index 70abd654bf..cf37471a3a 100644 --- a/templates/zerver/help/display-emoji-as-text.md +++ b/templates/zerver/help/display-emoji-as-text.md @@ -7,4 +7,4 @@ For example, when a heart emoji is displayed as text, it looks like {settings_tab|display-settings} -2. Under **Emoji settings**, select **Translate emoji to text**. +2. Under **Emoji settings**, select **View emoji as text**. diff --git a/templates/zerver/help/enable-emoticon-translations.md b/templates/zerver/help/enable-emoticon-translations.md index 4f2a104045..d56867c297 100644 --- a/templates/zerver/help/enable-emoticon-translations.md +++ b/templates/zerver/help/enable-emoticon-translations.md @@ -18,7 +18,7 @@ automatically by Zulip. {settings_tab|display-settings} 2. Select the option labeled - **Translate emoticons (convert `:)` to 😃 in messages)**. + **Convert emoticons before sending**. ## Current emoticon conversions