Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the word "applied" instead of "effective" #164478

Merged
merged 1 commit into from
Oct 24, 2022
+5 −5
Merged

Use the word "applied" instead of "effective" #164478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
private createWorkspaceTrustElement(): HTMLElement {
const workspaceTrustElement = $('span.setting-item-workspace-trust');
const workspaceTrustLabel = new SimpleIconLabel(workspaceTrustElement);
workspaceTrustLabel.text = '$(warning) ' + localize('workspaceUntrustedLabel', "Setting value not effective");
workspaceTrustLabel.text = '$(warning) ' + localize('workspaceUntrustedLabel', "Setting value not applied");
const contentFallback = localize('trustLabel', "The setting value can only be applied in a trusted workspace.");

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

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

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

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