maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#102581 rename reset to clear with ...

Browse source
This commit is contained in:
Sandeep Somavarapu 2020-07-20 10:28:44 +02:00
parent 4ecf61e709
commit 040b60f4d1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file

@ -308,10 +308,10 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
case UserDataSyncErrorCode.IncompatibleRemoteContent: case UserDataSyncErrorCode.IncompatibleRemoteContent:
this.notificationService.notify({ this.notificationService.notify({
severity: Severity.Error, severity: Severity.Error,
message: localize('error reset required', "Preferences sync is disabled because your data in the cloud is older than that of the client. Please reset your data in the cloud before turning on sync."), message: localize('error reset required', "Preferences sync is disabled because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."),
actions: { actions: {
primary: [ primary: [
new Action('reset', localize('reset', "Reset Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()), new Action('reset', localize('reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity()) new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity())
] ]
} }
@ -464,10 +464,10 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
case UserDataSyncErrorCode.IncompatibleRemoteContent: case UserDataSyncErrorCode.IncompatibleRemoteContent:
this.notificationService.notify({ this.notificationService.notify({
severity: Severity.Error, severity: Severity.Error,
message: localize('error reset required while starting sync', "Preferences sync cannot be turned on because your data in the cloud is older than that of in the client. Please reset your data in the cloud before turning on sync."), message: localize('error reset required while starting sync', "Preferences sync cannot be turned on because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."),
actions: { actions: {
primary: [ primary: [
new Action('reset', localize('reset', "Reset Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()), new Action('reset', localize('reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity()) new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity())
] ]
} }

2
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
View file

@ -67,7 +67,7 @@ export class UserDataSyncViewPaneContainer extends ViewPaneContainer {
getSecondaryActions(): IAction[] { getSecondaryActions(): IAction[] {
return [ return [
new Action('workbench.actions.syncData.reset', localize('workbench.actions.syncData.reset', "Reset Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()), new Action('workbench.actions.syncData.reset', localize('workbench.actions.syncData.reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
]; ];
} }

4
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View file

@ -355,8 +355,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
async resetSyncedData(): Promise<void> { async resetSyncedData(): Promise<void> {
const result = await this.dialogService.confirm({ const result = await this.dialogService.confirm({
message: localize('reset', "This will clear your synced data from the cloud and stop sync on all your devices."), message: localize('reset', "This will clear your data in the cloud and stop sync on all your devices."),
title: localize('reset title', "Reset Synced Data"), title: localize('reset title', "Clear"),
type: 'info', type: 'info',
primaryButton: localize('reset button', "Reset"), primaryButton: localize('reset button', "Reset"),
}); });