update loc
This commit is contained in:
Родитель
a7976a6333
Коммит
8f859fcfb4
12
src/make.ts
12
src/make.ts
|
@ -858,7 +858,12 @@ export async function prePostConfigureHelper(
|
||||||
export async function preConfigure(triggeredBy: TriggeredBy): Promise<number> {
|
export async function preConfigure(triggeredBy: TriggeredBy): Promise<number> {
|
||||||
let scriptFile: string | undefined = configuration.getPreConfigureScript();
|
let scriptFile: string | undefined = configuration.getPreConfigureScript();
|
||||||
if (!scriptFile) {
|
if (!scriptFile) {
|
||||||
vscode.window.showErrorMessage("Pre-configure failed: no script provided.");
|
vscode.window.showErrorMessage(
|
||||||
|
localize(
|
||||||
|
"no.preconfigure.script.provided",
|
||||||
|
"Pre-configure failed: no script provided."
|
||||||
|
)
|
||||||
|
);
|
||||||
logger.message(
|
logger.message(
|
||||||
"No pre-configure script is set in settings. " +
|
"No pre-configure script is set in settings. " +
|
||||||
"Make sure a pre-configuration script path is defined with makefile.preConfigureScript."
|
"Make sure a pre-configuration script path is defined with makefile.preConfigureScript."
|
||||||
|
@ -910,7 +915,10 @@ export async function postConfigure(triggeredBy: TriggeredBy): Promise<number> {
|
||||||
let scriptFile: string | undefined = configuration.getPostConfigureScript();
|
let scriptFile: string | undefined = configuration.getPostConfigureScript();
|
||||||
if (!scriptFile) {
|
if (!scriptFile) {
|
||||||
vscode.window.showErrorMessage(
|
vscode.window.showErrorMessage(
|
||||||
"Post-configure failed: no script provided."
|
localize(
|
||||||
|
"no.postconfigure.script.provided",
|
||||||
|
"Post-configure failed: no script provided."
|
||||||
|
)
|
||||||
);
|
);
|
||||||
logger.message(
|
logger.message(
|
||||||
"No post-configure script is set in settings. " +
|
"No post-configure script is set in settings. " +
|
||||||
|
|
17
src/tree.ts
17
src/tree.ts
|
@ -82,7 +82,7 @@ export class LaunchTargetNode extends BaseNode {
|
||||||
let shortName: string;
|
let shortName: string;
|
||||||
|
|
||||||
if (!launchConfiguration) {
|
if (!launchConfiguration) {
|
||||||
shortName = "Unset";
|
shortName = localize("Unset", "Unset");
|
||||||
} else {
|
} else {
|
||||||
if (vscode.workspace.workspaceFolders) {
|
if (vscode.workspace.workspaceFolders) {
|
||||||
// In a complete launch target string, the binary path is relative to cwd.
|
// In a complete launch target string, the binary path is relative to cwd.
|
||||||
|
@ -169,8 +169,10 @@ export class ConfigurationNode extends BaseNode {
|
||||||
try {
|
try {
|
||||||
const item: vscode.TreeItem = new vscode.TreeItem(this._name);
|
const item: vscode.TreeItem = new vscode.TreeItem(this._name);
|
||||||
item.collapsibleState = vscode.TreeItemCollapsibleState.None;
|
item.collapsibleState = vscode.TreeItemCollapsibleState.None;
|
||||||
item.tooltip =
|
item.tooltip = localize(
|
||||||
"The makefile configuration currently selected from settings ('makefile.configurations').";
|
"makefile.currently.selected.configuration",
|
||||||
|
"The makefile configuration currently selected from settings ('makefile.configurations')."
|
||||||
|
);
|
||||||
item.contextValue = [`nodeType=configuration`].join(",");
|
item.contextValue = [`nodeType=configuration`].join(",");
|
||||||
return item;
|
return item;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -377,10 +379,12 @@ export class ProjectOutlineProvider
|
||||||
if (!pathInSettings) {
|
if (!pathInSettings) {
|
||||||
if (kind === "Build Log") {
|
if (kind === "Build Log") {
|
||||||
extension.updateBuildLogPresent(false);
|
extension.updateBuildLogPresent(false);
|
||||||
|
kind = localize("build.log", "Build Log");
|
||||||
} else if (kind === "Makefile") {
|
} else if (kind === "Makefile") {
|
||||||
extension.updateMakefileFilePresent(false);
|
extension.updateMakefileFilePresent(false);
|
||||||
}
|
}
|
||||||
return `${kind}: [Unset]`;
|
const unset = localize("Unset", "Unset");
|
||||||
|
return `${kind}: ${unset}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const pathInSettingsToTest: string | undefined =
|
const pathInSettingsToTest: string | undefined =
|
||||||
|
@ -401,12 +405,15 @@ export class ProjectOutlineProvider
|
||||||
|
|
||||||
if (kind === "Build Log") {
|
if (kind === "Build Log") {
|
||||||
extension.updateBuildLogPresent(checkFileExists);
|
extension.updateBuildLogPresent(checkFileExists);
|
||||||
|
kind = localize("build.log", "Build Log");
|
||||||
} else if (kind === "Makefile") {
|
} else if (kind === "Makefile") {
|
||||||
extension.updateMakefileFilePresent(checkFileExists);
|
extension.updateMakefileFilePresent(checkFileExists);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const notFound = localize("not.found", "not found");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
(!checkFileExists ? `${kind} (not found)` : `${kind}`) +
|
(!checkFileExists ? `${kind} (${notFound})` : `${kind}`) +
|
||||||
`: [${
|
`: [${
|
||||||
makeRelative
|
makeRelative
|
||||||
? util.makeRelPath(finalPath, util.getWorkspaceRoot())
|
? util.makeRelPath(finalPath, util.getWorkspaceRoot())
|
||||||
|
|
Загрузка…
Ссылка в новой задаче