ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -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

2
src/sql/parts/accountManagement/accountDialog/accountDialog.ts
View File

@@ -102,7 +102,7 @@ export class AccountDialog extends Modal {
super.render();
attachModalDialogStyler(this, this._themeService);
this._closeButton = this.addFooterButton(localize('close', 'Close'), () => this.close());
this._closeButton = this.addFooterButton(localize('accountDialog.close', 'Close'), () => this.close());
this.registerListeners();
// Load the initial contents of the view model

2
src/sql/parts/accountManagement/accountDialog/accountDialogController.ts
View File

@@ -14,7 +14,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
export class AccountDialogController {
// MEMBER VARIABLES ////////////////////////////////////////////////////
private _addAccountErrorTitle = localize('addAccountErrorTitle', 'Error adding account');
private _addAccountErrorTitle = localize('accountDialog.addAccountErrorTitle', 'Error adding account');
private _accountDialog: AccountDialog;
public get accountDialog(): AccountDialog { return this._accountDialog; }

2
src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts
View File

@@ -68,7 +68,7 @@ export class AutoOAuthDialog extends Modal {
this._register(attachButtonStyler(this.backButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND }));
this._copyAndOpenButton = this.addFooterButton(localize('copyAndOpen', 'Copy & Open'), () => this.addAccount());
this._closeButton = this.addFooterButton(localize('cancel', 'Cancel'), () => this.cancel());
this._closeButton = this.addFooterButton(localize('oauthDialog.cancel', 'Cancel'), () => this.cancel());
this.registerListeners();
this._userCodeInputBox.disable();
this._websiteInputBox.disable();

4
src/sql/parts/accountManagement/common/accountActions.ts
View File

@@ -92,8 +92,8 @@ export class RemoveAccountAction extends Action {
// Ask for Confirm
let confirm: IConfirmation = {
message: localize('confirmRemoveUserAccountMessage', "Are you sure you want to remove '{0}'?", this._account.displayInfo.displayName),
primaryButton: localize('yes', 'Yes'),
secondaryButton: localize('no', 'No'),
primaryButton: localize('accountActions.yes', 'Yes'),
secondaryButton: localize('accountActions.no', 'No'),
type: 'question'
};

4
src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts
View File

@@ -92,8 +92,8 @@ export class FirewallRuleDialog extends Modal {
attachModalDialogStyler(this, this._themeService);
this.backButton.onDidClick(() => this.cancel());
this._register(attachButtonStyler(this.backButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND }));
this._createButton = this.addFooterButton(localize('ok', 'OK'), () => this.createFirewallRule());
this._closeButton = this.addFooterButton(localize('cancel', 'Cancel'), () => this.cancel());
this._createButton = this.addFooterButton(localize('firewall.ok', 'OK'), () => this.createFirewallRule());
this._closeButton = this.addFooterButton(localize('firewall.cancel', 'Cancel'), () => this.cancel());
this.registerListeners();
}

2
src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController.ts
View File

@@ -22,7 +22,7 @@ export class FirewallRuleDialogController {
private _connection: IConnectionProfile;
private _resourceProviderId: string;
private _addAccountErrorTitle = localize('addAccountErrorTitle', 'Error adding account');
private _addAccountErrorTitle = localize('firewallDialog.addAccountErrorTitle', 'Error adding account');
private _firewallRuleErrorTitle = localize('firewallRuleError', 'Firewall rule error');
private _deferredPromise: Deferred<boolean>;