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

Jump to bottom

Improve i18n of new task identifier related strings #52019

Merged
merged 2 commits into from
Jun 15, 2018
Merged

Improve i18n of new task identifier related strings #52019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e70562
Improve i18n of new task identifier related strings
qcz Jun 15, 2018
ae2de43
Adress PR comment
qcz Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/vs/workbench/parts/debug/electron-browser/debugService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,11 @@ export class DebugService implements debug.IDebugService {
}
// run a task before starting a debug session
return this.taskService.getTask(root, taskId).then(task => {
const taskDisplayName = typeof taskId === 'string' ? `'${taskId}'` : nls.localize('specified', "specified");
if (!task) {
return TPromise.wrapError(errors.create(nls.localize('DebugTaskNotFound', "Could not find the task {0}.", taskDisplayName)));
const errorMessage = typeof taskId === 'string'
? nls.localize('DebugTaskNotFoundWithTaskId', "Could not find the task '{0}'.", taskId)
: nls.localize('DebugTaskNotFound', "Could not find the specified task.");
return TPromise.wrapError(errors.create(errorMessage));
}

function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
Expand Down Expand Up @@ -1088,7 +1090,10 @@ export class DebugService implements debug.IDebugService {

setTimeout(() => {
if (!taskStarted) {
e({ severity: severity.Error, message: nls.localize('taskNotTracked', "The task {0} cannot be tracked.", taskDisplayName) });
const errorMessage = typeof taskId === 'string'
? nls.localize('taskNotTrackedWithTaskId', "The specified task cannot be tracked.")
: nls.localize('taskNotTracked', "The task '{0}' cannot be tracked.", taskDisplayName)
e({ severity: severity.Error, message: });
}
}, 10000);
});
Expand Down