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.

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

Fixes from TPIs #21896

Merged
merged 3 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 3 additions & 1 deletion src/client/common/utils/localize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,9 @@ export namespace CreateEnv {
export const recreateDescription = l10n.t('Delete existing ".venv" environment and create a new one');
export const useExisting = l10n.t('Use Existing');
export const useExistingDescription = l10n.t('Use existing ".venv" environment with no changes to it');
export const existingVenvQuickPickPlaceholder = l10n.t('Use or Recreate existing environment?');
export const existingVenvQuickPickPlaceholder = l10n.t(
'Choose an option to handle the existing ".venv" environment',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@luabud @cwebster-99 Need your opinion on this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to suggest "Choose how to handle the existing ".venv" environment" but this also looks good to me!

);
export const deletingEnvironmentProgress = l10n.t('Deleting existing ".venv" environment...');
export const errorDeletingEnvironment = l10n.t('Error while deleting existing ".venv" environment.');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ async function createEnvironment(options?: CreateEnvironmentOptions): Promise<Cr
} catch (ex) {
traceError(ex);
showErrorMessageWithLogs(CreateEnv.Conda.errorCreatingEnvironment);
throw ex;
return { error: ex as Error };
}
},
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export class VenvCreationProvider implements CreateEnvironmentProvider {
} catch (ex) {
traceError(ex);
showErrorMessageWithLogs(CreateEnv.Venv.errorCreatingEnvironment);
throw ex;
return { error: ex as Error };
}
},
);
Expand Down
Loading