From a6307c5ca61a7d29194a90474ae80a55c5833a33 Mon Sep 17 00:00:00 2001
From: Eli Yukelzon <reflog@gmail.com>
Date: Tue, 28 May 2019 15:49:23 +0300
Subject: [PATCH] MM-12320 - Change "about" section references to use the site
 name when it is configured (#2835)

* Change "about" section references to use the site name when it is configured

* Removed non-english changes

* Removed non-english changes

* cleanup

* Fixed indentation

* destructuring
---
 app/screens/settings/general/settings.js    | 7 ++++---
 app/screens/settings/settings_item/index.js | 3 +++
 assets/base/i18n/en.json                    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/screens/settings/general/settings.js b/app/screens/settings/general/settings.js
index 11efa9c97..732672eb1 100644
--- a/app/screens/settings/general/settings.js
+++ b/app/screens/settings/general/settings.js
@@ -75,10 +75,10 @@ class Settings extends PureComponent {
     };
 
     goToAbout = preventDoubleTap(() => {
-        const {intl, navigator, theme} = this.props;
+        const {intl, navigator, theme, config} = this.props;
         navigator.push({
             screen: 'About',
-            title: intl.formatMessage({id: 'about.title', defaultMessage: 'About Mattermost'}),
+            title: intl.formatMessage({id: 'about.title', defaultMessage: 'About {appTitle}'}, {appTitle: config.SiteName || 'Mattermost'}),
             animated: true,
             backButtonTitle: '',
             navigatorStyle: {
@@ -302,7 +302,8 @@ class Settings extends PureComponent {
                     />
                     }
                     <SettingsItem
-                        defaultMessage='About Mattermost'
+                        defaultMessage='About {appTitle}'
+                        messageValues={{appTitle: config.SiteName || 'Mattermost'}}
                         i18nId={t('about.title')}
                         iconName='ios-information-circle'
                         iconType='ion'
diff --git a/app/screens/settings/settings_item/index.js b/app/screens/settings/settings_item/index.js
index a7ec6395c..c5a952bd7 100644
--- a/app/screens/settings/settings_item/index.js
+++ b/app/screens/settings/settings_item/index.js
@@ -14,6 +14,7 @@ import getStyleSheet from './style';
 export default class SettingsItem extends PureComponent {
     static propTypes = {
         defaultMessage: PropTypes.string.isRequired,
+        messageValues: PropTypes.object,
         i18nId: PropTypes.string,
         iconName: PropTypes.string,
         iconType: PropTypes.oneOf(['fontawesome', 'foundation', 'ion', 'material']),
@@ -35,6 +36,7 @@ export default class SettingsItem extends PureComponent {
         const {
             centered,
             defaultMessage,
+            messageValues,
             i18nId,
             isDestructor,
             theme,
@@ -57,6 +59,7 @@ export default class SettingsItem extends PureComponent {
 
         return (
             <FormattedText
+                values={messageValues}
                 id={i18nId}
                 defaultMessage={defaultMessage}
                 style={textStyle}
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 404a009d4..f5c2d1c88 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -9,7 +9,7 @@
   "about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
   "about.teamEditiont0": "Team Edition",
   "about.teamEditiont1": "Enterprise Edition",
-  "about.title": "About Mattermost",
+  "about.title": "About {appTitle}",
   "announcment_banner.dont_show_again": "Don't show again",
   "api.channel.add_member.added": "{addedUsername} added to the channel by {username}.",
   "archivedChannelMessage": "You are viewing an **archived channel**. New messages cannot be posted.",