Skip to content

Commit 621d1ce

Browse files
authored
Update branding in settings (#7618)
Addresses #6198 ### Release Notes <!-- Optionally, replace `N/A` with text to be included in the next release notes. The `N/A` bullets are ignored. If you refer to one or more Positron issues, these issues are used to collect information about the feature or bugfix, such as the relevant language pack as determined by Github labels of type `lang: `. The note will automatically be tagged with the language. These notes are typically filled by the Positron team. If you are an external contributor, you may ignore this section. --> #### New Features - N/A #### Bug Fixes - N/A ### QA Notes We should no longer see references to "a Microsoft online service" in the settings.
1 parent 673597f commit 621d1ce

File tree

3 files changed

+36
-24
lines changed

3 files changed

+36
-24
lines changed

src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,20 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
142142
localize('extensions.autoUpdate.enabled', 'Download and install updates automatically only for enabled extensions.'),
143143
localize('extensions.autoUpdate.false', 'Extensions are not automatically updated.'),
144144
],
145-
description: localize('extensions.autoUpdate', "Controls the automatic update behavior of extensions. The updates are fetched from a Microsoft online service."),
145+
// --- Start Positron ---
146+
// description: localize('extensions.autoUpdate', "Controls the automatic update behavior of extensions. The updates are fetched from a Microsoft online service."),
147+
description: localize('positron.extensions.autoUpdate', "Controls the automatic update behavior of extensions. The updates are fetched from the Open VSX Registry."),
148+
// --- End Positron ---
146149
default: true,
147150
scope: ConfigurationScope.APPLICATION,
148151
tags: ['usesOnlineServices']
149152
},
150153
'extensions.autoCheckUpdates': {
151154
type: 'boolean',
152-
description: localize('extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from a Microsoft online service."),
155+
// --- Start Positron ---
156+
// description: localize('extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from a Microsoft online service."),
157+
description: localize('positron.extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from the Open VSX Registry."),
158+
// --- End Positron ---
153159
default: true,
154160
scope: ConfigurationScope.APPLICATION,
155161
tags: ['usesOnlineServices']

src/vs/workbench/contrib/preferences/common/preferencesContribution.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,15 @@ const registry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
108108
registry.registerConfiguration({
109109
...workbenchConfigurationNodeBase,
110110
'properties': {
111-
'workbench.settings.enableNaturalLanguageSearch': {
112-
'type': 'boolean',
113-
'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
114-
// --- Start Positron ---
115-
// 'default': true,
116-
'default': false,
117-
// --- End Positron ---
118-
'scope': ConfigurationScope.WINDOW,
119-
'tags': ['usesOnlineServices']
120-
},
111+
// --- Start Positron ---
112+
// 'workbench.settings.enableNaturalLanguageSearch': {
113+
// 'type': 'boolean',
114+
// 'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
115+
// 'default': true,
116+
// 'scope': ConfigurationScope.WINDOW,
117+
// 'tags': ['usesOnlineServices']
118+
// },
119+
// --- End Positron ---
121120
'workbench.settings.settingsSearchTocBehavior': {
122121
'type': 'string',
123122
'enum': ['hide', 'filter'],

src/vs/workbench/services/assignment/common/assignmentService.ts

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { localize } from '../../../../nls.js';
6+
// --- Start Positron ---
7+
// import { localize } from '../../../../nls.js';
8+
// --- End Positron ---
79
import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
810
import type { IKeyValueStorage, IExperimentationTelemetry } from 'tas-client-umd';
911
import { MementoObject, Memento } from '../../../common/memento.js';
@@ -17,7 +19,10 @@ import { IAssignmentService } from '../../../../platform/assignment/common/assig
1719
import { Registry } from '../../../../platform/registry/common/platform.js';
1820
import { BaseAssignmentService } from '../../../../platform/assignment/common/assignmentService.js';
1921
import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
20-
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
22+
// --- Start Positron ---
23+
// import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
24+
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
25+
// --- End Positron ---
2126
import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
2227

2328
export const IWorkbenchAssignmentService = createDecorator<IWorkbenchAssignmentService>('WorkbenchAssignmentService');
@@ -142,14 +147,16 @@ registerSingleton(IWorkbenchAssignmentService, WorkbenchAssignmentService, Insta
142147
const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
143148
registry.registerConfiguration({
144149
...workbenchConfigurationNodeBase,
145-
'properties': {
146-
'workbench.enableExperiments': {
147-
'type': 'boolean',
148-
'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
149-
'default': true,
150-
'scope': ConfigurationScope.APPLICATION,
151-
'restricted': true,
152-
'tags': ['usesOnlineServices']
153-
}
154-
}
150+
// --- Start Positron ---
151+
// 'properties': {
152+
// 'workbench.enableExperiments': {
153+
// 'type': 'boolean',
154+
// 'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
155+
// 'default': true,
156+
// 'scope': ConfigurationScope.APPLICATION,
157+
// 'restricted': true,
158+
// 'tags': ['usesOnlineServices']
159+
// }
160+
// }
161+
// --- End Positron ---
155162
});

0 commit comments

Comments
 (0)