IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update help text for localization settings (#3252)

Browse Source 
* Update help text for localization settings

* Add to en.json
This commit is contained in:
jasonblais
2016-06-06 09:48:39 -04:00
committed by Harrison Healey
parent 6cee1f87f2
commit 5748295d3b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/admin_console/localization_settings.jsx
View File

@@ -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>
);
}
}
}

3
webapp/i18n/en.json
View File

@@ -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.",