Fix messages to markdown style (mattermost#1824)

aprvsh · Oct 4, 2018 · 227b67e · 227b67e
1 parent 13a3fb8
commit 227b67e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/components/announcement_bar/announcement_bar.jsx b/components/announcement_bar/announcement_bar.jsx
@@ -342,9 +342,9 @@ export default class AnnouncementBar extends React.PureComponent {
  );
  } else if (message === AnnouncementBarMessages.LICENSE_EXPIRING) {
  message = (
- <FormattedHTMLMessage
+ <FormattedMarkdownMessage
  id={AnnouncementBarMessages.LICENSE_EXPIRING}
- defaultMessage='Enterprise license expires on {date}. <a href="{link}" target="_blank">Please renew</a>.'
+ defaultMessage='Enterprise license expires on {date}. [Prease renew](!{link}).'
  values={{
  date: displayExpiryDate(),
  link: renewalLink,
@@ -353,9 +353,9 @@ export default class AnnouncementBar extends React.PureComponent {
  );
  } else if (message === AnnouncementBarMessages.LICENSE_EXPIRED) {
  message = (
- <FormattedHTMLMessage
+ <FormattedMarkdownMessage
  id={AnnouncementBarMessages.LICENSE_EXPIRED}
- defaultMessage='Enterprise license is expired and some features may be disabled. <a href="{link}" target="_blank">Please renew</a>.'
+ defaultMessage='Enterprise license is expired and some features may be disabled. [Please renew](!{link}).'
  values={{
  link: renewalLink,
  }}

diff --git a/components/user_settings/general/user_settings_general.jsx b/components/user_settings/general/user_settings_general.jsx
@@ -17,6 +17,7 @@ import {t} from 'utils/i18n';
 import SettingItemMax from 'components/setting_item_max.jsx';
 import SettingItemMin from 'components/setting_item_min.jsx';
 import SettingPicture from 'components/setting_picture.jsx';
+import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
 const holders = defineMessages({
  usernameReserved: {
@@ -453,9 +454,9 @@ class UserSettingsGeneralTab extends React.Component {
  if (newEmail) {
  helpText = (
  <React.Fragment>
- <FormattedHTMLMessage
+ <FormattedMarkdownMessage
  id='user.settings.general.emailHelp4'
- defaultMessage='A verification email was sent to {email}. <br />Cannot find the email?'
+ defaultMessage='A verification email was sent to {email}. \nCannot find the email?'
  values={{
  email: newEmail,
  }}

diff --git a/i18n/en.json b/i18n/en.json
@@ -1387,8 +1387,8 @@
  "analytics.team.totalPosts": "Total Posts",
  "analytics.team.totalUsers": "Total Active Users",
  "announcement_bar.error.email_verification_required": "Check your email at {email} to verify the address. Cannot find the email?",
- "announcement_bar.error.license_expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew</a>.",
- "announcement_bar.error.license_expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew</a>.",
+ "announcement_bar.error.license_expired": "Enterprise license is expired and some features may be disabled. [Please renew](!{link}).",
+ "announcement_bar.error.license_expiring": "Enterprise license expires on {date}. [Prease renew](!{link}).",
  "announcement_bar.error.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
  "announcement_bar.error.preview_mode": "Preview Mode: Email notifications have not been configured",
  "announcement_bar.error.send_again": "Send again",
@@ -2773,7 +2773,7 @@
  "user.settings.general.emailHelp1": "Email is used for sign-in, notifications, and password reset. Email requires verification if changed.",
  "user.settings.general.emailHelp2": "Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.",
  "user.settings.general.emailHelp3": "Email is used for sign-in, notifications, and password reset.",
- "user.settings.general.emailHelp4": "A verification email was sent to {email}. <br />Cannot find the email?",
+ "user.settings.general.emailHelp4": "A verification email was sent to {email}. \nCannot find the email?",
  "user.settings.general.emailLdapCantUpdate": "Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.",
  "user.settings.general.emailMatch": "The new emails you entered do not match.",
  "user.settings.general.emailOffice365CantUpdate": "Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.",