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

PLT-726 Update GitLab System Console placeholder text (#3174)

Browse Source 
* Update gitlab_settings.jsx placeholder text

* Update en.json
This commit is contained in:
lfbrock
2016-05-31 14:26:01 -04:00
committed by Harrison Healey
parent fe4a9bc739
commit 581d8568c5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ export default class GitLabSettings extends AdminSettings {
defaultMessage='User API Endpoint:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex ""')}
placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v3/user"')}
helpText={
<FormattedMessage
id='admin.gitlab.userDescription'
@@ -150,7 +150,7 @@ export default class GitLabSettings extends AdminSettings {
defaultMessage='Auth Endpoint:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.authExample', 'Ex ""')}
placeholder={Utils.localizeMessage('admin.gitlab.authExample', 'Ex "https://<your-gitlab-url>/oauth/authorize"')}
helpText={
<FormattedMessage
id='admin.gitlab.authDescription'
@@ -169,7 +169,7 @@ export default class GitLabSettings extends AdminSettings {
defaultMessage='Token Endpoint:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.tokenExample', 'Ex ""')}
placeholder={Utils.localizeMessage('admin.gitlab.tokenExample', 'Ex "https://<your-gitlab-url>/oauth/token"')}
helpText={
<FormattedMessage
id='admin.gitlab.tokenDescription'
@@ -183,4 +183,4 @@ export default class GitLabSettings extends AdminSettings {
</SettingsGroup>
);
}
}
}

6
webapp/i18n/en.json
View File

@@ -183,7 +183,7 @@
"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.",
"admin.gitlab.authExample": "Ex \"\"",
"admin.gitlab.authExample": "Ex \"https://<your-gitlab-url>/oauth/authorize\"",
"admin.gitlab.authTitle": "Auth Endpoint:",
"admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab",
"admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
@@ -194,10 +194,10 @@
"admin.gitlab.enableTitle": "Enable Sign Up With GitLab: ",
"admin.gitlab.settingsTitle": "GitLab Settings",
"admin.gitlab.tokenDescription": "Enter https://<your-gitlab-url>/oauth/token. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
"admin.gitlab.tokenExample": "Ex \"\"",
"admin.gitlab.tokenExample": "Ex \"https://<your-gitlab-url>/oauth/token\"",
"admin.gitlab.tokenTitle": "Token Endpoint:",
"admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
"admin.gitlab.userExample": "Ex \"\"",
"admin.gitlab.userExample": "Ex \"https://<your-gitlab-url>/api/v3/user\"",
"admin.gitlab.userTitle": "User API Endpoint:",
"admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
"admin.image.amazonS3BucketExample": "Ex \"mattermost-media\"",