Building properly the notification level string (mattermost#4143)

* Building properly the notification level string * Updating snapshot
Revanth47 · Nov 19, 2019 · 02a8c58 · 02a8c58
1 parent 18afb38
commit 02a8c58
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 31 deletions.
diff --git a/components/channel_notifications_modal/components/__snapshots__/describe.test.jsx.snap b/components/channel_notifications_modal/components/__snapshots__/describe.test.jsx.snap
@@ -33,22 +33,17 @@ exports[`components/channel_notifications_modal/NotificationSection should match
 `;
 
 exports[`components/channel_notifications_modal/NotificationSection should match snapshot, on global DEFAULT 1`] = `
-<Fragment>
- <FormattedMessage
- defaultMessage="Global default"
- id="channel_notifications.globalDefault"
- values={Object {}}
- />
- <span>
- (
- </span>
- <FormattedMessage
- defaultMessage="default"
- id="channel_notifications.levels.default"
- values={Object {}}
- />
- <span>
- )
- </span>
-</Fragment>
+<FormattedMessage
+ defaultMessage="Global default ({notifyLevel})"
+ id="channel_notifications.globalDefault"
+ values={
+ Object {
+ "notifyLevel": <FormattedMessage
+ defaultMessage="default"
+ id="channel_notifications.levels.default"
+ values={Object {}}
+ />,
+ }
+ }
+/>
 `;
diff --git a/components/channel_notifications_modal/components/describe.jsx b/components/channel_notifications_modal/components/describe.jsx
@@ -15,19 +15,18 @@ export default function Describe({section, isCollapsed, memberNotifyLevel, globa
  t('channel_notifications.levels.mention');
  t('channel_notifications.levels.none');
  const levelsFormattedMessageId = 'channel_notifications.levels.' + globalNotifyLevel;
+ const notifyLevel = (
+ <FormattedMessage
+ id={levelsFormattedMessageId}
+ defaultMessage={globalNotifyLevel}
+ />
+ );
  return (
- <React.Fragment>
- <FormattedMessage
- id='channel_notifications.globalDefault'
- defaultMessage='Global default'
- />
- <span>{' ('}</span>
- <FormattedMessage
- id={levelsFormattedMessageId}
- defaultMessage={globalNotifyLevel}
- />
- <span>{')'}</span>
- </React.Fragment>
+ <FormattedMessage
+ id='channel_notifications.globalDefault'
+ defaultMessage='Global default ({notifyLevel})'
+ values={{notifyLevel}}
+ />
  );
  } else if (memberNotifyLevel === NotificationLevels.MENTION && section === NotificationSections.MARK_UNREAD) {
  if (isCollapsed) {

diff --git a/i18n/en.json b/i18n/en.json
@@ -1941,7 +1941,7 @@
  "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
  "channel_modal.type": "Type",
  "channel_notifications.allActivity": "For all activity",
- "channel_notifications.globalDefault": "Global default",
+ "channel_notifications.globalDefault": "Global default ({notifyLevel})",
  "channel_notifications.ignoreChannelMentions": "Ignore mentions for @channel, @here and @all",
  "channel_notifications.ignoreChannelMentions.help": "When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel.",
  "channel_notifications.ignoreChannelMentions.off.title": "Off",