Skip to content

Commit d24199e

Browse files
authored
Merge pull request #265 from naren2605/23.0.0
[JAVSCODE-253] adding/updating few language keys and some minor corrections
2 parents 8b899d1 + 6240a1c commit d24199e

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

vscode/l10n/bundle.l10n.en.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22

33
"jdk.downloader.heading": "JDK Downloader",
4-
54
"jdk.downloader.html.details":"<p>This tool enables you to download either the latest Oracle Java SE JDK with <a href='https://www.java.com/freeuselicense'>Oracle No-Fee Terms and Conditions</a> or the Oracle OpenJDK builds under the <a href='https://openjdk.org/legal/gplv2+ce.html'>GNU Public License with ClassPath Exception</a></p> <p>It will then handle the installation and configuration on your behalf.</p> <p>This enables you to take full advantage of all the features offered by this extension.</p>",
6-
75
"jdk.downloader.button.label.oracleJdk": "Download Oracle Java SE JDK",
86
"jdk.downloader.label.or": "or",
97
"jdk.downloader.button.label.openJdk": "Download Oracle OpenJDK",
@@ -85,15 +83,25 @@
8583
"jdk.extension.runConfig.wrkdir.prompt": "Customize working directory",
8684
"jdk.extenstion.notInstalled.label":"Extension not installed.",
8785
"jdk.extenstion.error_msg.clientNotAvailable":"Client not available",
88-
"jdk.extenstion.progressBar.error_msg.cannotRun":"cannot run ${lsCommand}; client is ${client}",
89-
"jdk.extenstion.error_msg.doesntSupportNewTeamplate":"Client ${client} doesn't support new from template",
90-
"jdk.extenstion.error_msg.doesntSupportNewProject":"Client ${client} doesn't support new project",
91-
"jdk.extenstion.error_msg.doesntSupportGoToTest":"Client ${client} doesn't support go to test",
86+
"jdk.extenstion.progressBar.error_msg.cannotRun":"cannot run {lsCommand}; client is {client}",
87+
"jdk.extenstion.error_msg.doesntSupportNewTeamplate":"Client {client} doesn't support new from template",
88+
"jdk.extenstion.error_msg.doesntSupportNewProject":"Client {client} doesn't support new project",
89+
"jdk.extenstion.error_msg.doesntSupportGoToTest":"Client {client} doesn't support go to test",
9290
"jdk.extenstion.error_msg.noSuperImpl":"No super implementation found",
9391
"jdk.extenstion.error_msg.cacheDeletionError":"Error deleting the cache",
9492
"jdk.extenstion.message.cacheDeleted":"Cache deleted successfully",
9593
"jdk.extenstion.cache.error_msg.cannotFindWrkSpacePath":"Cannot find workspace path",
9694
"jdk.extenstion.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SE Debug Server Adapter not yet initialized. Please wait for a while and try again.",
9795
"jdk.workspace.new.prompt": "Input the directory path where the new file will be generated",
98-
"jdk.extension.utils.error_message.failedHttpsRequest": "Failed to get {url} ({statusCode})"
99-
}
96+
"jdk.extension.utils.error_message.failedHttpsRequest": "Failed to get {url} ({statusCode})",
97+
"jdk.extension.error_msg.notEnabled": "{SERVER_NAME} not enabled",
98+
"LBL_Run": "Run {methodName}",
99+
"LBL_Debug": "Debug {methodName}",
100+
"LBL_RunWith": "Run {methodName} with {config}",
101+
"LBL_DebugWith": "Debug {methodName} with {config}",
102+
"LBL_TestMethod":"Test {methodName}",
103+
"LBL_ProfileMethod":"Profile {methodName}",
104+
"LBL_Clean":"Clean",
105+
"LBL_Build":"Build",
106+
"LBL_ContinuousMode":"Continuous Mode"
107+
}

vscode/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ function doActivateWithJDK(specifiedJDK: string | null, context: ExtensionContex
10281028
handleLog(log, `Please refer to troubleshooting section for more info: https://github.com/oracle/javavscode/blob/main/README.md#troubleshooting`);
10291029
log.show(false);
10301030
killNbProcess(false, log, p);
1031-
reject(`${SERVER_NAME} not enabled!`);
1031+
reject(l10n.value("jdk.extension.error_msg.notEnabled",{SERVER_NAME}));
10321032
} else {
10331033
handleLog(log, "LSP server " + p.pid + " terminated with " + code);
10341034
handleLog(log, "Exit code " + code);

0 commit comments

Comments
 (0)