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

docs: Add missing space in “emoji set”.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-09-08 12:21:51 -07:00
committed by Tim Abbott
parent 1fc801a43f
commit 1376feda93
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/emojisets.js
View File

@@ -16,7 +16,7 @@ const emojisets = new Map([
["twitter", {css: twitter_css, sheet: twitter_sheet}], ["twitter", {css: twitter_css, sheet: twitter_sheet}],
]); ]);
// For `text` emojiset we fallback to `google-blob` emojiset // For `text` emoji set we fallback to `google-blob` emoji set
// for displaying emojis in emoji picker and typeahead. // for displaying emojis in emoji picker and typeahead.
emojisets.set("text", emojisets.get("google-blob")); emojisets.set("text", emojisets.get("google-blob"));

4
static/js/settings_display.js
View File

@@ -194,7 +194,7 @@ export async function report_emojiset_change() {
if (spinner.length) { if (spinner.length) {
loading.destroy_indicator(spinner); loading.destroy_indicator(spinner);
ui_report.success( ui_report.success(
$t_html({defaultMessage: "Emojiset changed successfully!"}), $t_html({defaultMessage: "Emoji set changed successfully!"}),
spinner.expectOne(), spinner.expectOne(),
); );
spinner.expectOne(); spinner.expectOne();
@@ -213,7 +213,7 @@ export function update_page() {
container.find(".setting_color_scheme").val(JSON.stringify(user_settings.color_scheme)); container.find(".setting_color_scheme").val(JSON.stringify(user_settings.color_scheme));
container.find(".setting_default_view").val(user_settings.default_view); container.find(".setting_default_view").val(user_settings.default_view);
// TODO: Set emojiset selector here. // TODO: Set emoji set selector here.
// Longer term, we'll want to automate this function // Longer term, we'll want to automate this function
} }

12
tools/setup/emoji/build_emoji
View File

@@ -248,10 +248,10 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
emojiset: str, emoji_data: List[Dict[str, Any]], alt_name: Optional[str] = None emojiset: str, emoji_data: List[Dict[str, Any]], alt_name: Optional[str] = None
) -> None: ) -> None:
# `alt_name` is an optional parameter that we use to avoid duplicating below # `alt_name` is an optional parameter that we use to avoid duplicating below
# code. It is only used while setting up google-blob emojiset as it is just # code. It is only used while setting up google-blob emoji set as it is just
# a wrapper for an older version of emoji-datasource package due to which we # a wrapper for an older version of emoji-datasource package due to which we
# need to use 'google' at some places in this code. It has no meaning for other # need to use 'google' at some places in this code. It has no meaning for other
# emojisets and is just equivalent to `emojiset`. # emoji sets and is just equivalent to `emojiset`.
alt_name = alt_name or emojiset alt_name = alt_name or emojiset
# Copy individual emoji images from npm packages. # Copy individual emoji images from npm packages.
@@ -274,7 +274,7 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
for f in os.listdir(zulip_image): for f in os.listdir(zulip_image):
shutil.copy2(os.path.join(zulip_image, f), target_emoji_farm, follow_symlinks=False) shutil.copy2(os.path.join(zulip_image, f), target_emoji_farm, follow_symlinks=False)
# We hardcode octopus emoji image to Google emojiset's old # We hardcode octopus emoji image to Google emoji set's old
# "cute octopus" image. Copy it to the emoji farms. # "cute octopus" image. Copy it to the emoji farms.
input_img_file = os.path.join(EMOJI_SCRIPT_DIR_PATH, "1f419.png") input_img_file = os.path.join(EMOJI_SCRIPT_DIR_PATH, "1f419.png")
output_img_file = os.path.join(cache_path, "images-" + emojiset + "-64", "1f419.png") output_img_file = os.path.join(cache_path, "images-" + emojiset + "-64", "1f419.png")
@@ -282,11 +282,11 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
generate_sprite_css_files(cache_path, emoji_data, emojiset, alt_name) generate_sprite_css_files(cache_path, emoji_data, emojiset, alt_name)
# Set up standard emojisets. # Set up standard emoji sets.
for emojiset in ["google", "twitter"]: for emojiset in ["google", "twitter"]:
setup_emoji_farm(emojiset, emoji_data) setup_emoji_farm(emojiset, emoji_data)
# Set up old Google "blobs" emojiset. # Set up old Google "blobs" emoji set.
GOOGLE_BLOB_EMOJI_DATA_PATH = os.path.join( GOOGLE_BLOB_EMOJI_DATA_PATH = os.path.join(
NODE_MODULES_PATH, "emoji-datasource-google-blob", "emoji.json" NODE_MODULES_PATH, "emoji-datasource-google-blob", "emoji.json"
) )
@@ -355,7 +355,7 @@ def dump_emojis(cache_path: str) -> None:
emoji_map = orjson.loads(emoji_map_file.read()) emoji_map = orjson.loads(emoji_map_file.read())
# `emoji.json` or any other data file can be sourced from any of the supported # `emoji.json` or any other data file can be sourced from any of the supported
# emojiset packages, they all contain the same data files. # emoji set packages, they all contain the same data files.
EMOJI_DATA_FILE_PATH = os.path.join(NODE_MODULES_PATH, "emoji-datasource-google", "emoji.json") EMOJI_DATA_FILE_PATH = os.path.join(NODE_MODULES_PATH, "emoji-datasource-google", "emoji.json")
with open(EMOJI_DATA_FILE_PATH, "rb") as emoji_data_file: with open(EMOJI_DATA_FILE_PATH, "rb") as emoji_data_file:
emoji_data = orjson.loads(emoji_data_file.read()) emoji_data = orjson.loads(emoji_data_file.read())

2
tools/setup/emoji/emoji_setup_utils.py
View File

@@ -3,7 +3,7 @@
from collections import defaultdict from collections import defaultdict
from typing import Any, Dict, List from typing import Any, Dict, List
# Emojisets that we currently support. # Emoji sets that we currently support.
EMOJISETS = ["google", "twitter"] EMOJISETS = ["google", "twitter"]
# Some image files in the old emoji farm had a different name than in the new emoji # Some image files in the old emoji farm had a different name than in the new emoji

2
zerver/migrations/0130_text_choice_in_emojiset.py
View File

@@ -3,7 +3,7 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps from django.db.migrations.state import StateApps
# change emojiset to text if emoji_alt_code is true. # change emoji set to text if emoji_alt_code is true.
def change_emojiset(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None: def change_emojiset(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
UserProfile = apps.get_model("zerver", "UserProfile") UserProfile = apps.get_model("zerver", "UserProfile")
for user in UserProfile.objects.filter(emoji_alt_code=True): for user in UserProfile.objects.filter(emoji_alt_code=True):

2
zerver/models.py
View File

@@ -1310,7 +1310,7 @@ class UserBaseSettings(models.Model):
default=DEMOTE_STREAMS_AUTOMATIC default=DEMOTE_STREAMS_AUTOMATIC
) )
# Emojisets # Emoji sets
GOOGLE_EMOJISET = "google" GOOGLE_EMOJISET = "google"
GOOGLE_BLOB_EMOJISET = "google-blob" GOOGLE_BLOB_EMOJISET = "google-blob"
TEXT_EMOJISET = "text" TEXT_EMOJISET = "text"

2
zerver/openapi/python_examples.py
View File

@@ -1178,7 +1178,7 @@ def get_server_settings(client: Client) -> None:
def update_settings(client: Client) -> None: def update_settings(client: Client) -> None:
# {code_example|start} # {code_example|start}
# Enable push notifications even when online and change emojiset # Enable push notifications even when online and change emoji set
request = { request = {
"enable_offline_push_notifications": True, "enable_offline_push_notifications": True,
"enable_online_push_notifications": True, "enable_online_push_notifications": True,

30
zerver/openapi/zulip.yaml
View File

@@ -9261,11 +9261,11 @@ paths:
for configuring notification sounds. for configuring notification sounds.
emojiset_choices: emojiset_choices:
description: | description: |
Array of dictionaries where each dictionary describes an emojiset Array of dictionaries where each dictionary describes an emoji set
supported by this version of the Zulip server. supported by this version of the Zulip server.
Only relevant to clients with configuration UI for choosing an emojiset; Only relevant to clients with configuration UI for choosing an emoji set;
the currently selected emojiset is available in the `emojiset` key. the currently selected emoji set is available in the `emojiset` key.
See [PATCH /settings](/api/update-settings) for details on See [PATCH /settings](/api/update-settings) for details on
the meaning of this setting. the meaning of this setting.
@@ -9273,18 +9273,18 @@ paths:
items: items:
type: object type: object
description: | description: |
Object describing a emojiset. Object describing a emoji set.
additionalProperties: false additionalProperties: false
properties: properties:
key: key:
type: string type: string
description: | description: |
The key or the name of the emojiset which will be the value The key or the name of the emoji set which will be the value
of `emojiset` if this emojiset is chosen. of `emojiset` if this emoji set is chosen.
text: text:
type: string type: string
description: | description: |
The text describing the emojiset. The text describing the emoji set.
has_zoom_token: has_zoom_token:
type: boolean type: boolean
description: | description: |
@@ -9698,7 +9698,7 @@ paths:
and only for clients that did not include `user_settings_object` in and only for clients that did not include `user_settings_object` in
their client_capabilities` when registering the event queue. their client_capabilities` when registering the event queue.
The name of the emojiset that the user has chosen. The name of the emoji set that the user has chosen.
See [PATCH /settings](/api/update-settings) for details on See [PATCH /settings](/api/update-settings) for details on
the meaning of this setting. the meaning of this setting.
@@ -9867,11 +9867,11 @@ paths:
and only for clients that did not include `user_settings_object` in and only for clients that did not include `user_settings_object` in
their client_capabilities` when registering the event queue. their client_capabilities` when registering the event queue.
Array of dictionaries where each dictionary describes an emojiset Array of dictionaries where each dictionary describes an emoji set
supported by this version of the Zulip server. supported by this version of the Zulip server.
Only relevant to clients with configuration UI for choosing an emojiset; Only relevant to clients with configuration UI for choosing an emoji set;
the currently selected emojiset is available in the `emojiset` key. the currently selected emoji set is available in the `emojiset` key.
See [PATCH /settings](/api/update-settings) for details on See [PATCH /settings](/api/update-settings) for details on
the meaning of this setting. the meaning of this setting.
@@ -9883,18 +9883,18 @@ paths:
items: items:
type: object type: object
description: | description: |
Object describing a emojiset. Object describing a emoji set.
additionalProperties: false additionalProperties: false
properties: properties:
key: key:
type: string type: string
description: | description: |
The key or the name of the emojiset which will be the value The key or the name of the emoji set which will be the value
of `emojiset` if this emojiset is chosen. of `emojiset` if this emoji set is chosen.
text: text:
type: string type: string
description: | description: |
The text describing the emojiset. The text describing the emoji set.
realm_add_custom_emoji_policy: realm_add_custom_emoji_policy:
type: integer type: integer
description: | description: |

2
zerver/tests/test_settings.py
View File

@@ -360,7 +360,7 @@ class ChangeSettingsTest(ZulipTestCase):
return result return result
def test_emojiset(self) -> None: def test_emojiset(self) -> None:
"""Test banned emojisets are not accepted.""" """Test banned emoji sets are not accepted."""
banned_emojisets = ["apple", "emojione"] banned_emojisets = ["apple", "emojione"]
valid_emojisets = ["google", "google-blob", "text", "twitter"] valid_emojisets = ["google", "google-blob", "text", "twitter"]