Skip to content

Commit 1cae2c0

Browse files
authored
Use the word "applied" instead of "effective" (microsoft#164478)
This wording change brings the indicator text in line with the Manage workspace trust view.
1 parent 320d601 commit 1cae2c0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
8282
private createWorkspaceTrustElement(): HTMLElement {
8383
const workspaceTrustElement = $('span.setting-item-workspace-trust');
8484
const workspaceTrustLabel = new SimpleIconLabel(workspaceTrustElement);
85-
workspaceTrustLabel.text = '$(warning) ' + localize('workspaceUntrustedLabel', "Setting value not effective");
85+
workspaceTrustLabel.text = '$(warning) ' + localize('workspaceUntrustedLabel', "Setting value not applied");
8686
const contentFallback = localize('trustLabel', "The setting value can only be applied in a trusted workspace.");
8787

8888
const contentMarkdownString = contentFallback + ` [${localize('manageWorkspaceTrust', "Manage Workspace Trust")}](manage-workspace-trust).`;
@@ -181,8 +181,8 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
181181
this.scopeOverridesElement.style.display = 'inline';
182182
this.scopeOverridesElement.classList.add('with-custom-hover');
183183

184-
this.scopeOverridesLabel.text = '$(warning) ' + localize('policyLabelText', "Setting value not effective");
185-
const contentFallback = localize('policyDescription', "This setting is managed by your organization and its effective value cannot be changed.");
184+
this.scopeOverridesLabel.text = '$(warning) ' + localize('policyLabelText', "Setting value not applied");
185+
const contentFallback = localize('policyDescription', "This setting is managed by your organization and its applied value cannot be changed.");
186186
const contentMarkdownString = contentFallback + ` [${localize('policyFilterLink', "View policy settings")}](policy-settings).`;
187187
const content: ITooltipMarkdownString = {
188188
markdown: {
@@ -359,12 +359,12 @@ export function getIndicatorsLabelAriaLabel(element: SettingsTreeSettingElement,
359359

360360
// Add workspace trust text
361361
if (element.isUntrusted) {
362-
ariaLabelSections.push(localize('workspaceUntrustedAriaLabel', "Workspace untrusted; setting value will not take effect"));
362+
ariaLabelSections.push(localize('workspaceUntrustedAriaLabel', "Workspace untrusted; setting value not applied"));
363363
}
364364

365365
const profilesEnabled = userDataProfilesService.isEnabled();
366366
if (element.hasPolicyValue) {
367-
ariaLabelSections.push(localize('policyDescriptionAccessible', "Setting managed by organization policy; value will not take effect"));
367+
ariaLabelSections.push(localize('policyDescriptionAccessible', "Managed by organization policy; setting value not applied"));
368368
} else if (profilesEnabled && element.matchesScope(ConfigurationTarget.APPLICATION, false)) {
369369
ariaLabelSections.push(localize('applicationSettingDescriptionAccessible', "Setting value retained when switching profiles"));
370370
} else {

0 commit comments

Comments
 (0)