Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1839,9 +1839,14 @@
},
{
"view": "pr:github",
"when": "gitNotInstalled",
"when": "gitNotInstalled && config.git.enabled != false",
"contents": "%welcome.github.noGit.contents%"
},
{
"view": "pr:github",
"when": "gitNotInstalled && config.git.enabled == false",
"contents": "%welcome.github.noGitDisabled.contents%"
},
{
"view": "github:login",
"when": "ReposManagerStateContext == NeedsAuthentication && !github:hasGitHubRemotes && gitOpenRepositoryCount",
Expand Down
9 changes: 8 additions & 1 deletion package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,14 @@
"{Locked='](command:pr.signin)'}"
]
},
"welcome.github.noGit.contents": "Git is not installed or otherwise not available. Install git or fix your git installation and then reload.",
"welcome.github.noGit.contents": "Git is not installed or otherwise not available. Install git or fix your git installation and then reload. If you have just enabled git in your settings, reload to continue.",
"welcome.github.noGitDisabled.contents": {
"message": "Git has been disabled in your settings. Enable git then reload.\n[Enable Git](command:workbench.action.openSettings?%5B%22git.enabled%22%5D)",
"comment": [
"Do not translate what's inside of (...). It is link syntax.",
"{Locked='](command:workbench.action.openSettings?%5B%22git.enabled%22%5D)'}"
]
},
"welcome.github.loginNoEnterprise.contents": {
"message": "You have not yet signed in with GitHub\n[Sign in](command:pr.signinNoEnterprise)",
"comment": [
Expand Down