diff --git a/lib/platform/utils/__fixtures__/issue-body.txt b/lib/platform/utils/__fixtures__/issue-body.txt index 3005e9eb6a340e2ffbdd2edfe3d7899d8e360497..b91fc65cce5e31228870d57095714ab5f3442f91 100644 --- a/lib/platform/utils/__fixtures__/issue-body.txt +++ b/lib/platform/utils/__fixtures__/issue-body.txt @@ -1,6 +1,6 @@ ## Edited/Blocked -These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, check the box below. +These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, click on a checkbox. - [ ] <!-- rebase-branch=renovate/docker-renovate-renovate-16.x -->[Update renovate/renovate Docker tag to v16.13.8](../pull/2) diff --git a/lib/platform/utils/read-only-issue-body.ts b/lib/platform/utils/read-only-issue-body.ts index 56813a3415f55b158e2da51274b8688164ffc2eb..d2ffa1d4dea782b2c2a4fad594f78175c2174d0d 100644 --- a/lib/platform/utils/read-only-issue-body.ts +++ b/lib/platform/utils/read-only-issue-body.ts @@ -2,7 +2,7 @@ export function readOnlyIssueBody(body: string): string { return body .replace(' only once you click their checkbox below', '') .replace(' unless you click a checkbox below', '') - .replace(' To discard all commits and start over, check the box below.', '') + .replace(' To discard all commits and start over, click on a checkbox.', '') .replace(/ Click (?:on |)a checkbox.*\./g, '') .replace(/\[ ] <!-- \w*-branch.*-->/g, ''); } diff --git a/lib/workers/repository/__fixtures__/master-issue_with_2_PR_edited.txt b/lib/workers/repository/__fixtures__/master-issue_with_2_PR_edited.txt index ba9398e96e0a7a835708c4aaf6d8b458ef56f8dc..42cb5387c46eb55d5cef82f556945815843dea0b 100644 --- a/lib/workers/repository/__fixtures__/master-issue_with_2_PR_edited.txt +++ b/lib/workers/repository/__fixtures__/master-issue_with_2_PR_edited.txt @@ -2,7 +2,7 @@ This issue contains a list of Renovate updates and their statuses. ## Edited/Blocked -These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, check the box below. +These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, click on a checkbox. - [ ] <!-- rebase-branch=branchName1 -->[pr1](../pull/1) - [ ] <!-- rebase-branch=branchName2 -->[pr2](../pull/2) (`dep2`, `dep3`) diff --git a/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_approval.txt b/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_approval.txt index 08cbe35d31442b88d4959ffec8867d4c8dae4c30..028f21c7e1f724b72fb75952860db4277bbc1179 100644 --- a/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_approval.txt +++ b/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_approval.txt @@ -2,7 +2,7 @@ This issue contains a list of Renovate updates and their statuses. ## PR Creation Approval Required -These branches exist but PRs won't be created until you approve by ticking the checkbox. +These branches exist but PRs won't be created until you approve them by clicking on a checkbox. - [ ] <!-- approvePr-branch=branchName1 -->pr1 - [ ] <!-- approvePr-branch=branchName2 -->pr2 (`dep2`, `dep3`) @@ -10,7 +10,7 @@ These branches exist but PRs won't be created until you approve by ticking the c ## Pending Status Checks -These updates await pending status checks. To force their creation now, check the box below. +These updates await pending status checks. To force their creation now, click the checkbox below. - [ ] <!-- approvePr-branch=branchName4 -->pr4 diff --git a/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_progress.txt b/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_progress.txt index 1f009661c7fe443e00ec6360b45483f80df84a46..2335f7c69cd0c82071ea0979492727391c333c4e 100644 --- a/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_progress.txt +++ b/lib/workers/repository/__fixtures__/master-issue_with_3_PR_in_progress.txt @@ -7,5 +7,5 @@ These updates have all been created already. Click a checkbox below to force a r - [ ] <!-- rebase-branch=branchName1 -->[pr1](../pull/1) - [ ] <!-- rebase-branch=branchName2 -->[pr2](../pull/2) (`dep2`, `dep3`) - [ ] <!-- rebase-branch=branchName3 -->[pr3](../pull/3) - - [ ] <!-- rebase-all-open-prs -->**Check this option to rebase all the above open PRs at once** + - [ ] <!-- rebase-all-open-prs -->**Click on this checkbox to rebase all open PRs at once** diff --git a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt index 5013e150d8d45dcd2d64ad64944743f4b3132d47..9c23c04aba448025b4765157790cb78b7e575026 100644 --- a/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt +++ b/lib/workers/repository/__fixtures__/master-issue_with_8_PR.txt @@ -22,7 +22,7 @@ These updates are currently rate limited. Click on a checkbox below to force the ## Errored -These updates encountered an error and will be retried. Click a checkbox below to force a retry now. +These updates encountered an error and will be retried. Click on a checkbox below to force a retry now. - [ ] <!-- retry-branch=branchName7 -->pr7 - [ ] <!-- retry-branch=branchName8 -->pr8 diff --git a/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap b/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap index f29a214e9e7040d0d8f99b3e7a3bfe7c7af460ca..7f451bbf86d8186296009fd26b0064aa0f904825 100644 --- a/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap +++ b/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap @@ -15,7 +15,7 @@ These problems occurred while renovating this repository. ## Pending Status Checks -These updates await pending status checks. To force their creation now, check the box below. +These updates await pending status checks. To force their creation now, click the checkbox below. - [ ] <!-- approvePr-branch=branchName1 -->pr1 diff --git a/lib/workers/repository/dependency-dashboard.ts b/lib/workers/repository/dependency-dashboard.ts index 9d25ac47c71e1a24fd4beac9131d9af232aee523..7b4fa5d41c2d7f243ce4607d930cf72c8af85a1d 100644 --- a/lib/workers/repository/dependency-dashboard.ts +++ b/lib/workers/repository/dependency-dashboard.ts @@ -187,7 +187,7 @@ export async function ensureDependencyDashboard( if (errorList.length) { issueBody += '## Errored\n\n'; issueBody += - 'These updates encountered an error and will be retried. Click a checkbox below to force a retry now.\n\n'; + 'These updates encountered an error and will be retried. Click on a checkbox below to force a retry now.\n\n'; for (const branch of errorList) { issueBody += getListItem(branch, 'retry'); } @@ -199,7 +199,7 @@ export async function ensureDependencyDashboard( if (awaitingPr.length) { issueBody += '## PR Creation Approval Required\n\n'; issueBody += - "These branches exist but PRs won't be created until you approve by ticking the checkbox.\n\n"; + "These branches exist but PRs won't be created until you approve them by clicking on a checkbox.\n\n"; for (const branch of awaitingPr) { issueBody += getListItem(branch, 'approvePr'); } @@ -210,7 +210,7 @@ export async function ensureDependencyDashboard( ); if (prEdited.length) { issueBody += '## Edited/Blocked\n\n'; - issueBody += `These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, check the box below.\n\n`; + issueBody += `These updates have been manually edited so Renovate will no longer make changes. To discard all commits and start over, click on a checkbox.\n\n`; for (const branch of prEdited) { issueBody += getListItem(branch, 'rebase'); } @@ -221,7 +221,7 @@ export async function ensureDependencyDashboard( ); if (prPending.length) { issueBody += '## Pending Status Checks\n\n'; - issueBody += `These updates await pending status checks. To force their creation now, check the box below.\n\n`; + issueBody += `These updates await pending status checks. To force their creation now, click the checkbox below.\n\n`; for (const branch of prPending) { issueBody += getListItem(branch, 'approvePr'); } @@ -262,7 +262,7 @@ export async function ensureDependencyDashboard( // istanbul ignore if if (otherBranches.length) { issueBody += '## Other Branches\n\n'; - issueBody += `These updates are pending. To force PRs open, check the box below.\n\n`; + issueBody += `These updates are pending. To force PRs open, click the checkbox below.\n\n`; for (const branch of otherBranches) { logger.info( { @@ -289,8 +289,7 @@ export async function ensureDependencyDashboard( if (inProgress.length > 2) { issueBody += ' - [ ] '; issueBody += '<!-- rebase-all-open-prs -->'; - issueBody += - '**Check this option to rebase all the above open PRs at once**'; + issueBody += '**Click on this checkbox to rebase all open PRs at once**'; issueBody += '\n'; } issueBody += '\n';