Fix duplicate localization ids (#803)

* 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

View File

@@ -285,7 +285,7 @@ export class BackupComponent {
this.mediaDescriptionBox = new InputBox(this.mediaDescriptionElement.nativeElement, this._bootstrapService.contextViewService);
// Set backup retain days
let invalidInputMessage = localize('invalidInput', 'Invalid input. Value must be greater than or equal 0.');
let invalidInputMessage = localize('backupComponent.invalidInput', 'Invalid input. Value must be greater than or equal 0.');
this.backupRetainDaysBox = new InputBox(this.backupDaysElement.nativeElement,
this._bootstrapService.contextViewService,
{
@@ -367,21 +367,21 @@ export class BackupComponent {
private addFooterButtons(): void {
// Set script footer button
this.scriptButton = new Button(this.scriptButtonElement.nativeElement);
this.scriptButton.label = localize('script', 'Script');
this.scriptButton.label = localize('backupComponent.script', 'Script');
this.addButtonClickHandler(this.scriptButton, () => this.onScript());
this._toDispose.push(attachButtonStyler(this.scriptButton, this._bootstrapService.themeService));
this.scriptButton.enabled = false;
// Set backup footer button
this.backupButton = new Button(this.backupButtonElement.nativeElement);
this.backupButton.label = localize('backup', 'Backup');
this.backupButton.label = localize('backupComponent.backup', 'Backup');
this.addButtonClickHandler(this.backupButton, () => this.onOk());
this._toDispose.push(attachButtonStyler(this.backupButton, this._bootstrapService.themeService));
this.backupEnabled = false;
// Set cancel footer button
this.cancelButton = new Button(this.cancelButtonElement.nativeElement);
this.cancelButton.label = localize('cancel', 'Cancel');
this.cancelButton.label = localize('backupComponent.cancel', 'Cancel');
this.addButtonClickHandler(this.cancelButton, () => this.onCancel());
this._toDispose.push(attachButtonStyler(this.cancelButton, this._bootstrapService.themeService));
}

View File

@@ -126,10 +126,10 @@ export class RestoreDialog extends Modal {
@IContextKeyService contextKeyService: IContextKeyService
) {
super(localize('RestoreDialogTitle', 'Restore database'), TelemetryKeys.Restore, partService, telemetryService, contextKeyService, { hasErrors: true, isWide: true, hasSpinner: true });
this._restoreTitle = localize('restoreTitle', 'Restore database');
this._databaseTitle = localize('database', 'Database');
this._backupFileTitle = localize('backupFile', 'Backup file');
this._restoreLabel = localize('restore', 'Restore');
this._restoreTitle = localize('restoreDialog.restoreTitle', 'Restore database');
this._databaseTitle = localize('restoreDialog.database', 'Database');
this._backupFileTitle = localize('restoreDialog.backupFile', 'Backup file');
this._restoreLabel = localize('restoreDialog.restore', 'Restore');
// view model
this.viewModel = new RestoreViewModel(optionsMetadata);
@@ -146,8 +146,8 @@ export class RestoreDialog extends Modal {
public render() {
super.render();
attachModalDialogStyler(this, this._themeService);
let cancelLabel = localize('cancel', 'Cancel');
this._scriptButton = this.addFooterButton(localize('script', 'Script'), () => this.restore(true));
let cancelLabel = localize('restoreDialog.cancel', 'Cancel');
this._scriptButton = this.addFooterButton(localize('restoreDialog.script', 'Script'), () => this.restore(true));
this._restoreButton = this.addFooterButton(this._restoreLabel, () => this.restore(false));
this._closeButton = this.addFooterButton(cancelLabel, () => this.cancel());
this.registerListeners();