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

Fix duplicate localization ids (#803)

Browse Source 
* Add sqlops-core loc project

* Fix duplicate ids step 1

* Merge duplicate id changes.

* A few more duplicate ids
This commit is contained in:
Karl Burtram
2018-03-01 15:25:51 -08:00
committed by GitHub
parent 8114498fb5
commit c06f45cf0e
49 changed files with 107 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/parts/connection/common/connectionActions.ts
View File

@@ -45,8 +45,8 @@ export class ClearRecentConnectionsAction extends Action {
const self = this;
return new TPromise<boolean>((resolve, reject) => {
let choices: { key, value }[] = [
{ key: nls.localize('yes', 'Yes'), value: true },
{ key: nls.localize('no', 'No'), value: false }
{ key: nls.localize('connectionAction.yes', 'Yes'), value: true },
{ key: nls.localize('connectionAction.no', 'No'), value: false }
];
self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('ClearRecentlyUsedLabel', 'Clear Recent Connections List'), ignoreFocusLost: true }).then((choice) => {

4
src/sql/parts/connection/common/connectionManagementService.ts
View File

@@ -1054,8 +1054,8 @@ export class ConnectionManagementService implements IConnectionManagementService
return new Promise<boolean>((resolve, reject) => {
// Setup our cancellation choices
let choices: { key, value }[] = [
{ key: nls.localize('yes', 'Yes'), value: true },
{ key: nls.localize('no', 'No'), value: false }
{ key: nls.localize('connectionService.yes', 'Yes'), value: true },
{ key: nls.localize('connectionService.no', 'No'), value: false }
];
self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('cancelConnectionConfirmation', 'Are you sure you want to cancel this connection?'), ignoreFocusLost: true }).then((choice) => {

2
src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts
View File

@@ -39,7 +39,7 @@ export class AdvancedPropertiesController {
if (!this._advancedDialog) {
this._advancedDialog = this._instantiationService.createInstance(
OptionsDialog, localize('connectionAdvancedProperties', 'Advanced properties'), TelemetryKeys.ConnectionAdvancedProperties, { hasBackButton: true });
this._advancedDialog.cancelLabel = localize('discard', 'Discard');
this._advancedDialog.cancelLabel = localize('advancedProperties.discard', 'Discard');
this._advancedDialog.onCloseEvent(() => this._onCloseAdvancedProperties());
this._advancedDialog.onOk(() => this.handleOnOk());
this._advancedDialog.render();

8
src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
View File

@@ -184,8 +184,8 @@ export class ConnectionDialogWidget extends Modal {
public render() {
super.render();
attachModalDialogStyler(this, this._themeService);
let connectLabel = localize('connect', 'Connect');
let cancelLabel = localize('cancel', 'Cancel');
let connectLabel = localize('connectionDialog.connect', 'Connect');
let cancelLabel = localize('connectionDialog.cancel', 'Cancel');
this._connectButton = this.addFooterButton(connectLabel, () => this.connect());
this._connectButton.enabled = false;
this._closeButton = this.addFooterButton(cancelLabel, () => this.cancel());
@@ -259,8 +259,8 @@ export class ConnectionDialogWidget extends Modal {
let confirm: IConfirmation = {
message: localize('clearRecentConnectionMessage', 'Are you sure you want to delete all the connections from the list?'),
primaryButton: localize('yes', 'Yes'),
secondaryButton: localize('no', 'No'),
primaryButton: localize('connectionDialog.yes', 'Yes'),
secondaryButton: localize('connectionDialog.no', 'No'),
type: 'question'
};

2
src/sql/parts/connection/connectionDialog/connectionWidget.ts
View File

@@ -120,7 +120,7 @@ export class ConnectionWidget {
}
private fillInConnectionForm(): void {
let errorMessage = localize('missingRequireField', ' is required.');
let errorMessage = localize('connectionWidget.missingRequireField', ' is required.');
let serverNameOption = this._optionsMaps[ConnectionOptionSpecialType.serverName];
let serverNameBuilder = DialogHelper.appendRow(this._tableContainer, serverNameOption.displayName, 'connection-label', 'connection-input');