addressed CR comments

components/announcement_bar/configuration_bar/configuration_bar.jsx

@@ -10,6 +10,8 @@ import {isLicenseExpired, isLicenseExpiring, isLicensePastGracePeriod} from 'uti
 import {AnnouncementBarTypes, AnnouncementBarMessages, WarnMetricTypes} from 'utils/constants';
 import {intlShape} from 'utils/react_intl';
 
+import {t} from 'utils/i18n';
+
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
 import AnnouncementBar from '../default_announcement_bar';
@@ -75,7 +77,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  <FormattedMarkdownMessage
  id={'announcement_bar.error.number_active_users_warn_metric_status_ack.text'}
- defaultMessage={'Your trial has started! Go to the [System Console](/admin_console/environment/web_server) to check out the new features.'}
+ defaultMessage='Your trial has started! Go to the [System Console](/admin_console/environment/web_server) to check out the new features.'
  />
  </React.Fragment>
  );
@@ -88,7 +90,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  <FormattedMessage
  id={'announcement_bar.warn_metric_status_ack.text'}
- defaultMessage={'Thank you for contacting Mattermost. We will follow up with you soon.'}
+ defaultMessage='Thank you for contacting Mattermost. We will follow up with you soon.'
  />
  </React.Fragment>
  );
@@ -109,7 +111,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  <FormattedMarkdownMessage
  id={'announcement_bar.error.number_active_users_warn_metric_status.text'}
- defaultMessage={'You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'}
+ defaultMessage='You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'
  values={{
  limit: warnMetricStatus.limit,
  }}
@@ -125,7 +127,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  <FormattedMarkdownMessage
  id={'announcement_bar.number_of_posts_warn_metric_status.text'}
- defaultMessage={'You now have over {limit} posts. We strongly recommend using advanced features for large-scale servers.'}
+ defaultMessage='You now have over {limit} posts. We strongly recommend using advanced features for large-scale servers.'
  values={{
  limit: warnMetricStatus.limit,
  }}
@@ -226,7 +228,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  handleClose={notice.DismissFunc}
  type={notice.Type}
  showModal={notice.ShowModal}
- modalButtonText={'announcement_bar.error.warn_metric_status.link'}
+ modalButtonText={t('announcement_bar.error.warn_metric_status.link')}
  modalButtonDefaultText='Learn more'
  warnMetricStatus={status}
  message={notice.Message}
@@ -274,10 +276,10 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  let id;
  let defaultMessage;
  if (this.props.config.EnableSignUpWithGitLab === 'true') {
- id = 'announcement_bar.error.site_url_gitlab.full';
+ id = t('announcement_bar.error.site_url_gitlab.full');
  defaultMessage = 'Please configure your [site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) either on the [System Console](/admin_console/environment/web_server) or, if you\'re using GitLab Mattermost, in gitlab.rb.';
  } else {
- id = 'announcement_bar.error.site_url.full';
+ id = t('announcement_bar.error.site_url.full');
  defaultMessage = 'Please configure your [site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) on the [System Console](/admin_console/environment/web_server).';
  }
 

components/warn_metric_ack_modal/warn_metric_ack_modal.tsx

@@ -11,6 +11,7 @@ import {AnalyticsRow} from 'mattermost-redux/types/admin';
 import {ActionFunc} from 'mattermost-redux/types/actions';
 
 import {getSiteURL} from 'utils/url';
+import {t} from 'utils/i18n';
 import {Constants, ModalIdentifiers, WarnMetricTypes} from 'utils/constants';
 
 import {trackEvent} from 'actions/diagnostics_actions';
@@ -163,9 +164,9 @@ export default class WarnMetricAckModal extends React.PureComponent<Props, State
  link: (
  <WarnMetricAckErrorLink
  url={mailToLinkText}
- messageId={'warn_metric_ack_modal.mailto.link'}
+ messageId={t('warn_metric_ack_modal.mailto.link')}
  forceAck={true}
- defaultMessage={'email us'}
+ defaultMessage='Email us'
  onClickHandler={this.onContactUsClick}
  />
  ),
@@ -232,7 +233,7 @@ export default class WarnMetricAckModal extends React.PureComponent<Props, State
  link: (
  <ErrorLink
  url={learnMoreLink}
- messageId={'warn_metric_ack_modal.learn_more.link'}
+ messageId={t('warn_metric_ack_modal.learn_more.link')}
  defaultMessage='Learn more'
  />
  ),
@@ -262,7 +263,7 @@ export default class WarnMetricAckModal extends React.PureComponent<Props, State
  link: (
  <ErrorLink
  url={learnMoreLink}
- messageId={'warn_metric_ack_modal.learn_more.link'}
+ messageId={t('warn_metric_ack_modal.learn_more.link')}
  defaultMessage='Learn more'
  />
  ),

i18n/en.json

@@ -4123,7 +4123,7 @@
  "warn_metric_ack_modal.error.body": "Please try again or visit https://mattermost.com/trial to request a license.",
  "warn_metric_ack_modal.header.title": "Scaling with Mattermost",
  "warn_metric_ack_modal.learn_more.link": "Learn more",
- "warn_metric_ack_modal.mailto.link": "email us",
+ "warn_metric_ack_modal.mailto.link": "Email us",
  "warn_metric_ack_modal.mailto.message": "Support could not be reached. Please {link}.",
  "warn_metric_ack_modal.number_of_active_users.description": "Mattermost strongly recommends that deployments of over {limit} users take advantage of features such as user management, server clustering and performance monitoring. Contact us to learn more and let us know how we can help.",
  "warn_metric_ack_modal.number_of_active_users.subtext": "By clicking Acknowledge, you will be sharing your information with Mattermost Inc., to learn more about upgrading. {link}",