Skip to content
Prev Previous commit
Next Next commit
Rename
  • Loading branch information
Kartik Raj
Kartik Raj committed Aug 11, 2023
commit 6466c3b602cccba270ffe533bc67ecdf70a4ad41
4 changes: 2 additions & 2 deletions src/client/activation/extensionSurvey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ export class ExtensionSurveyPrompt implements IExtensionSingleActivationService
@traceDecoratorError('Failed to display prompt for extension survey')
public async showSurvey() {
const prompts = [ExtensionSurveyBanner.bannerLabelYes, ExtensionSurveyBanner.maybeLater, Common.doNotShowAgain];
const telemetrySelections: ['Yes', 'Maybe later', 'Do not show again'] = [
const telemetrySelections: ['Yes', 'Maybe later', "Don't show again"] = [
'Yes',
'Maybe later',
'Do not show again',
"Don't show again",
];
const selection = await this.appShell.showInformationMessage(ExtensionSurveyBanner.bannerMessage, ...prompts);
sendTelemetryEvent(EventName.EXTENSION_SURVEY_PROMPT, undefined, {
Expand Down
4 changes: 2 additions & 2 deletions src/client/common/utils/localize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export namespace Common {
export const openOutputPanel = l10n.t('Show output');
export const noIWillDoItLater = l10n.t('No, I will do it later');
export const notNow = l10n.t('Not now');
export const doNotShowAgain = l10n.t('Do not show again');
export const doNotShowAgain = l10n.t("Don't show again");
export const reload = l10n.t('Reload');
export const moreInfo = l10n.t('More Info');
export const learnMore = l10n.t('Learn more');
Expand Down Expand Up @@ -199,7 +199,7 @@ export namespace Interpreters {
export const activatingTerminals = l10n.t('Reactivating terminals...');
export const activateTerminalDescription = l10n.t('Activated environment for');
export const terminalEnvVarCollectionPrompt = l10n.t(
'Python extension automatically activates all terminals using the selected environment. You can hover over the terminal tab to get information about the activation. [Learn more](https://aka.ms/vscodePythonTerminalActivation).',
'The Python extension automatically activates all terminals using the selected environment. You can hover over the terminal tab to see more information about the activation. [Learn more](https://aka.ms/vscodePythonTerminalActivation).',
);
export const activatedCondaEnvLaunch = l10n.t(
'We noticed VS Code was launched from an activated conda environment, would you like to select it?',
Expand Down
8 changes: 4 additions & 4 deletions src/client/telemetry/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ export interface IEventNamePropertyMapping {
tool?: LinterId;
/**
* `select` When 'Select linter' option is selected
* `disablePrompt` When 'Do not show again' option is selected
* `disablePrompt` When "Don't show again" option is selected
* `install` When 'Install' option is selected
*
* @type {('select' | 'disablePrompt' | 'install')}
Expand Down Expand Up @@ -1369,7 +1369,7 @@ export interface IEventNamePropertyMapping {
/**
* `Yes` When 'Yes' option is selected
* `No` When 'No' option is selected
* `Ignore` When 'Do not show again' option is clicked
* `Ignore` When "Don't show again" option is clicked
*
* @type {('Yes' | 'No' | 'Ignore' | undefined)}
*/
Expand Down Expand Up @@ -1549,7 +1549,7 @@ export interface IEventNamePropertyMapping {
* This event also has a measure, "resultLength", which records the number of completions provided.
*/
/* __GDPR__
"jedi_language_server.request" : {
"jedi_language_server.request" : {
"method": {"classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "karthiknadig"}
}
*/
Expand All @@ -1566,7 +1566,7 @@ export interface IEventNamePropertyMapping {
/**
* Carries the selection of user when they are asked to take the extension survey
*/
selection: 'Yes' | 'Maybe later' | 'Do not show again' | undefined;
selection: 'Yes' | 'Maybe later' | "Don't show again" | undefined;
};
/**
* Telemetry event sent when starting REPL
Expand Down
2 changes: 1 addition & 1 deletion src/test/activation/extensionSurvey.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ suite('Extension survey prompt - showSurvey()', () => {
platformService.verifyAll();
});

test("Disable prompt if 'Do not show again' option is clicked", async () => {
test("Disable prompt if \"Don't show again\" option is clicked", async () => {
const prompts = [ExtensionSurveyBanner.bannerLabelYes, ExtensionSurveyBanner.maybeLater, Common.doNotShowAgain];
platformService.setup((p) => p.osType).verifiable(TypeMoq.Times.never());
appShell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ suite('Application Diagnostics - Checks Mac Python Interpreter', () => {
expect(messagePrompt).not.be.equal(undefined, 'Message prompt not set');
expect(messagePrompt!.commandPrompts).to.be.deep.equal([
{ prompt: 'Select Python Interpreter', command: cmd },
{ prompt: 'Do not show again', command: cmdIgnore },
{ prompt: "Don't show again", command: cmdIgnore },
]);
});
test('Should not display a message if No Interpreters diagnostic has been ignored', async () => {
Expand Down
12 changes: 6 additions & 6 deletions src/test/common/installer/installer.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,10 @@ suite('Module Installer only', () => {
TypeMoq.It.isAnyString(),
TypeMoq.It.isValue('Install'),
TypeMoq.It.isValue('Select Linter'),
TypeMoq.It.isValue('Do not show again'),
TypeMoq.It.isValue("Don't show again"),
),
)
.returns(async () => 'Do not show again')
.returns(async () => "Don't show again")
.verifiable(TypeMoq.Times.once());
const persistVal = TypeMoq.Mock.ofType<IPersistentState<boolean>>();
let mockPersistVal = false;
Expand Down Expand Up @@ -367,7 +367,7 @@ suite('Module Installer only', () => {
TypeMoq.It.isAnyString(),
TypeMoq.It.isValue('Install'),
TypeMoq.It.isValue('Select Linter'),
TypeMoq.It.isValue('Do not show again'),
TypeMoq.It.isValue("Don't show again"),
),
)
.returns(async () => undefined)
Expand Down Expand Up @@ -864,7 +864,7 @@ suite('Module Installer only', () => {

test('Ensure 3 options for pylint', async () => {
const product = Product.pylint;
const options = ['Select Linter', 'Do not show again'];
const options = ['Select Linter', "Don't show again"];
const productName = ProductNames.get(product)!;

await installer.promptToInstallImplementation(product, resource);
Expand All @@ -875,7 +875,7 @@ suite('Module Installer only', () => {
});
test('Ensure select linter command is invoked', async () => {
const product = Product.pylint;
const options = ['Select Linter', 'Do not show again'];
const options = ['Select Linter', "Don't show again"];
const productName = ProductNames.get(product)!;
when(
appShell.showErrorMessage(`Linter ${productName} is not installed.`, 'Install', options[0], options[1]),
Expand All @@ -892,7 +892,7 @@ suite('Module Installer only', () => {
});
test('If install button is selected, install linter and return response', async () => {
const product = Product.pylint;
const options = ['Select Linter', 'Do not show again'];
const options = ['Select Linter', "Don't show again"];
const productName = ProductNames.get(product)!;
when(
appShell.showErrorMessage(`Linter ${productName} is not installed.`, 'Install', options[0], options[1]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ suite('Virtual Environment Prompt', () => {
notificationPromptEnabled.verifyAll();
});

test("If user selects 'Do not show again', prompt is disabled", async () => {
test('If user selects "Don\'t show again", prompt is disabled', async () => {
const resource = Uri.file('a');
const interpreter1 = { path: 'path/to/interpreter1' };
const prompts = [Common.bannerLabelYes, Common.bannerLabelNo, Common.doNotShowAgain];
Expand Down