diff options
| -rw-r--r-- | webapp/components/admin_console/localization_settings.jsx | 8 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/webapp/components/admin_console/localization_settings.jsx b/webapp/components/admin_console/localization_settings.jsx index 6876e0c36..7987f77dc 100644 --- a/webapp/components/admin_console/localization_settings.jsx +++ b/webapp/components/admin_console/localization_settings.jsx @@ -80,7 +80,7 @@ export default class LocalizationSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.general.localization.serverLocaleDescription' - defaultMessage='This setting sets the default language for the system messages and logs. (NEED SERVER RESTART)' + defaultMessage='Default language for system messages and logs. Changing this will require a server restart before taking effect.' /> } /> @@ -98,7 +98,7 @@ export default class LocalizationSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.general.localization.clientLocaleDescription' - defaultMessage="This setting sets the Default language for newly created users and for pages where the user hasn't loggged in." + defaultMessage="Default language for newly created users and pages where the user hasn't logged in." /> } /> @@ -117,7 +117,7 @@ export default class LocalizationSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.general.localization.availableLocalesDescription' - defaultMessage='This setting determines the available languages that a user can set using the Account Settings.' + defaultMessage='Determines which languages are available for users in Account Settings.' /> } noResultText={ @@ -142,4 +142,4 @@ export default class LocalizationSettings extends AdminSettings { </SettingsGroup> ); } -}
\ No newline at end of file +} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index c786c4227..6272664c5 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -180,6 +180,9 @@ "admin.email.smtpUsernameTitle": "SMTP Username:", "admin.email.testing": "Testing...", "admin.false": "false", + "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.", + "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", + "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.", "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>", "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", |