Skip to content

Commit 9861198

Browse files
eleanorjboydeleanorjboyd
committed
fix localized text
1 parent 44f84dd commit 9861198

File tree

4 files changed

+33
-56
lines changed

4 files changed

+33
-56
lines changed

‎src/common/localize.ts‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,64 +77,41 @@ export namespace ProjectViews {
7777
export const noPackages = l10n.t('No packages found');
7878
}
7979

80-
export class VenvManagerStringsNoUv {
81-
static venvManagerDescription = l10n.t('Manages virtual environments created using `venv`');
80+
export class VenvManagerCommonStrings {
8281
static venvInitialize = l10n.t('Initializing virtual environments');
8382
static venvRefreshing = l10n.t('Refreshing virtual environments');
8483
static venvGlobalFolder = l10n.t('Select a folder to create a global virtual environment');
8584
static venvGlobalFoldersSetting = l10n.t('Venv Folders Setting');
86-
8785
static venvErrorNoBasePython = l10n.t('No base Python found');
8886
static venvErrorNoPython3 = l10n.t('Did not find any base Python 3');
89-
9087
static venvName = l10n.t('Enter a name for the virtual environment');
9188
static venvNameErrorEmpty = l10n.t('Name cannot be empty');
9289
static venvNameErrorExists = l10n.t('A folder with the same name already exists');
9390
static venvCreateFailed = l10n.t('Failed to create virtual environment');
94-
9591
static venvRemoving = l10n.t('Removing virtual environment');
9692
static venvRemoveFailed = l10n.t('Failed to remove virtual environment');
97-
98-
static installEditable = l10n.t('Install project as editable');
9993
static searchingDependencies = l10n.t('Searching for dependencies');
100-
10194
static selectQuickOrCustomize = l10n.t('Select environment creation mode');
10295
static quickCreate = l10n.t('Quick Create');
103-
static quickCreateDescription = l10n.t('Create a virtual environment in the workspace root');
10496
static customize = l10n.t('Custom');
97+
}
98+
99+
export class VenvManagerStringsNoUv {
100+
static venvManagerDescription = l10n.t('Manages virtual environments created using `venv`');
101+
static quickCreateDescription = l10n.t('Create a virtual environment in the workspace root');
105102
static customizeDescription = l10n.t('Choose python version, location, packages, name, etc.');
103+
static installEditable = l10n.t('Install project as editable');
106104
}
107105

108106
export class VenvManagerStringsWithUv {
109107
static venvManagerDescription = l10n.t('Manages virtual environments created using `venv [uv]`');
110-
static venvInitialize = l10n.t('Initializing virtual environments');
111-
static venvRefreshing = l10n.t('Refreshing virtual environments');
112-
static venvGlobalFolder = l10n.t('Select a folder to create a global virtual environment');
113-
static venvGlobalFoldersSetting = l10n.t('Venv Folders Setting');
114-
115-
static venvErrorNoBasePython = l10n.t('No base Python found');
116-
static venvErrorNoPython3 = l10n.t('Did not find any base Python 3');
117-
118-
static venvName = l10n.t('Enter a name for the virtual environment');
119-
static venvNameErrorEmpty = l10n.t('Name cannot be empty');
120-
static venvNameErrorExists = l10n.t('A folder with the same name already exists');
121-
static venvCreateFailed = l10n.t('Failed to create virtual environment');
122-
123-
static venvRemoving = l10n.t('Removing virtual environment');
124-
static venvRemoveFailed = l10n.t('Failed to remove virtual environment');
125-
126-
static installEditable = l10n.t('Install project as editable');
127-
static searchingDependencies = l10n.t('Searching for dependencies');
128-
129-
static selectQuickOrCustomize = l10n.t('Select environment creation mode');
130-
static quickCreate = l10n.t('Quick Create');
131108
static quickCreateDescription = l10n.t(
132109
'Create a virtual environment in the workspace root using uv for fast installs',
133110
);
134-
static customize = l10n.t('Custom');
135111
static customizeDescription = l10n.t(
136112
'Choose python version, location, packages, name, etc. (uses uv for installs)',
137113
);
114+
static installEditable = l10n.t('Install project as editable using uv');
138115
}
139116

140117
/**

‎src/managers/builtin/pipUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as path from 'path';
44
import { LogOutputChannel, ProgressLocation, QuickInputButtons, QuickPickItem, Uri } from 'vscode';
55
import { PackageManagementOptions, PythonEnvironment, PythonEnvironmentApi, PythonProject } from '../../api';
66
import { EXTENSION_ROOT_DIR } from '../../common/constants';
7-
import { PackageManagement, Pickers, VenvManagerStringsNoUv } from '../../common/localize';
7+
import { PackageManagement, Pickers, VenvManagerCommonStrings, VenvManagerStrings } from '../../common/localize';
88
import { traceInfo } from '../../common/logging';
99
import { showQuickPickWithButtons, withProgress } from '../../common/window.apis';
1010
import { findFiles } from '../../common/workspace.apis';
@@ -36,7 +36,7 @@ function getTomlInstallable(toml: tomljs.JsonMap, tomlPath: Uri): Installable[]
3636
extras.push({
3737
name,
3838
displayName: name,
39-
description: VenvManagerStringsNoUv.installEditable,
39+
description: VenvManagerStrings.installEditable,
4040
group: 'TOML',
4141
args: ['-e', projectDir],
4242
uri: tomlPath,
@@ -177,7 +177,7 @@ export async function getProjectInstallable(
177177
await withProgress(
178178
{
179179
location: ProgressLocation.Notification,
180-
title: VenvManagerStringsNoUv.searchingDependencies,
180+
title: VenvManagerCommonStrings.searchingDependencies,
181181
},
182182
async (_progress, token) => {
183183
const results: Uri[] = (

‎src/managers/builtin/venvManager.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
SetEnvironmentScope,
3030
} from '../../api';
3131
import { PYTHON_EXTENSION_ID } from '../../common/constants';
32-
import { VenvManagerStringsNoUv } from '../../common/localize';
32+
import { VenvManagerCommonStrings, VenvManagerStringsNoUv } from '../../common/localize';
3333
import { traceError, traceWarn } from '../../common/logging';
3434
import { createDeferred, Deferred } from '../../common/utils/deferred';
3535
import { showErrorMessage, withProgress } from '../../common/window.apis';
@@ -97,7 +97,7 @@ export class VenvManager implements EnvironmentManager {
9797
this._initialized = createDeferred();
9898

9999
try {
100-
await this.internalRefresh(undefined, false, VenvManagerStringsNoUv.venvInitialize);
100+
await this.internalRefresh(undefined, false, VenvManagerCommonStrings.venvInitialize);
101101
} finally {
102102
this._initialized.resolve();
103103
}
@@ -156,15 +156,15 @@ export class VenvManager implements EnvironmentManager {
156156
// error on missing information
157157
if (!this.globalEnv) {
158158
this.log.error('No base python found');
159-
showErrorMessage(VenvManagerStringsNoUv.venvErrorNoBasePython);
159+
showErrorMessage(VenvManagerCommonStrings.venvErrorNoBasePython);
160160
throw new Error('No base python found');
161161
}
162162
if (!this.globalEnv.version.startsWith('3.')) {
163163
this.log.error('Did not find any base python 3.*');
164164
globals.forEach((e, i) => {
165165
this.log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`);
166166
});
167-
showErrorMessage(VenvManagerStringsNoUv.venvErrorNoPython3);
167+
showErrorMessage(VenvManagerCommonStrings.venvErrorNoPython3);
168168
throw new Error('Did not find any base python 3.*');
169169
}
170170
if (this.globalEnv && this.globalEnv.version.startsWith('3.')) {
@@ -292,14 +292,14 @@ export class VenvManager implements EnvironmentManager {
292292
}
293293

294294
async refresh(scope: RefreshEnvironmentsScope): Promise<void> {
295-
return this.internalRefresh(scope, true, VenvManagerStringsNoUv.venvRefreshing);
295+
return this.internalRefresh(scope, true, VenvManagerCommonStrings.venvRefreshing);
296296
}
297297

298298
async watcherRefresh(): Promise<void> {
299299
if (this.skipWatcherRefresh) {
300300
return;
301301
}
302-
return this.internalRefresh(undefined, true, VenvManagerStringsNoUv.venvRefreshing);
302+
return this.internalRefresh(undefined, true, VenvManagerCommonStrings.venvRefreshing);
303303
}
304304

305305
private async internalRefresh(

‎src/managers/builtin/venvUtils.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as path from 'path';
44
import { l10n, LogOutputChannel, ProgressLocation, QuickPickItem, QuickPickItemKind, ThemeIcon, Uri } from 'vscode';
55
import { EnvironmentManager, PythonEnvironment, PythonEnvironmentApi, PythonEnvironmentInfo } from '../../api';
66
import { ENVS_EXTENSION_ID } from '../../common/constants';
7-
import { Common, VenvManagerStringsNoUv } from '../../common/localize';
7+
import { Common, VenvManagerCommonStrings, VenvManagerStrings, VenvManagerStringsNoUv } from '../../common/localize';
88
import { traceInfo } from '../../common/logging';
99
import { getWorkspacePersistentState } from '../../common/persistentState';
1010
import { pickEnvironmentFrom } from '../../common/pickers/environments';
@@ -209,15 +209,15 @@ export async function getGlobalVenvLocation(): Promise<Uri | undefined> {
209209
const items: FolderQuickPickItem[] = [
210210
{
211211
label: Common.browse,
212-
description: VenvManagerStringsNoUv.venvGlobalFolder,
212+
description: VenvManagerCommonStrings.venvGlobalFolder,
213213
},
214214
];
215215

216216
const venvPaths = getVenvFoldersSetting();
217217
if (venvPaths.length > 0) {
218218
items.push(
219219
{
220-
label: VenvManagerStringsNoUv.venvGlobalFoldersSetting,
220+
label: VenvManagerCommonStrings.venvGlobalFoldersSetting,
221221
kind: QuickPickItemKind.Separator,
222222
},
223223
...venvPaths.map((p) => ({
@@ -243,7 +243,7 @@ export async function getGlobalVenvLocation(): Promise<Uri | undefined> {
243243
}
244244

245245
const selected = await showQuickPick(items, {
246-
placeHolder: VenvManagerStringsNoUv.venvGlobalFolder,
246+
placeHolder: VenvManagerCommonStrings.venvGlobalFolder,
247247
ignoreFocusOut: true,
248248
});
249249

@@ -269,24 +269,24 @@ async function createWithCustomization(version: string): Promise<boolean | undef
269269
const selection: QuickPickItem | undefined = await showQuickPick(
270270
[
271271
{
272-
label: VenvManagerStringsNoUv.quickCreate,
272+
label: VenvManagerCommonStrings.quickCreate,
273273
description: VenvManagerStringsNoUv.quickCreateDescription,
274274
detail: l10n.t('Uses Python version {0} and installs workspace dependencies.', version),
275275
},
276276
{
277-
label: VenvManagerStringsNoUv.customize,
278-
description: VenvManagerStringsNoUv.customizeDescription,
277+
label: VenvManagerCommonStrings.customize,
278+
description: VenvManagerStrings.customizeDescription,
279279
},
280280
],
281281
{
282-
placeHolder: VenvManagerStringsNoUv.selectQuickOrCustomize,
282+
placeHolder: VenvManagerCommonStrings.selectQuickOrCustomize,
283283
ignoreFocusOut: true,
284284
},
285285
);
286286

287287
if (selection === undefined) {
288288
return undefined;
289-
} else if (selection.label === VenvManagerStringsNoUv.quickCreate) {
289+
} else if (selection.label === VenvManagerCommonStrings.quickCreate) {
290290
return false;
291291
}
292292
return true;
@@ -383,14 +383,14 @@ async function createWithProgress(
383383
export function ensureGlobalEnv(basePythons: PythonEnvironment[], log: LogOutputChannel): PythonEnvironment[] {
384384
if (basePythons.length === 0) {
385385
log.error('No base python found');
386-
showErrorMessage(VenvManagerStringsNoUv.venvErrorNoBasePython);
386+
showErrorMessage(VenvManagerCommonStrings.venvErrorNoBasePython);
387387
throw new Error('No base python found');
388388
}
389389

390390
const filtered = basePythons.filter((e) => e.version.startsWith('3.'));
391391
if (filtered.length === 0) {
392392
log.error('Did not find any base python 3.*');
393-
showErrorMessage(VenvManagerStringsNoUv.venvErrorNoPython3);
393+
showErrorMessage(VenvManagerCommonStrings.venvErrorNoPython3);
394394
basePythons.forEach((e, i) => {
395395
log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`);
396396
});
@@ -471,15 +471,15 @@ export async function createPythonVenv(
471471
}
472472

473473
const name = await showInputBox({
474-
prompt: VenvManagerStringsNoUv.venvName,
474+
prompt: VenvManagerCommonStrings.venvName,
475475
value: '.venv',
476476
ignoreFocusOut: true,
477477
validateInput: async (value) => {
478478
if (!value) {
479-
return VenvManagerStringsNoUv.venvNameErrorEmpty;
479+
return VenvManagerCommonStrings.venvNameErrorEmpty;
480480
}
481481
if (await fsapi.pathExists(path.join(venvRoot.fsPath, value))) {
482-
return VenvManagerStringsNoUv.venvNameErrorExists;
482+
return VenvManagerCommonStrings.venvNameErrorExists;
483483
}
484484
},
485485
});
@@ -527,15 +527,15 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC
527527
const result = await withProgress(
528528
{
529529
location: ProgressLocation.Notification,
530-
title: VenvManagerStringsNoUv.venvRemoving,
530+
title: VenvManagerCommonStrings.venvRemoving,
531531
},
532532
async () => {
533533
try {
534534
await fsapi.remove(envPath);
535535
return true;
536536
} catch (e) {
537537
log.error(`Failed to remove virtual environment: ${e}`);
538-
showErrorMessage(VenvManagerStringsNoUv.venvRemoveFailed);
538+
showErrorMessage(VenvManagerCommonStrings.venvRemoveFailed);
539539
return false;
540540
}
541541
},

0 commit comments

Comments
 (0)