diff options
Diffstat (limited to 'webapp/components')
6 files changed, 30 insertions, 23 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 3966f0219..4fcfe2731 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -323,6 +323,25 @@ export default class AdminSidebar extends React.Component { ); } + let otherCategory = null; + if (license || audits) { + otherCategory = ( + <AdminSidebarCategory + parentLink='/admin_console' + icon='fa-wrench' + title={ + <FormattedMessage + id='admin.sidebar.other' + defaultMessage='OTHER' + /> + } + > + {license} + {audits} + </AdminSidebarCategory> + ); + } + return ( <div className='admin-sidebar'> <AdminSidebarHeader/> @@ -347,7 +366,6 @@ export default class AdminSidebar extends React.Component { /> } /> - {audits} <AdminSidebarSection name='logs' title={ @@ -675,18 +693,7 @@ export default class AdminSidebar extends React.Component { </AdminSidebarSection> </AdminSidebarCategory> {this.renderTeams()} - <AdminSidebarCategory - parentLink='/admin_console' - icon='fa-wrench' - title={ - <FormattedMessage - id='admin.sidebar.other' - defaultMessage='OTHER' - /> - } - > - {license} - </AdminSidebarCategory> + {otherCategory} </ul> </div> <SelectTeamModal diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index ad7d2159f..92663ece8 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -393,7 +393,7 @@ export default class OAuthSettings extends AdminSettings { helpText = ( <FormattedHTMLMessage id='admin.office365.EnableHtmlDesc' - defaultMessage='<ol><li><a href="https://login.microsoftonline.com/">Log in</a> to your Microsoft or Office 365 account. Make sure its the account on the same <a href="https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0">tenant</a> that you would like users to log in with.</li><li>Go to <a href="https://apps.dev.microsoft.com">https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use "Mattermost - your-company-name" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>' + defaultMessage='<ol><li><a href="https://login.microsoftonline.com/">Log in</a> to your Microsoft or Office 365 account. Make sure it`s the account on the same <a href="https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0">tenant</a> that you would like users to log in with.</li><li>Go to <a href="https://apps.dev.microsoft.com">https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use "Mattermost - your-company-name" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>' /> ); } diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 609a15d73..65c856b4a 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -224,7 +224,7 @@ export default class ChannelHeader extends React.Component { } render() { - const flagIcon = Constants.FLAG_ICON_OUTLINE_SVG; + const flagIcon = Constants.FLAG_ICON_SVG; if (!this.validState()) { return null; diff --git a/webapp/components/integrations/components/add_command.jsx b/webapp/components/integrations/components/add_command.jsx index cf1824145..300e55a70 100644 --- a/webapp/components/integrations/components/add_command.jsx +++ b/webapp/components/integrations/components/add_command.jsx @@ -552,8 +552,8 @@ export default class AddCommand extends React.Component { htmlFor='autocomplete' > <FormattedMessage - id='add_command.iconUrl' - defaultMessage='Response Icon' + id='add_command.autocomplete' + defaultMessage='Autocomplete' /> </label> <div className='col-md-5 col-sm-8 checkbox'> diff --git a/webapp/components/rhs_header_post.jsx b/webapp/components/rhs_header_post.jsx index 7b71bd7cc..978c58c85 100644 --- a/webapp/components/rhs_header_post.jsx +++ b/webapp/components/rhs_header_post.jsx @@ -57,7 +57,7 @@ export default class RhsHeaderPost extends React.Component { const closeSidebarTooltip = ( <Tooltip id='closeSidebarTooltip'> <FormattedMessage - id='rhs_header.closeTooltip' + id='rhs_header.closeSidebarTooltip' defaultMessage='Close Sidebar' /> </Tooltip> @@ -87,7 +87,7 @@ export default class RhsHeaderPost extends React.Component { const expandSidebarTooltip = ( <Tooltip id='expandSidebarTooltip'> <FormattedMessage - id='rhs_header.expandTooltip' + id='rhs_header.expandSidebarTooltip' defaultMessage='Expand Sidebar' /> </Tooltip> @@ -96,7 +96,7 @@ export default class RhsHeaderPost extends React.Component { const shrinkSidebarTooltip = ( <Tooltip id='shrinkSidebarTooltip'> <FormattedMessage - id='rhs_header.expandTooltip' + id='rhs_header.shrinkSidebarTooltip' defaultMessage='Shrink Sidebar' /> </Tooltip> diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index 336e614f9..e0e3bf979 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -393,7 +393,7 @@ class NotificationsTab extends React.Component { return ( <SettingItemMin - title={Utils.localizeMessage('user.settings.notification.push', 'Mobile push notifications')} + title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')} describe={describe} updateSection={handleUpdateDesktopSection} /> @@ -430,7 +430,7 @@ class NotificationsTab extends React.Component { onChange={this.handleNotifyRadio.bind(this, 'all')} /> <FormattedMessage - id='user.settings.notification.allActivity' + id='user.settings.notifications.allActivity' defaultMessage='For all activity' /> </label> @@ -596,7 +596,7 @@ class NotificationsTab extends React.Component { if (!this.state.soundNeeded) { describe = ( <FormattedMessage - id='user.settings.notification.soundConfig' + id='user.settings.notifications.soundConfig' defaultMessage='Please configure notification sounds in your browser settings' /> ); |