Skip to content

Commit

Permalink
[MM-60826] Replace FormattedMarkdownMessage in 'webapp/channels/src/c…
Browse files Browse the repository at this point in the history
…omponents/quick_switch_modal/quick_switch_modal.tsx' with FormattedMessage (mattermost#28692)
  • Loading branch information
gvarma28 authored Oct 15, 2024
1 parent 6f4b35c commit 6bae2ea
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,14 @@ exports[`components/QuickSwitchModal should match snapshot 1`] = `
className="channel-switcher__hint"
id="quickSwitchHint"
>
<FormattedMarkdownMessage
defaultMessage="Type to find a channel. Use **UP/DOWN** to browse, **ENTER** to select, **ESC** to dismiss."
id="quick_switch_modal.help_no_team"
<MemoizedFormattedMessage
defaultMessage="Type to find a channel. Use <b>UP/DOWN</b> to browse, <b>ENTER</b> to select, <b>ESC</b> to dismiss."
id="quickSwitchModal.help_no_team"
values={
Object {
"b": [Function],
}
}
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import type {Channel} from '@mattermost/types/channels';

import type {ActionResult} from 'mattermost-redux/types/actions';

import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import NoResultsIndicator from 'components/no_results_indicator/no_results_indicator';
import {NoResultsVariant} from 'components/no_results_indicator/types';
import SuggestionBox from 'components/suggestion/suggestion_box';
Expand Down Expand Up @@ -180,16 +179,19 @@ export default class QuickSwitchModal extends React.PureComponent<Props, State>
let help;
if (this.props.isMobileView) {
help = (
<FormattedMarkdownMessage
<FormattedMessage
id='quick_switch_modal.help_mobile'
defaultMessage='Type to find a channel.'
/>
);
} else {
help = (
<FormattedMarkdownMessage
id='quick_switch_modal.help_no_team'
defaultMessage='Type to find a channel. Use **UP/DOWN** to browse, **ENTER** to select, **ESC** to dismiss.'
<FormattedMessage
id='quickSwitchModal.help_no_team'
defaultMessage='Type to find a channel. Use <b>UP/DOWN</b> to browse, <b>ENTER</b> to select, <b>ESC</b> to dismiss.'
values={{
b: (chunks: string) => <b>{chunks}</b>,
}}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/channels/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4747,9 +4747,9 @@
"public_private_selector.public.description": "Anyone",
"public_private_selector.public.title": "Public",
"quick_switch_modal.help_mobile": "Type to find a channel.",
"quick_switch_modal.help_no_team": "Type to find a channel. Use **UP/DOWN** to browse, **ENTER** to select, **ESC** to dismiss.",
"quick_switch_modal.input": "quick switch input",
"quick_switch_modal.switchChannels": "Find Channels",
"quickSwitchModal.help_no_team": "Type to find a channel. Use <b>UP/DOWN</b> to browse, <b>ENTER</b> to select, <b>ESC</b> to dismiss.",
"reaction_limit_reached_modal.body": "Oops! It looks like we've hit a ceiling on emoji reactions for this message. Please contact your system administrator for any adjustments to this limit.",
"reaction_limit_reached_modal.body.admin": "Oops! It looks like we've hit a ceiling on emoji reactions for this message. We've <link>set a limit</link> to keep things running smoothly on your server. As a system administrator, you can adjust this limit from the <linkAdmin>system console</linkAdmin>.",
"reaction_limit_reached_modal.title": "You've reached the reaction limit",
Expand Down

0 comments on commit 6bae2ea

Please sign in to comment.