PLT-5873 Renamed private groups to private channels (#5924)

* PLT-5873 Renamed private groups to private channels in web app

* PLT-5873 Renamed private groups to private channels in server

2 files changed, 16 insertions, 40 deletions

diff --git a/webapp/components/analytics/system_analytics.jsx b/webapp/components/analytics/system_analytics.jsx
index bd09b8b0b..b7a10f43b 100644
--- a/webapp/components/analytics/system_analytics.jsx
+++ b/webapp/components/analytics/system_analytics.jsx
@@ -12,34 +12,11 @@ import * as AsyncClient from 'utils/async_client.jsx';
 import Constants from 'utils/constants.jsx';
 const StatTypes = Constants.StatTypes;
 
-import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl';
-
-const holders = defineMessages({
-    analyticsPublicChannels: {
-        id: 'analytics.system.publicChannels',
-        defaultMessage: 'Public Channels'
-    },
-    analyticsPrivateGroups: {
-        id: 'analytics.system.privateGroups',
-        defaultMessage: 'Private Groups'
-    },
-    analyticsFilePosts: {
-        id: 'analytics.system.totalFilePosts',
-        defaultMessage: 'Posts with Files'
-    },
-    analyticsHashtagPosts: {
-        id: 'analytics.system.totalHashtagPosts',
-        defaultMessage: 'Posts with Hashtags'
-    },
-    analyticsTextPosts: {
-        id: 'analytics.system.textPosts',
-        defaultMessage: 'Posts with Text-only'
-    }
-});
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
 
 import React from 'react';
 
-class SystemAnalytics extends React.Component {
+export default class SystemAnalytics extends React.Component {
     constructor(props) {
         super(props);
 
@@ -249,8 +226,8 @@ class SystemAnalytics extends React.Component {
                 </div>
             );
 
-            const channelTypeData = formatChannelDoughtnutData(stats[StatTypes.TOTAL_PUBLIC_CHANNELS], stats[StatTypes.TOTAL_PRIVATE_GROUPS], this.props.intl);
-            const postTypeData = formatPostDoughtnutData(stats[StatTypes.TOTAL_FILE_POSTS], stats[StatTypes.TOTAL_HASHTAG_POSTS], stats[StatTypes.TOTAL_POSTS], this.props.intl);
+            const channelTypeData = formatChannelDoughtnutData(stats[StatTypes.TOTAL_PUBLIC_CHANNELS], stats[StatTypes.TOTAL_PRIVATE_GROUPS]);
+            const postTypeData = formatPostDoughtnutData(stats[StatTypes.TOTAL_FILE_POSTS], stats[StatTypes.TOTAL_HASHTAG_POSTS], stats[StatTypes.TOTAL_POSTS]);
 
             let postTypeGraph;
             if (stats[StatTypes.TOTAL_POSTS] !== -1) {
@@ -430,16 +407,12 @@ class SystemAnalytics extends React.Component {
     }
 }
 
-SystemAnalytics.propTypes = {
-    intl: intlShape.isRequired
-};
-
-export default injectIntl(SystemAnalytics);
-
-export function formatChannelDoughtnutData(totalPublic, totalPrivate, intl) {
-    const {formatMessage} = intl;
+export function formatChannelDoughtnutData(totalPublic, totalPrivate) {
     const channelTypeData = {
-        labels: [formatMessage(holders.analyticsPublicChannels), formatMessage(holders.analyticsPrivateGroups)],
+        labels: [
+            Utils.localizeMessage('analytics.system.publicChannels', 'Public Channels'),
+            Utils.localizeMessage('analytics.system.privateGroups', 'Private Channels')
+        ],
         datasets: [{
             data: [totalPublic, totalPrivate],
             backgroundColor: ['#46BFBD', '#FDB45C'],
@@ -450,10 +423,13 @@ export function formatChannelDoughtnutData(totalPublic, totalPrivate, intl) {
     return channelTypeData;
 }
 
-export function formatPostDoughtnutData(filePosts, hashtagPosts, totalPosts, intl) {
-    const {formatMessage} = intl;
+export function formatPostDoughtnutData(filePosts, hashtagPosts, totalPosts) {
     const postTypeData = {
-        labels: [formatMessage(holders.analyticsFilePosts), formatMessage(holders.analyticsHashtagPosts), formatMessage(holders.analyticsTextPosts)],
+        labels: [
+            Utils.localizeMessage('analytics.system.totalFilePosts', 'Posts with Files'),
+            Utils.localizeMessage('analytics.system.totalHashtagPosts', 'Posts with Hashtags'),
+            Utils.localizeMessage('analytics.system.textPosts', 'Posts with Text-only')
+        ],
         datasets: [{
             data: [filePosts, hashtagPosts, (totalPosts - filePosts - hashtagPosts)],
             backgroundColor: ['#46BFBD', '#F7464A', '#FDB45C'],
diff --git a/webapp/components/analytics/team_analytics.jsx b/webapp/components/analytics/team_analytics.jsx
index 135bab4b4..cc179a370 100644
--- a/webapp/components/analytics/team_analytics.jsx
+++ b/webapp/components/analytics/team_analytics.jsx
@@ -270,7 +270,7 @@ export default class TeamAnalytics extends React.Component {
                         title={
                             <FormattedMessage
                                 id='analytics.team.privateGroups'
-                                defaultMessage='Private Groups'
+                                defaultMessage='Private Channels'
                             />
                         }
                         icon='fa-globe'