ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

VS Code -> ADS setting descriptions (#17563)

Browse Source
This commit is contained in:
Charles Gagnon
2021-11-03 10:05:56 -07:00
committed by GitHub
parent c02c564a46
commit 43fe0ce482
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/common/locConstants.ts
View File

@@ -44,3 +44,5 @@ export function localizationsContributionActivateLanguagePack(locale: string): s
export const watermarkNewSqlFile = localize('watermark.newSqlFile', "New SQL File"); export const watermarkNewSqlFile = localize('watermark.newSqlFile', "New SQL File");
export const watermarkNewNotebook = localize('watermark.newNotebook', "New Notebook"); export const watermarkNewNotebook = localize('watermark.newNotebook', "New Notebook");
export const desktopContributionMiinstallVsix = localize({ key: 'miinstallVsix', comment: ['&& denotes a mnemonic'] }, "Install Extension from VSIX Package"); export const desktopContributionMiinstallVsix = localize({ key: 'miinstallVsix', comment: ['&& denotes a mnemonic'] }, "Install Extension from VSIX Package");
export const workspaceTrustDescription = localize('workspace.trust.description', "Controls whether or not workspace trust is enabled within Azure Data Studio.");
export function workspaceTrustEmptyWindowDescription(settingName: string): string { return localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within Azure Data Studio. When used with `#{0}#`, you can enable the full functionality of Azure Data Studio without prompting in an empty window.", settingName); }

5
src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
View File

@@ -46,6 +46,7 @@ import { IBannerItem, IBannerService } from 'vs/workbench/services/banner/browse
import { isVirtualWorkspace } from 'vs/platform/remote/common/remoteHosts'; import { isVirtualWorkspace } from 'vs/platform/remote/common/remoteHosts';
import { EditorInput } from 'vs/workbench/common/editor/editorInput'; import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions'; import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
import * as loc from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}} For strings we need to change
const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode'; const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown'; const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown';
@@ -621,7 +622,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
type: 'boolean', type: 'boolean',
default: true, default: true,
included: !isWeb, included: !isWeb,
description: localize('workspace.trust.description', "Controls whether or not workspace trust is enabled within VS Code."), description: loc.workspaceTrustDescription, // {{SQL CARBON EDIT}} VS Code -> ADS
scope: ConfigurationScope.APPLICATION, scope: ConfigurationScope.APPLICATION,
}, },
[WORKSPACE_TRUST_STARTUP_PROMPT]: { [WORKSPACE_TRUST_STARTUP_PROMPT]: {
@@ -654,7 +655,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
type: 'boolean', type: 'boolean',
default: true, default: true,
included: !isWeb, included: !isWeb,
markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VS Code. When used with `#{0}#`, you can enable the full functionality of VS Code without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES), markdownDescription: loc.workspaceTrustEmptyWindowDescription(WORKSPACE_TRUST_UNTRUSTED_FILES), // {{SQL CARBON EDIT}} VS Code -> ADS
scope: ConfigurationScope.APPLICATION scope: ConfigurationScope.APPLICATION
} }
} }