Skip to content

Commit b63ccef

Browse files
sandy081sandy081
committed
microsoft#100315 rename to Settings Sync
1 parent 320fbad commit b63ccef

9 files changed

Lines changed: 64 additions & 62 deletions

File tree

‎src/vs/workbench/contrib/logs/common/logs.contribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
4545
}
4646

4747
private registerCommonContributions(): void {
48-
this.registerLogChannel(Constants.userDataSyncLogChannelId, nls.localize('userDataSyncLog', "Preferences Sync"), this.environmentService.userDataSyncLogResource);
48+
this.registerLogChannel(Constants.userDataSyncLogChannelId, nls.localize('userDataSyncLog', "Settings Sync"), this.environmentService.userDataSyncLogResource);
4949
this.registerLogChannel(Constants.rendererLogChannelId, nls.localize('rendererLog', "Window"), this.environmentService.logFile);
5050
}
5151

‎src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ class SyncControls extends Disposable {
14211421
DOM.hide(this.lastSyncedLabel);
14221422

14231423
this.turnOnSyncButton.enabled = true;
1424-
this.turnOnSyncButton.label = localize('turnOnSyncButton', "Turn on Preferences Sync");
1424+
this.turnOnSyncButton.label = localize('turnOnSyncButton', "Turn on Settings Sync");
14251425
DOM.hide(this.turnOnSyncButton.element);
14261426

14271427
this._register(this.turnOnSyncButton.onDidClick(async () => {

‎src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class UserDataSyncReportIssueContribution extends Disposable implements IWorkben
2828
case UserDataSyncErrorCode.LocalTooManyRequests:
2929
case UserDataSyncErrorCode.TooManyRequests:
3030
const operationId = error.operationId ? localize('operationId', "Operation Id: {0}", error.operationId) : undefined;
31-
const message = localize('too many requests', "Turned off syncing preferences on this device because it is making too many requests.");
31+
const message = localize('too many requests', "Turned off syncing settings on this device because it is making too many requests.");
3232
this.notificationService.notify({
3333
severity: Severity.Error,
3434
message: operationId ? `${message} ${operationId}` : message,

‎src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts‎

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

‎src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
9090
this.buttonsContainer = DOM.append(container, DOM.$('.manual-sync-buttons-container'));
9191

9292
this.syncButton = this._register(new Button(this.buttonsContainer));
93-
this.syncButton.label = localize('turn on sync', "Turn on Preferences Sync");
93+
this.syncButton.label = localize('turn on sync', "Turn on Settings Sync");
9494
this.updateSyncButtonEnablement();
9595
this._register(attachButtonStyler(this.syncButton, this.themeService));
9696
this._register(this.syncButton.onDidClick(() => this.apply()));

‎src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
3030
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
3131
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
3232
import { IAction, Action } from 'vs/base/common/actions';
33-
import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SHOW_SYNC_LOG_COMMAND_ID, CONFIGURE_SYNC_COMMAND_ID, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_SYNC_MERGES_VIEW } from 'vs/workbench/services/userDataSync/common/userDataSync';
33+
import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SHOW_SYNC_LOG_COMMAND_ID, CONFIGURE_SYNC_COMMAND_ID, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
3434
import { IUserDataSyncMachinesService, IUserDataSyncMachine } from 'vs/platform/userDataSync/common/userDataSyncMachines';
3535
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
3636
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -161,7 +161,7 @@ export class UserDataSyncDataViews extends Disposable {
161161
constructor() {
162162
super({
163163
id: `workbench.actions.sync.turnOffSyncOnMachine`,
164-
title: localize('workbench.actions.sync.turnOffSyncOnMachine', "Turn off Preferences Sync"),
164+
title: localize('workbench.actions.sync.turnOffSyncOnMachine', "Turn off Settings Sync"),
165165
menu: {
166166
id: MenuId.ViewItemContext,
167167
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', id), ContextKeyEqualsExpr.create('viewItem', 'sync-machine')),
@@ -247,7 +247,7 @@ export class UserDataSyncDataViews extends Disposable {
247247
const result = await dialogService.confirm({
248248
message: localize({ key: 'confirm replace', comment: ['A confirmation message to replace current user data (settings, extensions, keybindings, snippets) with selected version'] }, "Would you like to replace your current {0} with selected?", getSyncAreaLabel(syncResource)),
249249
type: 'info',
250-
title: localize('preferences sync', "Preferences Sync")
250+
title: SYNC_TITLE
251251
});
252252
if (result.confirmed) {
253253
return userDataSyncService.replace(URI.parse(resource));

‎src/vs/workbench/contrib/userDataSync/electron-browser/userDataSync.contribution.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { Action } from 'vs/base/common/actions';
2020
import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issue';
2121
import { Disposable } from 'vs/base/common/lifecycle';
2222
import { ICommandService } from 'vs/platform/commands/common/commands';
23-
import { CONTEXT_SYNC_STATE, SHOW_SYNC_LOG_COMMAND_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
23+
import { CONTEXT_SYNC_STATE, SHOW_SYNC_LOG_COMMAND_ID, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
2424

2525
class UserDataSyncServicesContribution implements IWorkbenchContribution {
2626

@@ -49,11 +49,11 @@ class UserDataSyncReportIssueContribution extends Disposable implements IWorkben
4949
case UserDataSyncErrorCode.LocalTooManyRequests:
5050
case UserDataSyncErrorCode.TooManyRequests:
5151
const operationId = error.operationId ? localize('operationId', "Operation Id: {0}", error.operationId) : undefined;
52-
const message = localize({ key: 'too many requests', comment: ['Preferences Sync is the name of the feature'] }, "Preferences sync is disabled because the current device is making too many requests. Please report an issue by providing the sync logs.");
52+
const message = localize({ key: 'too many requests', comment: ['Settings Sync is the name of the feature'] }, "Settings sync is disabled because the current device is making too many requests. Please report an issue by providing the sync logs.");
5353
this.notificationService.notify({
5454
severity: Severity.Error,
5555
message: operationId ? `${message} ${operationId}` : message,
56-
source: error.operationId ? localize('preferences sync', "Preferences Sync. Operation Id: {0}", error.operationId) : undefined,
56+
source: error.operationId ? localize('settings sync', "Settings Sync. Operation Id: {0}", error.operationId) : undefined,
5757
actions: {
5858
primary: [
5959
new Action('Show Sync Logs', localize('show sync logs', "Show Log"), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
@@ -75,7 +75,7 @@ registerAction2(class OpenSyncBackupsFolder extends Action2 {
7575
super({
7676
id: 'workbench.userData.actions.openSyncBackupsFolder',
7777
title: { value: localize('Open Backup folder', "Open Local Backups Folder"), original: 'Open Local Backups Folder' },
78-
category: { value: localize('sync preferences', "Preferences Sync"), original: `Preferences Sync` },
78+
category: { value: SYNC_TITLE, original: `Settings Sync` },
7979
menu: {
8080
id: MenuId.CommandPalette,
8181
when: CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized),

‎src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IUserDataSyncService, IAuthenticationProvider, getUserDataSyncStore, isAuthenticationProvider, IUserDataAutoSyncService, SyncResource, IResourcePreview, ISyncResourcePreview, Change, IManualSyncTask } from 'vs/platform/userDataSync/common/userDataSync';
77
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
88
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
9-
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
9+
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
1010
import { AuthenticationSession, AuthenticationSessionsChangeEvent } from 'vs/editor/common/modes';
1111
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
1212
import { Emitter, Event } from 'vs/base/common/event';
@@ -203,9 +203,9 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
203203
let value: { token: string, authenticationProviderId: string } | undefined = undefined;
204204
if (current) {
205205
try {
206-
this.logService.trace('Preferences Sync: Updating the token for the account', current.accountName);
206+
this.logService.trace('Settings Sync: Updating the token for the account', current.accountName);
207207
const token = current.token;
208-
this.logService.trace('Preferences Sync: Token updated for the account', current.accountName);
208+
this.logService.trace('Settings Sync: Token updated for the account', current.accountName);
209209
value = { token, authenticationProviderId: current.authenticationProviderId };
210210
} catch (e) {
211211
this.logService.error(e);
@@ -236,8 +236,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
236236
throw new Error(localize('no account', "No account available"));
237237
}
238238

239-
const preferencesSyncTitle = localize('preferences sync', "Preferences Sync");
240-
const title = `${preferencesSyncTitle} [(${localize('details', "details")})](command:${SHOW_SYNC_LOG_COMMAND_ID})`;
239+
const syncTitle = SYNC_TITLE;
240+
const title = `${syncTitle} [(${localize('details', "details")})](command:${SHOW_SYNC_LOG_COMMAND_ID})`;
241241
await this.syncBeforeTurningOn(title);
242242
await this.userDataAutoSyncService.turnOn();
243243
this.notificationService.info(localize('sync turned on', "{0} is turned on", title));
@@ -432,7 +432,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
432432
const quickPick = this.quickInputService.createQuickPick<AccountQuickPickItem>();
433433
disposables.add(quickPick);
434434

435-
quickPick.title = localize('pick an account', "Preferences Sync");
435+
quickPick.title = SYNC_TITLE;
436436
quickPick.ok = false;
437437
quickPick.placeholder = localize('choose account placeholder', "Select an account");
438438
quickPick.ignoreFocusOut = true;
@@ -501,7 +501,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
501501

502502
this.notificationService.notify({
503503
severity: Severity.Error,
504-
message: localize('successive auth failures', "Preferences sync was turned off because of successive authorization failures. Please sign in again to continue synchronizing"),
504+
message: localize('successive auth failures', "Settings sync was turned off because of successive authorization failures. Please sign in again to continue synchronizing"),
505505
actions: {
506506
primary: [new Action('sign in', localize('sign in', "Sign in"), undefined, true, () => this.signIn())]
507507
}

‎src/vs/workbench/services/userDataSync/common/userDataSync.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ export const enum AccountStatus {
7979
Available = 'available',
8080
}
8181

82+
export const SYNC_TITLE = localize('sync category', "Settings Sync");
83+
8284
// Contexts
8385
export const CONTEXT_SYNC_STATE = new RawContextKey<string>('syncStatus', SyncStatus.Uninitialized);
8486
export const CONTEXT_SYNC_ENABLEMENT = new RawContextKey<boolean>('syncEnabled', false);

0 commit comments

Comments
 (0)