From bb8b9c4f20799e3f2dd427bf044675173699e775 Mon Sep 17 00:00:00 2001 From: zubiden <19638254+zubiden@users.noreply.github.com> Date: Fri, 7 Mar 2025 15:16:56 +0100 Subject: [PATCH] Safe Link Modal: Make url bold (#5711) --- src/assets/localization/fallback.strings | 3 ++- src/components/main/SafeLinkModal.tsx | 10 +++++----- src/types/language.d.ts | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/assets/localization/fallback.strings b/src/assets/localization/fallback.strings index f68818f36..712e8a67c 100644 --- a/src/assets/localization/fallback.strings +++ b/src/assets/localization/fallback.strings @@ -580,7 +580,8 @@ "AboutPremiumDescription" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further."; "AboutPremiumDescription2" = "**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone."; "OpenUrlTitle" = "Open Link"; -"OpenUrlAlert2" = "Do you want to open {url}?"; +"OpenUrlText" = "Do you want to open **{url}**?"; +"OpenUrlConfirm" = "Open"; "ConversationOpenBotLinkLogin" = "Log in to **{url}** as {user}"; "ConversationOpenBotLinkAllowMessages" = "Allow **{bot}** to send me messages"; "BotWebViewOpenBot" = "Open Bot"; diff --git a/src/components/main/SafeLinkModal.tsx b/src/components/main/SafeLinkModal.tsx index 58d3b202d..0d6578fbb 100644 --- a/src/components/main/SafeLinkModal.tsx +++ b/src/components/main/SafeLinkModal.tsx @@ -6,7 +6,7 @@ import { ensureProtocol } from '../../util/browser/url'; import renderText from '../common/helpers/renderText'; import useCurrentOrPrev from '../../hooks/useCurrentOrPrev'; -import useOldLang from '../../hooks/useOldLang'; +import useLang from '../../hooks/useLang'; import ConfirmDialog from '../ui/ConfirmDialog'; @@ -17,14 +17,14 @@ export type OwnProps = { const SafeLinkModal: FC = ({ url }) => { const { toggleSafeLinkModal } = getActions(); - const lang = useOldLang(); + const lang = useLang(); const handleOpen = useCallback(() => { if (!url) { return; } - window.open(ensureProtocol(url), '_blank', 'noopener'); + window.open(ensureProtocol(url), '_blank', 'noopener noreferrer'); toggleSafeLinkModal({ url: undefined }); }, [toggleSafeLinkModal, url]); @@ -39,8 +39,8 @@ const SafeLinkModal: FC = ({ url }) => { isOpen={Boolean(url)} onClose={handleDismiss} title={lang('OpenUrlTitle')} - textParts={renderText(lang('OpenUrlAlert2', renderingUrl))} - confirmLabel={lang('OpenUrlTitle')} + textParts={renderText(lang('OpenUrlText', { url: renderingUrl }, { withNodes: true, withMarkdown: true }))} + confirmLabel={lang('OpenUrlConfirm')} confirmHandler={handleOpen} /> ); diff --git a/src/types/language.d.ts b/src/types/language.d.ts index ab14df7da..0bd3f8e88 100644 --- a/src/types/language.d.ts +++ b/src/types/language.d.ts @@ -516,6 +516,7 @@ export interface LangPair { 'AboutPremiumDescription': undefined; 'AboutPremiumDescription2': undefined; 'OpenUrlTitle': undefined; + 'OpenUrlConfirm': undefined; 'BotWebViewOpenBot': undefined; 'WebAppReloadPage': undefined; 'WebAppRemoveBot': undefined; @@ -1540,7 +1541,7 @@ export interface LangPairWithVariables { 'TelegramPremiumUserDialogTitle': { 'user': V; }; - 'OpenUrlAlert2': { + 'OpenUrlText': { 'url': V; }; 'ConversationOpenBotLinkLogin': {