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

Carbon Edit Strings moved to Sql Folder (#15884)

Browse Source 
* added first strings

* added more localized files

* translated all strings in vscode

* added exported strings to editStrings

* updated files

* more changes

* moved to base
This commit is contained in:
Alex Ma
2021-06-25 15:08:29 -07:00
committed by GitHub
parent 768bf47aec
commit 7c6368b4b6
15 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vs/workbench/api/common/menusExtensionPoint.ts
View File

@@ -16,6 +16,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
import { Iterable } from 'vs/base/common/iterator';
import { index } from 'vs/base/common/arrays';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
interface IAPIMenu {
readonly key: string;
@@ -230,47 +231,47 @@ const apiMenus: IAPIMenu[] = [
{
key: 'dashboard/toolbar',
id: MenuId.DashboardToolbar,
description: localize('dashboard.toolbar', "The dashboard toolbar action menu")
description: locConstants.menusExtensionPointDashboardToolbar
},
{
key: 'notebook/cell/title',
id: MenuId.NotebookCellTitle,
description: localize('notebook.cellTitle', "The notebook cell title menu")
description: locConstants.menusExtensionPointNotebookCellTitle
},
{
key: 'notebooks/title',
id: MenuId.NotebookTitle,
description: localize('notebook.title', "The notebook title menu")
description: locConstants.menusExtensionPointNotebookTitle
},
{
key: 'notebook/toolbar',
id: MenuId.NotebookToolbar,
description: localize('notebook.toolbar', "The notebook toolbar menu")
description: locConstants.menusExtensionPointNotebookToolbar
},
{
key: 'dataExplorer/action',
id: MenuId.DataExplorerAction,
description: localize('dataExplorer.action', "The dataexplorer view container title action menu")
description: locConstants.menusExtensionPointDataExplorerAction
},
{
key: 'dataExplorer/context',
id: MenuId.DataExplorerContext,
description: localize('dataExplorer.context', "The dataexplorer item context menu")
description: locConstants.menusExtensionPointDataExplorerContext
},
{
key: 'objectExplorer/item/context',
id: MenuId.ObjectExplorerItemContext,
description: localize('objectExplorer.context', "The object explorer item context menu")
description: locConstants.menusExtensionPointObjectExplorerContext
},
{
key: 'connectionDialog/browseTree',
id: MenuId.ConnectionDialogBrowseTreeContext,
description: localize('connectionDialogBrowseTree.context', "The connection dialog's browse tree context menu")
description: locConstants.menusExtensionPointConnectionDialogBrowseTreeContext
},
{
key: 'dataGrid/item/context',
id: MenuId.DataGridItemContext,
description: localize('dataGrid.context', "The data grid item context menu")
description: locConstants.menusExtensionPointDataGridContext
}
// {{SQL CARBON EDIT}} end menu entries
];

7
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
View File

@@ -73,6 +73,7 @@ import { Promises } from 'vs/base/common/async';
import { EditorExtensions } from 'vs/workbench/common/editor';
import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; // {{SQL CARBON EDIT}}
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
// Singletons
registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
@@ -169,7 +170,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
},
'extensions.extensionsPolicy': { // {{SQL CARBON EDIT}}
type: 'string',
description: localize('extensionsPolicy', "Sets the security policy for downloading extensions."),
description: locConstants.extensionsContributionExtensionsPolicy,
scope: ConfigurationScope.APPLICATION,
default: ExtensionsPolicy.allowAll
},
@@ -695,7 +696,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
const isExtensionInstallationAllowed = (configurationService: IConfigurationService, notificationService: INotificationService): boolean => {
const allowAll = configurationService.getValue<string>(ExtensionsPolicyKey) === ExtensionsPolicy.allowAll;
if (!allowAll) {
notificationService.error(localize('InstallVSIXAction.allowNone', 'Your extension policy does not allow installing extensions. Please change your extension policy and try again.'));
notificationService.error(locConstants.extensionsContributionInstallVSIXActionAllowNone);
}
return allowAll;
};
@@ -800,7 +801,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
continue;
}
const requireReload = !(extension.local && extensionService.canAddExtension(toExtensionDescription(extension.local)));
const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload Azure Data Studio to enable it.", extension.displayName || extension.name) // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
const message = requireReload ? locConstants.extensionsContributionInstallVSIXActionSuccessReload(extension.displayName || extension.name) // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
const actions = requireReload ? [{
label: localize('InstallVSIXAction.reloadNow', "Reload Now"),

27
src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View File

@@ -61,6 +61,7 @@ import { infoIcon, manageExtensionIcon, syncEnabledIcon, syncIgnoredIcon, trustI
import { isWeb } from 'vs/base/common/platform';
import { isWorkspaceTrustEnabled } from 'vs/workbench/services/workspaces/common/workspaceTrust';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
function getRelativeDateLabel(date: Date): string {
const delta = new Date().getTime() - date.getTime();
@@ -688,7 +689,7 @@ export class UninstallAction extends ExtensionAction {
alert(localize('uninstallExtensionStart', "Uninstalling extension {0} started.", this.extension.displayName));
return this.extensionsWorkbenchService.uninstall(this.extension).then(() => {
alert(localize('uninstallExtensionComplete', "Please reload Azure Data Studio to complete the uninstallation of the extension {0}.", this.extension!.displayName)); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(locConstants.extensionsActionsUninstallExtensionComplete(this.extension!.displayName)); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
});
}
}
@@ -1293,8 +1294,8 @@ export class ReloadAction extends ExtensionAction {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
// {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = localize('postUninstallTooltip', "Please reload Azure Data Studio to complete the uninstallation of this extension.");
alert(localize('uninstallExtensionComplete', "Please reload Azure Data Studio to complete the uninstallation of the extension {0}.", this.extension.displayName));
this.tooltip = locConstants.extensionsActionsPostUninstallTooltip;
alert(locConstants.extensionsActionsUninstallExtensionComplete(this.extension.displayName));
}
return;
}
@@ -1316,7 +1317,7 @@ export class ReloadAction extends ExtensionAction {
if (this.extension.version !== runningExtension.version) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postUpdateTooltip', "Please reload Azure Data Studio to enable the updated extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = locConstants.extensionsActionsPostUpdateTooltip; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
return;
}
@@ -1326,7 +1327,7 @@ export class ReloadAction extends ExtensionAction {
if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnUI(this.extension.local!.manifest)) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('enable locally', "Please reload Visual Studio Code to enable this extension locally.");
this.tooltip = locConstants.extensionsActionsEnableLocally; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
return;
}
@@ -1334,7 +1335,7 @@ export class ReloadAction extends ExtensionAction {
if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(this.extension.local!.manifest)) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('enable remote', "Please reload Visual Studio Code to enable this extension in {0}.", this.extensionManagementServerService.remoteExtensionManagementServer?.label);
this.tooltip = locConstants.extensionsActionsEnableRemote(this.extensionManagementServerService.remoteExtensionManagementServer?.label); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
return;
}
}
@@ -1346,7 +1347,7 @@ export class ReloadAction extends ExtensionAction {
if (this.extensionManifestPropertiesService.prefersExecuteOnUI(this.extension.local!.manifest)) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postEnableTooltip', "Please reload Azure Data Studio to enable this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = locConstants.extensionsActionsPostEnableTooltip; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
}
}
if (this.extension.server === this.extensionManagementServerService.remoteExtensionManagementServer && runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer) {
@@ -1354,7 +1355,7 @@ export class ReloadAction extends ExtensionAction {
if (this.extensionManifestPropertiesService.prefersExecuteOnWorkspace(this.extension.local!.manifest)) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postEnableTooltip', "Please reload Azure Data Studio to enable this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = locConstants.extensionsActionsPostEnableTooltip; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
}
}
}
@@ -1364,7 +1365,7 @@ export class ReloadAction extends ExtensionAction {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
// {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = localize('postDisableTooltip', "Please reload Azure Data Studio to disable this extension.");
this.tooltip = locConstants.extensionsActionsPostDisableTooltip;
}
}
return;
@@ -1375,7 +1376,7 @@ export class ReloadAction extends ExtensionAction {
if (isEnabled && !this.extensionService.canAddExtension(toExtensionDescription(this.extension.local))) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postEnableTooltip', "Please reload Azure Data Studio to enable this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = locConstants.extensionsActionsPostEnableTooltip; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
return;
}
@@ -1386,8 +1387,8 @@ export class ReloadAction extends ExtensionAction {
if (extensionInOtherServer && extensionInOtherServer.local && this.extensionEnablementService.isEnabled(extensionInOtherServer.local)) {
this.enabled = true;
this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postEnableTooltip', "Please reload Azure Data Studio to enable this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(localize('installExtensionCompletedAndReloadRequired', "Installing extension {0} is completed. Please reload Azure Data Studio to enable it.", this.extension.displayName)); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = locConstants.extensionsActionsPostEnableTooltip; // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(locConstants.extensionsActionsInstallExtensionCompletedAndReloadRequired(this.extension.displayName)); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
return;
}
}
@@ -2396,7 +2397,7 @@ export class ReinstallAction extends Action {
.then(extension => {
const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
// {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Azure Data Studio to complete reinstalling the extension {0}.", extension.identifier.id)
const message = requireReload ? locConstants.extensionsActionsReinstallActionSuccessReload(extension.identifier.id)
: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
const actions = requireReload ? [{
label: localize('InstallVSIXAction.reloadNow', "Reload Now"),

3
src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
View File

@@ -59,6 +59,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import { isWeb } from 'vs/base/common/platform';
import { installLocalInRemoteIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
const SearchIntalledExtensionsContext = new RawContextKey<boolean>('searchInstalledExtensions', false);
@@ -249,7 +250,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
*/
viewDescriptors.push({
id: 'extensions.recommendedList',
name: localize('recommendedExtensions', "Marketplace"), // {{SQL CARBON EDIT}} - change name to marketplace
name: locConstants.extensionsViewletRecommendedExtensions, // {{SQL CARBON EDIT}} - change name to marketplace
ctorDescriptor: new SyncDescriptor(DefaultRecommendedExtensionsView, [{}]),
when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.not('config.extensions.showRecommendationsOnlyOnDemand')),
weight: 40,

3
src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
View File

@@ -49,6 +49,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
// Extensions that are automatically classified as Programming Language extensions, but should be Feature extensions
const FORCE_FEATURE_EXTENSIONS = ['vscode.git', 'vscode.search-result'];
@@ -772,7 +773,7 @@ export class ExtensionsListView extends ViewPane {
// {{SQL CARBON EDIT}}
private getRecommendedExtensionsByScenario(token: CancellationToken, scenarioType: string): Promise<IPagedModel<IExtension>> {
if (!scenarioType) {
return Promise.reject(new Error(localize('scenarioTypeUndefined', 'The scenario type for extension recommendations must be provided.')));
return Promise.reject(new Error(locConstants.extensionsViewsScenarioTypeUndefined));
}
return this.extensionsWorkbenchService.queryLocal()
.then(result => result.filter(e => e.type === ExtensionType.User))

3
src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
View File

@@ -46,6 +46,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener'; // {{SQL CARB
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { isBoolean } from 'vs/base/common/types';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
interface IExtensionStateProvider<T> {
(extension: Extension): T;
@@ -1045,7 +1046,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
return this.galleryService.getCompatibleExtension(extension.gallery.identifier, version)
.then(gallery => {
if (!gallery) {
return Promise.reject(new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with Azure Data Studio '{1}'.", extension.gallery!.identifier.id, version))); // {{SQL CARBON EDIT}} Change vscode to ads
return Promise.reject(new Error(locConstants.extensionsWorkbenchServiceIncompatible(extension.gallery!.identifier.id, version))); // {{SQL CARBON EDIT}} Change vscode to ads
}
return this.installWithProgress(async () => {
const installed = await this.installFromGallery(extension, gallery);

11
src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
View File

@@ -31,6 +31,7 @@ import { SidebarFocusContext } from 'vs/workbench/common/viewlet';
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
import { Codicon } from 'vs/base/common/codicons';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
// Contribute Global Actions
const category = { value: nls.localize('filesCategory', "File"), original: 'File' };
@@ -576,8 +577,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
// Empty Editor Group Context Menu
// {{SQL CARBON EDIT}} - Use "New Query" instead of "New File"
MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: nls.localize('newFile', "New Query") }, group: '1_file', order: 10 });
MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: NEW_UNTITLED_PLAIN_FILE_COMMAND_ID, title: nls.localize('newPlainFile', "New File") }, group: '1_file', order: 15 });
MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: locConstants.fileActionsContributionNewQuery }, group: '1_file', order: 10 });
MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: NEW_UNTITLED_PLAIN_FILE_COMMAND_ID, title: nls.localize('newFile', "New File") }, group: '1_file', order: 15 });
MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: 'workbench.action.quickOpen', title: nls.localize('openFile', "Open File...") }, group: '1_file', order: 20 });
// File menu
@@ -587,7 +588,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
group: '1_new',
command: {
id: NEW_UNTITLED_FILE_COMMAND_ID,
title: nls.localize({ key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "New &&Query")
title: locConstants.fileActionsContributionMiNewQuery
},
order: 1
});
@@ -597,7 +598,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
group: '1_new',
command: {
id: NEW_UNTITLED_PLAIN_FILE_COMMAND_ID,
title: nls.localize({ key: 'miNewPlainFile', comment: ['&& denotes a mnemonic'] }, "New &&File")
title: nls.localize({ key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "New &&File")
},
order: 1.1
});
@@ -607,7 +608,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
group: '1_new',
command: {
id: 'notebook.command.new',
title: nls.localize({ key: 'miNewNotebook', comment: ['&& denotes a mnemonic'] }, "&&New Notebook")
title: locConstants.fileActionsContributionMiNewNotebook
},
order: 1.2
});

3
src/vs/workbench/contrib/files/browser/files.contribution.ts
View File

@@ -32,6 +32,7 @@ import { DirtyFilesIndicator } from 'vs/workbench/contrib/files/common/dirtyFile
import { UndoCommand, RedoCommand } from 'vs/editor/browser/editorExtensions';
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
import { FileEditorInputSerializer, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
class FileUriLabelContribution implements IWorkbenchContribution {
@@ -249,7 +250,7 @@ configurationRegistry.registerConfiguration({
'files.maxMemoryForLargeFilesMB': {
'type': 'number',
'default': 4096,
'markdownDescription': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to Azure Data Studio after restart when trying to open large files. Same effect as specifying `--max-memory=NEWSIZE` on the command line."), // {{SQL CARBON EDIT}} Change product name to ADS
'markdownDescription': locConstants.filesContributionMaxMemoryForLargeFilesMB, // {{SQL CARBON EDIT}} Change product name to ADS
included: platform.isNative
},
'files.restoreUndoStack': {

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

@@ -25,6 +25,7 @@ import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID, IExtensionsViewPaneContainer } fro
import { minimumTranslatedStrings } from 'vs/workbench/contrib/localizations/browser/minimalTranslations';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { CancellationToken } from 'vs/base/common/cancellation';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
// Register action to configure locale and related settings
const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
@@ -58,8 +59,8 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
this.notificationService.prompt(
Severity.Info,
// {{SQL CARBON EDIT}} - Update 'VS Code' to 'Azure Data Studio'
updateAndRestart ? localize('updateLocale', "Would you like to change Azure Data Studio's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId)
: localize('activateLanguagePack', "In order to use Azure Data Studio in {0}, Azure Data Studio needs to restart.", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId),
updateAndRestart ? locConstants.localizationsContributionUpdateLocale(e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId)
: locConstants.localizationsContributionActivateLanguagePack(e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId),
[{
label: updateAndRestart ? localize('changeAndRestart', "Change Language and Restart") : localize('restart', "Restart"),
run: () => {

5
src/vs/workbench/contrib/watermark/browser/watermark.ts
View File

@@ -30,6 +30,7 @@ import { attachKeybindingLabelStyler } from 'vs/platform/theme/common/styler';
// {{SQL CARBON EDIT}}
import { NewNotebookAction } from 'sql/workbench/contrib/notebook/browser/notebookActions';
import * as locConstants from 'sql/base/common/locConstants';
const $ = dom.$;
@@ -40,8 +41,8 @@ interface WatermarkEntry {
}
// {{SQL CARBON EDIT}}
const newSqlFile: WatermarkEntry = { text: nls.localize('watermark.newSqlFile', "New SQL File"), id: NEW_UNTITLED_FILE_COMMAND_ID };
const newNotebook: WatermarkEntry = { text: nls.localize('watermark.newNotebook', "New Notebook"), id: NewNotebookAction.ID };
const newSqlFile: WatermarkEntry = { text: locConstants.watermarkNewSqlFile, id: NEW_UNTITLED_FILE_COMMAND_ID };
const newNotebook: WatermarkEntry = { text: locConstants.watermarkNewNotebook, id: NewNotebookAction.ID };
/*const showCommands: WatermarkEntry = { text: nls.localize('watermark.showCommands', "Show All Commands"), id: ShowAllCommandsAction.ID };
const quickAccess: WatermarkEntry = { text: nls.localize('watermark.quickAccess', "Go to File"), id: 'workbench.action.quickOpen' };

3
src/vs/workbench/electron-sandbox/desktop.contribution.ts
View File

@@ -25,6 +25,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
// eslint-disable-next-line code-import-patterns
import { SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
import * as locConstants from 'sql/base/common/locConstants'; // {{SQL CARBON EDIT}}
// Actions
(function registerActions(): void {
@@ -113,7 +114,7 @@ import { SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/e
group: '5.1_installExtension',
command: {
id: SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID,
title: localize({ key: 'miinstallVsix', comment: ['&& denotes a mnemonic'] }, "Install Extension from VSIX Package")
title: locConstants.desktopContributionMiinstallVsix
}
});