diff options
author | enahum <nahumhbl@gmail.com> | 2016-08-04 13:32:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-04 13:32:57 -0500 |
commit | b04d2c2f394cf6deb663e4c372ed637701e3eb41 (patch) | |
tree | d97dde302a1ebd9a98bdfd9e9c8623acdf4f792f | |
parent | 953b14ab22eb089414986d72730cdd5c86bb120c (diff) | |
download | chat-b04d2c2f394cf6deb663e4c372ed637701e3eb41.tar.gz chat-b04d2c2f394cf6deb663e4c372ed637701e3eb41.tar.bz2 chat-b04d2c2f394cf6deb663e4c372ed637701e3eb41.zip |
PLT-3767 Promote localizations on System Console and Account Settings (#3734)
-rw-r--r-- | webapp/components/admin_console/localization_settings.jsx | 6 | ||||
-rw-r--r-- | webapp/components/user_settings/manage_languages.jsx | 9 | ||||
-rw-r--r-- | webapp/i18n/en.json | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/webapp/components/admin_console/localization_settings.jsx b/webapp/components/admin_console/localization_settings.jsx index c8d20c7fd..a9a0a8044 100644 --- a/webapp/components/admin_console/localization_settings.jsx +++ b/webapp/components/admin_console/localization_settings.jsx @@ -6,7 +6,7 @@ import React from 'react'; import * as I18n from 'i18n/i18n.jsx'; import AdminSettings from './admin_settings.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import SettingsGroup from './settings_group.jsx'; import DropdownSetting from './dropdown_setting.jsx'; import MultiSelectSetting from './multiselect_settings.jsx'; @@ -112,9 +112,9 @@ export default class LocalizationSettings extends AdminSettings { selected={this.state.availableLocales} onChange={this.handleChange} helpText={ - <FormattedMessage + <FormattedHTMLMessage id='admin.general.localization.availableLocalesDescription' - defaultMessage='Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)' + defaultMessage='Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href="http://translate.mattermost.com/" target="_blank">Mattermost Translation Server</a> to contribute.' /> } noResultText={ diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx index a62482462..ed82bc666 100644 --- a/webapp/components/user_settings/manage_languages.jsx +++ b/webapp/components/user_settings/manage_languages.jsx @@ -8,7 +8,7 @@ import * as I18n from 'i18n/i18n.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Constants from 'utils/constants.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import React from 'react'; @@ -99,6 +99,13 @@ export default class ManageLanguage extends React.Component { </select> {serverError} </div> + <div> + <br/> + <FormattedHTMLMessage + id='user.settings.languages.promote' + defaultMessage='Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href="http://translate.mattermost.com/" target="_blank">Mattermost Translation Server</a> to contribute.' + /> + </div> </div> ); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index f53d8d005..837249894 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -263,7 +263,7 @@ "admin.files.storage": "Storage", "admin.general.configuration": "Configuration", "admin.general.localization": "Localization", - "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)", + "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.", "admin.general.localization.availableLocalesTitle": "Available Languages:", "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", "admin.general.localization.clientLocaleTitle": "Default Client Language:", @@ -459,6 +459,8 @@ "admin.oauth.google": "Google Apps", "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider", "admin.oauth.office365": "Office 365", + "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing external applications to authorize API requests to Mattermost.", + "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.oauth.select": "Select OAuth 2.0 service provider:", "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>", "admin.office365.authTitle": "Auth Endpoint:", @@ -470,8 +472,6 @@ "admin.office365.clientSecretTitle": "Application Secret Password:", "admin.office365.tokenTitle": "Token Endpoint:", "admin.office365.userTitle": "User API Endpoint:", - "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.", - "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.password.lowercase": "At least one lowercase letter", "admin.password.minimumLength": "Minimum Password Length:", "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.", @@ -1712,6 +1712,7 @@ "user.settings.import_theme.submit": "Submit", "user.settings.import_theme.submitError": "Invalid format, please try copying and pasting in again.", "user.settings.languages.change": "Change interface language", + "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.", "user.settings.mfa.add": "Add MFA to your account", "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.", "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.", |