From 481fb8e51870c2e3fcee583eed4dc42fa29b3054 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Fri, 2 Aug 2024 18:02:35 +0200 Subject: [PATCH] help: Rename and redirect allow-image-link-previews article. Note that the link in zulip_update_announcements.py is not updated so that the content in the source code reflects what users actually received in the update announcement message. --- api_docs/message-formatting.md | 4 ++-- help/animated-gifs-from-giphy.md | 2 +- ...nk-previews.md => image-video-and-website-previews.md} | 0 help/include/sidebar_index.md | 2 +- help/manage-your-uploaded-files.md | 2 +- help/share-and-upload-files.md | 2 +- help/view-images-and-videos.md | 6 +++--- web/templates/settings/organization_settings_admin.hbs | 4 ++-- zerver/lib/url_redirects.py | 1 + zerver/openapi/zulip.yaml | 8 ++++---- 10 files changed, 16 insertions(+), 15 deletions(-) rename help/{allow-image-link-previews.md => image-video-and-website-previews.md} (100%) diff --git a/api_docs/message-formatting.md b/api_docs/message-formatting.md index 4bdd815110..238173c8cc 100644 --- a/api_docs/message-formatting.md +++ b/api_docs/message-formatting.md @@ -91,8 +91,7 @@ previews: - Animated images will have a `data-animated` attribute on the `img` tag. As detailed in `server_thumbnail_formats`, both animated and still images are available for clients to use, depending on their - preference. See, for example, the [web - setting](/help/allow-image-link-previews#configure-how-animated-images-are-played) + preference. See, for example, the [web setting][help-previews] to control whether animated images are autoplayed in the message feed. - Clients should not assume that the requested format is the format @@ -150,3 +149,4 @@ inconsistent syntax, were removed. [help-global-time]: /help/global-times [help-mentions]: /help/mention-a-user-or-group [help-mention-all]: /help/mention-a-user-or-group#mention-everyone-on-a-channel +[help-previews]: /help/image-video-and-website-previews#configure-how-animated-images-are-played diff --git a/help/animated-gifs-from-giphy.md b/help/animated-gifs-from-giphy.md index c9adf38287..0de7aede8e 100644 --- a/help/animated-gifs-from-giphy.md +++ b/help/animated-gifs-from-giphy.md @@ -32,7 +32,7 @@ message](/help/preview-your-message-before-sending) before sending to see what the message will look like. Note that some organizations disable [previews of linked -images](/help/allow-image-link-previews). +images](/help/image-video-and-website-previews). ## Restrict maximum rating of GIFs retrieved from GIPHY diff --git a/help/allow-image-link-previews.md b/help/image-video-and-website-previews.md similarity index 100% rename from help/allow-image-link-previews.md rename to help/image-video-and-website-previews.md diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 123a7ed735..d18e18cb8f 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -224,7 +224,7 @@ * [Restrict moving messages](/help/restrict-moving-messages) * [Restrict message editing](/help/restrict-message-editing-and-deletion) * [Disable message edit history](/help/disable-message-edit-history) -* [Image, video and website previews](/help/allow-image-link-previews) +* [Image, video and website previews](/help/image-video-and-website-previews) * [Hide message content in emails](/help/hide-message-content-in-emails) * [Message retention policy](/help/message-retention-policy) * [Weekly digest emails](/help/digest-emails) diff --git a/help/manage-your-uploaded-files.md b/help/manage-your-uploaded-files.md index 13dbd8e2a7..ea5b45c272 100644 --- a/help/manage-your-uploaded-files.md +++ b/help/manage-your-uploaded-files.md @@ -64,4 +64,4 @@ You can sort your uploaded files by name, upload date, message ID, and size. * [Share and upload files](/help/share-and-upload-files) * [View images and videos](/help/view-images-and-videos) -* [Image, video and website previews](/help/allow-image-link-previews) +* [Image, video and website previews](/help/image-video-and-website-previews) diff --git a/help/share-and-upload-files.md b/help/share-and-upload-files.md index 29552c71cf..e0e4ca5c30 100644 --- a/help/share-and-upload-files.md +++ b/help/share-and-upload-files.md @@ -126,5 +126,5 @@ This limit can be changed by the server administrator. * [Manage your uploaded files](/help/manage-your-uploaded-files) * [View images and videos](/help/view-images-and-videos) -* [Image, video and website previews](/help/allow-image-link-previews) +* [Image, video and website previews](/help/image-video-and-website-previews) * [Animated GIFs](/help/animated-gifs-from-giphy) diff --git a/help/view-images-and-videos.md b/help/view-images-and-videos.md index c7140064be..8be5bd7169 100644 --- a/help/view-images-and-videos.md +++ b/help/view-images-and-videos.md @@ -1,8 +1,8 @@ # View images and videos Zulip shows previews of attached images and videos, unless previews are -[disabled](/help/allow-image-link-previews) in your organization. You -can click on a preview to view an image in more detail, or to play a +[disabled](/help/image-video-and-website-previews) in your organization. +You can click on a preview to view an image in more detail, or to play a video. Zulip also makes it convenient to browse all images and videos attached to messages in your current view. @@ -135,4 +135,4 @@ images and videos in messages matching that search. * [Manage your uploaded files](/help/manage-your-uploaded-files) * [Share and upload files](/help/share-and-upload-files) -* [Image, video and website previews](/help/allow-image-link-previews) +* [Image, video and website previews](/help/image-video-and-website-previews) diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbs index f540fe0265..374fd8d7d1 100644 --- a/web/templates/settings/organization_settings_admin.hbs +++ b/web/templates/settings/organization_settings_admin.hbs @@ -184,7 +184,7 @@ prefix="id_" is_checked=realm_inline_image_preview label=admin_settings_label.realm_inline_image_preview - help_link="/help/allow-image-link-previews"}} + help_link="/help/image-video-and-website-previews"}} {{/if}} {{#if server_inline_url_embed_preview}} @@ -193,7 +193,7 @@ prefix="id_" is_checked=realm_inline_url_embed_preview label=admin_settings_label.realm_inline_url_embed_preview - help_link="/help/allow-image-link-previews"}} + help_link="/help/image-video-and-website-previews"}} {{/if}} diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index de1a292e31..abfa8299bd 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -125,6 +125,7 @@ HELP_DOCUMENTATION_REDIRECTS: list[URLRedirect] = [ "/help/browse-and-subscribe-to-channels", "/help/introduction-to-channels#browse-and-subscribe-to-channels", ), + URLRedirect("/help/allow-image-link-previews", "/help/image-video-and-website-previews"), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 8243b1628a..4d418dcafb 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -4432,12 +4432,12 @@ paths: type: boolean description: | Whether this organization has been configured to enable - [previews of linked images](/help/allow-image-link-previews). + [previews of linked images](/help/image-video-and-website-previews). inline_url_embed_preview: type: boolean description: | Whether this organization has been configured to enable - [previews of linked websites](/help/allow-image-link-previews). + [previews of linked websites](/help/image-video-and-website-previews). invite_required: type: boolean description: | @@ -15790,14 +15790,14 @@ paths: Present if `realm` is present in `fetch_event_types`. Whether this organization has been configured to enable - [previews of linked images](/help/allow-image-link-previews). + [previews of linked images](/help/image-video-and-website-previews). realm_inline_url_embed_preview: type: boolean description: | Present if `realm` is present in `fetch_event_types`. Whether this organization has been configured to enable - [previews of linked websites](/help/allow-image-link-previews). + [previews of linked websites](/help/image-video-and-website-previews). realm_mandatory_topics: type: boolean description: |