diff options
| author | Thomas Balthazar <tbalthazar@users.noreply.github.com> | 2016-06-07 14:21:09 +0200 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-07 08:21:09 -0400 |
| commit | 1d31b0eca63730d762ccababd4a9eb0fd15a4d20 (patch) | |
| tree | fe608d629226c7be22d48517dd8c34b4fade7d62 | |
| parent | d9e8eb619ad819ecf2034ba0218a8477ddc262be (diff) | |
| download | chat-1d31b0eca63730d762ccababd4a9eb0fd15a4d20.tar.gz chat-1d31b0eca63730d762ccababd4a9eb0fd15a4d20.tar.bz2 chat-1d31b0eca63730d762ccababd4a9eb0fd15a4d20.zip | |
PLT-2406 Add "Database:" to Mattermost About Dialog (#3261)
* Add "Database:" to Mattermost About Dialog
The property has been named SQLDriverName to make a difference with the
FileSettings DriverName.
* Add missing string for 'Database' in i18n file
| -rw-r--r-- | utils/config.go | 1 | ||||
| -rw-r--r-- | webapp/components/about_build_modal.jsx | 7 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 86fe7c062..9700f44e0 100644 --- a/utils/config.go +++ b/utils/config.go @@ -249,6 +249,7 @@ func getClientConfig(c *model.Config) map[string]string { props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales + props["SQLDriverName"] = c.SqlSettings.DriverName if IsLicensed { if *License.Features.CustomBrand { diff --git a/webapp/components/about_build_modal.jsx b/webapp/components/about_build_modal.jsx index 2f7b3e781..de0b2d58c 100644 --- a/webapp/components/about_build_modal.jsx +++ b/webapp/components/about_build_modal.jsx @@ -137,6 +137,13 @@ export default class AboutBuildModal extends React.Component { /> {'\u00a0' + config.Version + '\u00a0' + config.BuildNumber} </div> + <div> + <FormattedMessage + id='about.database' + defaultMessage='Database:' + /> + {'\u00a0' + config.SQLDriverName} + </div> </div> {licensee} </div> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 783aea863..5e663369b 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -15,6 +15,7 @@ "about.teamEditiont1": "Enterprise Edition", "about.title": "About Mattermost", "about.version": "Version:", + "about.database": "Database:", "access_history.title": "Access History", "activity_log.activeSessions": "Active Sessions", "activity_log.browser": "Browser: {browser}", |