Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-17555 Finish upgrading react-intl #4615

Merged
merged 16 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update most snapshots that just rename injectIntl
  • Loading branch information
hmhealey committed Jan 9, 2020
commit 212c11389c017d2e5196d259149566f48d32fb90
2 changes: 1 addition & 1 deletion components/__snapshots__/profile_picture.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exports[`components/ProfilePicture should match snapshot, profile and src, defau
<OverlayTrigger
defaultOverlayShown={false}
overlay={
<Connect(InjectIntl(ProfilePopover))
<Connect(injectIntl(ProfilePopover))
className="user-profile-popover"
hasMention={false}
hide={[Function]}
Expand Down
4 changes: 2 additions & 2 deletions components/__snapshots__/setting_picture.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
className="setting-list-item padding-top x2"
id="setting-picture__helptext"
>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Upload a team icon in BMP, JPG or PNG format.\\\\nSquare images with a solid background color are recommended."
id="setting_picture.help.team"
/>
Expand Down Expand Up @@ -801,7 +801,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
className="setting-list-item padding-top x2"
id="setting-picture__helptext"
>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Upload a team icon in BMP, JPG or PNG format.\\\\nSquare images with a solid background color are recommended."
id="setting_picture.help.team"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ exports[`components/AboutBuildModal should match snapshot for enterprise edition
className="about-modal__notice form-group padding-top x2"
>
<p>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Mattermost is made possible by the open source software used in our [server](!https://about.mattermost.com/platform-notice-txt/), [desktop](!https://about.mattermost.com/desktop-notice-txt/) and [mobile](!https://about.mattermost.com/mobile-notice-txt/) apps."
id="about.notice"
/>
Expand Down Expand Up @@ -443,7 +443,7 @@ exports[`components/AboutBuildModal should match snapshot for team edition 1`] =
className="about-modal__notice form-group padding-top x2"
>
<p>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Mattermost is made possible by the open source software used in our [server](!https://about.mattermost.com/platform-notice-txt/), [desktop](!https://about.mattermost.com/desktop-notice-txt/) and [mobile](!https://about.mattermost.com/mobile-notice-txt/) apps."
id="about.notice"
/>
Expand Down Expand Up @@ -694,7 +694,7 @@ exports[`components/AboutBuildModal should show ci if a ci build 1`] = `
className="about-modal__notice form-group padding-top x2"
>
<p>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Mattermost is made possible by the open source software used in our [server](!https://about.mattermost.com/platform-notice-txt/), [desktop](!https://about.mattermost.com/desktop-notice-txt/) and [mobile](!https://about.mattermost.com/mobile-notice-txt/) apps."
id="about.notice"
/>
Expand Down Expand Up @@ -933,7 +933,7 @@ exports[`components/AboutBuildModal should show dev if this is a dev build 1`] =
className="about-modal__notice form-group padding-top x2"
>
<p>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Mattermost is made possible by the open source software used in our [server](!https://about.mattermost.com/platform-notice-txt/), [desktop](!https://about.mattermost.com/desktop-notice-txt/) and [mobile](!https://about.mattermost.com/mobile-notice-txt/) apps."
id="about.notice"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ exports[`components/AccessHistoryModal should match snapshot when audits exist 1
bsClass="modal-body"
componentClass="div"
>
<Connect(InjectIntl(AuditTable))
<Connect(injectIntl(AuditTable))
audits={
Array [
"audit1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`components/AdminConsole should generate the routes 1`] = `
>
<Connect(AnnouncementBarController) />
<Connect(SystemNotice) />
<Connect(InjectIntl(AdminSidebar))
<Connect(injectIntl(AdminSidebar))
onFilterChange={[Function]}
/>
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`components/AdminConsole/CustomEnableDisableGuestAccountsSetting initial
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, external guest can be invited to channels within teams. Please see [Permissions Schemes](../user_management/permissions/system_scheme) for which roles can invite guests."
id="admin.guest_access.enableDescription"
/>
Expand Down Expand Up @@ -79,7 +79,7 @@ exports[`components/AdminConsole/CustomEnableDisableGuestAccountsSetting initial
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, external guest can be invited to channels within teams. Please see [Permissions Schemes](../user_management/permissions/system_scheme) for which roles can invite guests."
id="admin.guest_access.enableDescription"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
<div
className="job-table-setting"
>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Index Now"
Expand Down Expand Up @@ -721,7 +721,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
<div
className="job-table-setting"
>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Index Now"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, Mattermost will export all messages that were posted in the last 24 hours. The export task is scheduled to run once per day. See [the documentation](!https://about.mattermost.com/default-compliance-export-documentation) to learn more."
id="admin.service.complianceExportDesc"
/>
Expand Down Expand Up @@ -60,6 +60,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
<FormattedHTMLMessage
defaultMessage="Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM."
id="admin.complianceExport.exportJobStartTime.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -79,7 +80,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
<DropdownSetting
disabled={true}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Format of the compliance export. Corresponds to the system that you want to import the data into.\\\\n \\\\nFor Actiance XML, compliance export files are written to the \\\\\\"exports\\\\\\" subdirectory of the configured [Local Storage Directory]({siteURL}/admin_console/environment/file_storage). For Global Relay EML, they are emailed to the configured email address."
id="admin.complianceExport.exportFormat.description"
values={
Expand Down Expand Up @@ -118,7 +119,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
]
}
/>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Run Compliance Export Job Now"
Expand Down Expand Up @@ -213,7 +214,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, Mattermost will export all messages that were posted in the last 24 hours. The export task is scheduled to run once per day. See [the documentation](!https://about.mattermost.com/default-compliance-export-documentation) to learn more."
id="admin.service.complianceExportDesc"
/>
Expand Down Expand Up @@ -243,6 +244,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
<FormattedHTMLMessage
defaultMessage="Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM."
id="admin.complianceExport.exportJobStartTime.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -262,7 +264,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
<DropdownSetting
disabled={true}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Format of the compliance export. Corresponds to the system that you want to import the data into.\\\\n \\\\nFor Actiance XML, compliance export files are written to the \\\\\\"exports\\\\\\" subdirectory of the configured [Local Storage Directory]({siteURL}/admin_console/environment/file_storage). For Global Relay EML, they are emailed to the configured email address."
id="admin.complianceExport.exportFormat.description"
values={
Expand Down Expand Up @@ -389,6 +391,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
<FormattedHTMLMessage
defaultMessage="The email address that your GlobalRelay server monitors for incoming Compliance Exports."
id="admin.complianceExport.globalRelayEmailAddress.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -406,7 +409,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
value="[email protected]"
/>
</SettingsGroup>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Run Compliance Export Job Now"
Expand Down Expand Up @@ -501,7 +504,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, Mattermost will export all messages that were posted in the last 24 hours. The export task is scheduled to run once per day. See [the documentation](!https://about.mattermost.com/default-compliance-export-documentation) to learn more."
id="admin.service.complianceExportDesc"
/>
Expand Down Expand Up @@ -531,6 +534,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
<FormattedHTMLMessage
defaultMessage="Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM."
id="admin.complianceExport.exportJobStartTime.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -550,7 +554,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
<DropdownSetting
disabled={false}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Format of the compliance export. Corresponds to the system that you want to import the data into.\\\\n \\\\nFor Actiance XML, compliance export files are written to the \\\\\\"exports\\\\\\" subdirectory of the configured [Local Storage Directory]({siteURL}/admin_console/environment/file_storage). For Global Relay EML, they are emailed to the configured email address."
id="admin.complianceExport.exportFormat.description"
values={
Expand Down Expand Up @@ -589,7 +593,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
]
}
/>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Run Compliance Export Job Now"
Expand Down Expand Up @@ -684,7 +688,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
/>
}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="When true, Mattermost will export all messages that were posted in the last 24 hours. The export task is scheduled to run once per day. See [the documentation](!https://about.mattermost.com/default-compliance-export-documentation) to learn more."
id="admin.service.complianceExportDesc"
/>
Expand Down Expand Up @@ -714,6 +718,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
<FormattedHTMLMessage
defaultMessage="Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM."
id="admin.complianceExport.exportJobStartTime.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -733,7 +738,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
<DropdownSetting
disabled={false}
helpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Format of the compliance export. Corresponds to the system that you want to import the data into.\\\\n \\\\nFor Actiance XML, compliance export files are written to the \\\\\\"exports\\\\\\" subdirectory of the configured [Local Storage Directory]({siteURL}/admin_console/environment/file_storage). For Global Relay EML, they are emailed to the configured email address."
id="admin.complianceExport.exportFormat.description"
values={
Expand Down Expand Up @@ -860,6 +865,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
<FormattedHTMLMessage
defaultMessage="The email address that your GlobalRelay server monitors for incoming Compliance Exports."
id="admin.complianceExport.globalRelayEmailAddress.description"
tagName="span"
values={Object {}}
/>
}
Expand All @@ -877,7 +883,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
value="[email protected]"
/>
</SettingsGroup>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Run Compliance Export Job Now"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
setSaveNeeded={[Function]}
unRegisterSaveAction={[Function]}
/>
<Connect(InjectIntl(JobTable))
<Connect(injectIntl(JobTable))
createJobButtonText={
<FormattedMessage
defaultMessage="Setting Twelve"
Expand All @@ -605,7 +605,7 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
/>
}
createJobHelpText={
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="This is some help text for the jobs table field."
id="help-text-l"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`SchemaText should render plain text correctly 1`] = `
`;

exports[`SchemaText should render translated markdown text correctly 1`] = `
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="This is [{object}](https://example.com)"
id="help.text.markdown"
values={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports[`components/admin_console/group_settings/GroupSettings should match snap
<div
className="banner__content"
>
<InjectIntl(FormattedMarkdownMessage)
<injectIntl(FormattedMarkdownMessage)
defaultMessage="Groups are a way to organize users and apply actions to all users within that group.
For more information on Groups, please see [documentation](!https://www.mattermost.com/default-ad-ldap-groups)."
id="admin.group_settings.introBanner"
Expand Down
Loading