[MM-60856] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx' with FormattedMessage (#28724)
* fix: status errcheck issues * Update server/channels/api4/status.go Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com> * logged error message as required * [MM-60856] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx' with FormattedMessage * fixed the bug in linking landing page * changed location to landinPage --------- Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com> Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6d5b356899
Коммит
bef486ab00
@@ -6,7 +6,7 @@ import {FormattedMessage} from 'react-intl';
|
||||
|
||||
import BrowserStore from 'stores/browser_store';
|
||||
|
||||
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
|
||||
import ExternalLink from 'components/external_link';
|
||||
|
||||
import desktopImg from 'images/deep-linking/deeplinking-desktop-img.png';
|
||||
import mobileImg from 'images/deep-linking/deeplinking-mobile-img.png';
|
||||
@@ -241,11 +241,18 @@ export default class LinkingLandingPage extends PureComponent<Props, State> {
|
||||
if (this.state.redirectPage) {
|
||||
return (
|
||||
<div className='get-app__download-link'>
|
||||
<FormattedMarkdownMessage
|
||||
id='get_app.openLinkInBrowser'
|
||||
defaultMessage='Or, [open this link in your browser.](!{link})'
|
||||
<FormattedMessage
|
||||
id='getApp.downloadLinkInBrowser'
|
||||
defaultMessage='Or, <a>open this link in your browser</a>.'
|
||||
values={{
|
||||
link: this.state.location,
|
||||
a: (chunks: string) => (
|
||||
<ExternalLink
|
||||
href={this.state.location}
|
||||
location='landingPage'
|
||||
>
|
||||
{chunks}
|
||||
</ExternalLink>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -3892,7 +3892,6 @@
|
||||
"get_app.launching": "Where would you like to view this?",
|
||||
"get_app.openingLink": "Opening link in Mattermost...",
|
||||
"get_app.openingLinkWhiteLabel": "Opening link in {appName}...",
|
||||
"get_app.openLinkInBrowser": "Or, [open this link in your browser.](!{link})",
|
||||
"get_app.redirectedInMoments": "You will be redirected in a few moments.",
|
||||
"get_app.rememberMyPreference": "Remember my preference",
|
||||
"get_app.systemDialogMessage": "View in Desktop App",
|
||||
@@ -3902,6 +3901,7 @@
|
||||
"get_link.copy": "Copy Link",
|
||||
"get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
|
||||
"get_public_link_modal.title": "Copy Public Link",
|
||||
"getApp.downloadLinkInBrowser": "Or, <a>open this link in your browser</a>.",
|
||||
"gif_picker.attribution.alt": "Powered by GIPHY",
|
||||
"gif_picker.input.label": "Search for GIFs",
|
||||
"gif_picker.input.placeholder": "Search GIPHY",
|
||||
|
||||
Ссылка в новой задаче
Block a user