From bdd09607c8bbe1055670b62f0c3ac9be8a27ff20 Mon Sep 17 00:00:00 2001
From: Avinash Lingaloo <avinashlng1080@gmail.com>
Date: Sat, 20 Aug 2022 16:58:06 +0400
Subject: [PATCH] Gekidou - fix about screen - wrong i18n key (#6586)

* added schemaVersion and fix wrong i18n id

* i18n extract
---
 app/screens/settings/about/about.tsx | 15 +++++++++++++--
 assets/base/i18n/en.json             |  4 +++-
 types/api/config.d.ts                |  7 ++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/screens/settings/about/about.tsx b/app/screens/settings/about/about.tsx
index 842c117a5..3125b0b9c 100644
--- a/app/screens/settings/about/about.tsx
+++ b/app/screens/settings/about/about.tsx
@@ -145,7 +145,7 @@ const About = ({config, license}: AboutProps) => {
         const buildNumber = config.BuildNumber;
         const version = config.Version;
 
-        let id = t('settings.about.serverVersion');
+        let id = t('settings.about.server.version.value');
         let defaultMessage = '{version} (Build {number})';
         let values: {version: string; number?: string} = {
             version,
@@ -194,7 +194,7 @@ const About = ({config, license}: AboutProps) => {
                 </View>
                 <View style={styles.group}>
                     <Text style={styles.leftHeading}>
-                        {intl.formatMessage({id: 'settings.about.serverVersion', defaultMessage: 'Server Version:'})}
+                        {intl.formatMessage({id: 'settings.about.server.version.desc', defaultMessage: 'Server Version:'})}
                     </Text>
                     <Text style={styles.rightHeading}>
                         {intl.formatMessage({id: serverVersion.id, defaultMessage: serverVersion.defaultMessage}, serverVersion.values)}
@@ -208,6 +208,17 @@ const About = ({config, license}: AboutProps) => {
                         {intl.formatMessage({id: 'settings.about.database.value', defaultMessage: `${config.SQLDriverName}`})}
                     </Text>
                 </View>
+                <View style={styles.group}>
+                    <Text style={styles.leftHeading}>
+                        {intl.formatMessage({id: 'settings.about.database.schema', defaultMessage: 'Database Schema Version:'})}
+                    </Text>
+                    <Text style={styles.rightHeading}>
+                        {intl.formatMessage({
+                            id: 'settings.about.database.schema.value',
+                            defaultMessage: `${config.SchemaVersion}`,
+                        })}
+                    </Text>
+                </View>
                 {license.IsLicensed === 'true' && (
                     <View style={styles.licenseContainer}>
                         <FormattedText
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 526ab10c3..46b7f266d 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -765,9 +765,11 @@
   "settings.about.build": "{version} (Build {number})",
   "settings.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. All rights reserved",
   "settings.about.database": "Database:",
+  "settings.about.database.schema": "Database Schema Version:",
   "settings.about.licensed": "Licensed to: {company}",
   "settings.about.powered_by": "{site} is powered by Mattermost",
-  "settings.about.serverVersion": "{version} (Build {number})",
+  "settings.about.server.version.desc": "Server Version:",
+  "settings.about.server.version.value": "{version} (Build {number})",
   "settings.about.serverVersionNoBuild": "{version}",
   "settings.about.version": "App Version:",
   "settings.advanced_settings": "Advanced Settings",
diff --git a/types/api/config.d.ts b/types/api/config.d.ts
index 314e2c596..606bf272e 100644
--- a/types/api/config.d.ts
+++ b/types/api/config.d.ts
@@ -51,8 +51,8 @@ interface ClientConfig {
     EnableConfirmNotificationsToChannel: string;
     EnableCustomBrand: string;
     EnableCustomEmoji: string;
-    EnableCustomUserStatuses: string;
     EnableCustomTermsOfService: string;
+    EnableCustomUserStatuses: string;
     EnableDeveloper: string;
     EnableDiagnostics: string;
     EnableEmailBatching: string;
@@ -62,8 +62,8 @@ interface ClientConfig {
     EnableGifPicker: string;
     EnableGuestAccounts: string;
     EnableIncomingWebhooks: string;
-    EnableLatex: string;
     EnableInlineLatex: string;
+    EnableLatex: string;
     EnableLdap: string;
     EnableLinkPreviews: string;
     EnableMarketplace: string;
@@ -139,8 +139,8 @@ interface ClientConfig {
     LdapPositionAttributeSet: string;
     LockTeammateNameDisplay: string;
     MaxFileSize: string;
-    MaxPostSize: string;
     MaxNotificationsPerChannel: string;
+    MaxPostSize: string;
     MinimumHashtagLength: string;
     OpenIdButtonColor: string;
     OpenIdButtonText: string;
@@ -165,6 +165,7 @@ interface ClientConfig {
     SamlLoginButtonTextColor: string;
     SamlNicknameAttributeSet: string;
     SamlPositionAttributeSet: string;
+    SchemaVersion: string;
     SendEmailNotifications: string;
     SendPushNotifications: string;
     ShowEmailAddress: string;