Skip to content

Commit c14459a

Browse files
sid-srinisid-srini
authored
Merge pull request #285 from shivam71/Fix_Typos
Fixed typos in using l10n for localisation is typescript code and removed unused labels from bundles
2 parents c3a5440 + 08f6385 commit c14459a

File tree

5 files changed

+48
-58
lines changed

5 files changed

+48
-58
lines changed

‎vscode/l10n/bundle.l10n.en.json

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"jdk.downloader.message.completedInstallingJdk": "Completed installing JDK. Please reload Visual Studio Code to enable it.",
3939
"jdk.downloader.message.addedJdkPath": "Added JDK Path to the configuration settings. Please reload Visual Studio Code to enable it.",
4040
"jdk.downloader.message.reload": "Reload now",
41-
"jdk.explorer.error_message":"Cannot delete node {label}",
41+
"jdk.explorer.error_message.cannotDeleteNode":"Cannot delete node {label}",
4242
"jdk.extension.label.openInNewWindow": "Open in new window",
4343
"jdk.extension.label.addToWorkSpace": "Add to current workspace",
4444
"jdk.extension.message.newProjectCreated": "New project created",
@@ -81,27 +81,18 @@
8181
"jdk.extension.runConfig.env.prompt": "Customize environment variables",
8282
"jdk.extension.runConfig.wrkdir.label": "Working Dir:",
8383
"jdk.extension.runConfig.wrkdir.prompt": "Customize working directory",
84-
"jdk.extenstion.notInstalled.label":"Extension not installed.",
85-
"jdk.extenstion.error_msg.clientNotAvailable":"Client not available",
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",
90-
"jdk.extenstion.error_msg.noSuperImpl":"No super implementation found",
91-
"jdk.extenstion.error_msg.cacheDeletionError":"Error deleting the cache",
92-
"jdk.extenstion.message.cacheDeleted":"Cache deleted successfully",
93-
"jdk.extenstion.cache.error_msg.cannotFindWrkSpacePath":"Cannot find workspace path",
94-
"jdk.extenstion.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SE Debug Server Adapter not yet initialized. Please wait for a while and try again.",
84+
"jdk.extension.notInstalled.label":"Extension not installed.",
85+
"jdk.extension.error_msg.clientNotAvailable":"Client not available",
86+
"jdk.extension.progressBar.error_msg.cannotRun":"cannot run {lsCommand}; client is {client}",
87+
"jdk.extension.error_msg.doesntSupportNewTeamplate":"Client {client} doesn't support new from template",
88+
"jdk.extension.error_msg.doesntSupportNewProject":"Client {client} doesn't support new project",
89+
"jdk.extension.error_msg.doesntSupportGoToTest":"Client {client} doesn't support go to test",
90+
"jdk.extension.error_msg.noSuperImpl":"No super implementation found",
91+
"jdk.extension.error_msg.cacheDeletionError":"Error deleting the cache",
92+
"jdk.extension.message.cacheDeleted":"Cache deleted successfully",
93+
"jdk.extension.cache.error_msg.cannotFindWrkSpacePath":"Cannot find workspace path",
94+
"jdk.extension.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SE Debug Server Adapter not yet initialized. Please wait for a while and try again.",
9595
"jdk.workspace.new.prompt": "Input the directory path where the new file will be generated",
9696
"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"
97+
"jdk.extension.error_msg.notEnabled": "{SERVER_NAME} not enabled"
10798
}

‎vscode/l10n/bundle.l10n.ja.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"jdk.downloader.message.completedInstallingJdk": "JDKのインストールが完了しました。有効にするには、Visual Studio Codeをリロードしてください。",
3939
"jdk.downloader.message.addedJdkPath": "構成設定にJDKパスを追加しました。有効にするには、Visual Studio Codeをリロードしてください。",
4040
"jdk.downloader.message.reload": "すぐにリロード",
41-
"jdk.explorer.error_message":"ノード{label}を削除できません",
41+
"jdk.explorer.error_message.cannotDeleteNode":"ノード{label}を削除できません",
4242
"jdk.extension.label.openInNewWindow": "新規ウィンドウで開く",
4343
"jdk.extension.label.addToWorkSpace": "現在のワークスペースに追加",
4444
"jdk.extension.message.newProjectCreated": "作成された新規プロジェクト",
@@ -81,17 +81,17 @@
8181
"jdk.extension.runConfig.env.prompt": "環境変数のカスタマイズ",
8282
"jdk.extension.runConfig.wrkdir.label": "作業ディレクトリ:",
8383
"jdk.extension.runConfig.wrkdir.prompt": "作業ディレクトリのカスタマイズ",
84-
"jdk.extenstion.notInstalled.label":"拡張機能がインストールされませんでした。",
85-
"jdk.extenstion.error_msg.clientNotAvailable":"クライアントを使用できません",
86-
"jdk.extenstion.progressBar.error_msg.cannotRun":"{lsCommand}を実行できません。クライアントは{client}です",
87-
"jdk.extenstion.error_msg.doesntSupportNewTeamplate":"クライアント{client}では、「テンプレートから新規作成」はサポートされていません",
88-
"jdk.extenstion.error_msg.doesntSupportNewProject":"クライアント{client}では、新規プロジェクトはサポートされていません",
89-
"jdk.extenstion.error_msg.doesntSupportGoToTest":"クライアント{client}では、「テストへ移動」はサポートされていません",
90-
"jdk.extenstion.error_msg.noSuperImpl":"スーパークラスの実装が見つかりません",
91-
"jdk.extenstion.error_msg.cacheDeletionError":"キャッシュの削除中にエラーが発生しました",
92-
"jdk.extenstion.message.cacheDeleted":"キャッシュが正常に削除されました",
93-
"jdk.extenstion.cache.error_msg.cannotFindWrkSpacePath":"ワークスペース・パスが見つかりません",
94-
"jdk.extenstion.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SEのデバッグ・サーバー・アダプタが、まだ初期化されていません。しばらく待ってから再試行してください。",
84+
"jdk.extension.notInstalled.label":"拡張機能がインストールされませんでした。",
85+
"jdk.extension.error_msg.clientNotAvailable":"クライアントを使用できません",
86+
"jdk.extension.progressBar.error_msg.cannotRun":"{lsCommand}を実行できません。クライアントは{client}です",
87+
"jdk.extension.error_msg.doesntSupportNewTeamplate":"クライアント{client}では、「テンプレートから新規作成」はサポートされていません",
88+
"jdk.extension.error_msg.doesntSupportNewProject":"クライアント{client}では、新規プロジェクトはサポートされていません",
89+
"jdk.extension.error_msg.doesntSupportGoToTest":"クライアント{client}では、「テストへ移動」はサポートされていません",
90+
"jdk.extension.error_msg.noSuperImpl":"スーパークラスの実装が見つかりません",
91+
"jdk.extension.error_msg.cacheDeletionError":"キャッシュの削除中にエラーが発生しました",
92+
"jdk.extension.message.cacheDeleted":"キャッシュが正常に削除されました",
93+
"jdk.extension.cache.error_msg.cannotFindWrkSpacePath":"ワークスペース・パスが見つかりません",
94+
"jdk.extension.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SEのデバッグ・サーバー・アダプタが、まだ初期化されていません。しばらく待ってから再試行してください。",
9595
"jdk.workspace.new.prompt": "新しいファイルを生成するディレクトリのパスを入力してください",
9696
"jdk.extension.utils.error_message.failedHttpsRequest": "{url}の取得に失敗しました({statusCode})",
9797
"jdk.extension.error_msg.notEnabled": "{SERVER_NAME}が有効化されていません"

‎vscode/l10n/bundle.l10n.zh-cn.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"jdk.downloader.message.completedInstallingJdk": "已完成 JDK 安装。请重新加载 Visual Studio Code 来启用它。",
3939
"jdk.downloader.message.addedJdkPath": "已将 JDK 路径添加到配置设置。请重新加载 Visual Studio Code 来启用它。",
4040
"jdk.downloader.message.reload": "立即重新加载",
41-
"jdk.explorer.error_message":"无法删除节点 {label}",
41+
"jdk.explorer.error_message.cannotDeleteNode":"无法删除节点 {label}",
4242
"jdk.extension.label.openInNewWindow": "在新窗口中打开",
4343
"jdk.extension.label.addToWorkSpace": "添加到当前工作区",
4444
"jdk.extension.message.newProjectCreated": "已创建新项目",
@@ -81,17 +81,17 @@
8181
"jdk.extension.runConfig.env.prompt": "定制环境变量",
8282
"jdk.extension.runConfig.wrkdir.label": "工作目录：",
8383
"jdk.extension.runConfig.wrkdir.prompt": "定制工作目录",
84-
"jdk.extenstion.notInstalled.label":"未安装扩展。",
85-
"jdk.extenstion.error_msg.clientNotAvailable":"客户端不可用",
86-
"jdk.extenstion.progressBar.error_msg.cannotRun":"无法运行 {lsCommand}；客户端为 {client}",
87-
"jdk.extenstion.error_msg.doesntSupportNewTeamplate":"客户端 {client} 不支持从模板新建",
88-
"jdk.extenstion.error_msg.doesntSupportNewProject":"客户端 {client} 不支持新项目",
89-
"jdk.extenstion.error_msg.doesntSupportGoToTest":"客户端 {client} 不支持转至测试",
90-
"jdk.extenstion.error_msg.noSuperImpl":"未找到超级实现",
91-
"jdk.extenstion.error_msg.cacheDeletionError":"删除高速缓存时出错",
92-
"jdk.extenstion.message.cacheDeleted":"已成功删除高速缓存",
93-
"jdk.extenstion.cache.error_msg.cannotFindWrkSpacePath":"找不到工作区路径",
94-
"jdk.extenstion.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SE 调试服务器适配器尚未初始化。请稍候，然后重试。",
84+
"jdk.extension.notInstalled.label":"未安装扩展。",
85+
"jdk.extension.error_msg.clientNotAvailable":"客户端不可用",
86+
"jdk.extension.progressBar.error_msg.cannotRun":"无法运行 {lsCommand}；客户端为 {client}",
87+
"jdk.extension.error_msg.doesntSupportNewTeamplate":"客户端 {client} 不支持从模板新建",
88+
"jdk.extension.error_msg.doesntSupportNewProject":"客户端 {client} 不支持新项目",
89+
"jdk.extension.error_msg.doesntSupportGoToTest":"客户端 {client} 不支持转至测试",
90+
"jdk.extension.error_msg.noSuperImpl":"未找到超级实现",
91+
"jdk.extension.error_msg.cacheDeletionError":"删除高速缓存时出错",
92+
"jdk.extension.message.cacheDeleted":"已成功删除高速缓存",
93+
"jdk.extension.cache.error_msg.cannotFindWrkSpacePath":"找不到工作区路径",
94+
"jdk.extension.debugger.error_msg.debugAdapterNotInitialized":"Oracle Java SE 调试服务器适配器尚未初始化。请稍候，然后重试。",
9595
"jdk.workspace.new.prompt": "输入生成新文件的目录路径",
9696
"jdk.extension.utils.error_message.failedHttpsRequest": "无法获取 {url} ({statusCode})",
9797
"jdk.extension.error_msg.notEnabled": "{SERVER_NAME} 未启用"

‎vscode/package.nls.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,4 @@
6565
"jdk.configurationSnippets.name": "Launch Java App",
6666
"jdk.configurationSnippets.label": "Java+: Launch Java Application",
6767
"jdk.configurationSnippets.description": "Launch a Java Application in debug mode"
68-
6968
}

‎vscode/src/extension.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ export function awaitClient() : Promise<NbLanguageClient> {
158158
}
159159
let nbcode = vscode.extensions.getExtension(ORACLE_VSCODE_EXTENSION_ID);
160160
if (!nbcode) {
161-
return Promise.reject(new Error(l10n.value("jdk.extenstion.notInstalled.label")));
161+
return Promise.reject(new Error(l10n.value("jdk.extension.notInstalled.label")));
162162
}
163163
const t : Thenable<NbLanguageClient> = nbcode.activate().then(nc => {
164164
if (client === undefined || client instanceof InitialPromise) {
165-
throw new Error(l10n.value("jdk.extenstion.error_msg.clientNotAvailable"));
165+
throw new Error(l10n.value("jdk.extension.error_msg.clientNotAvailable"));
166166
} else {
167167
return client;
168168
}
@@ -312,7 +312,7 @@ function wrapCommandWithProgress(lsCommand : string, title : string, log? : vsco
312312
}
313313
}
314314
} else {
315-
reject(l10n.value("jdk.extenstion.progressBar.error_msg.cannotRun",{lsCommand:lsCommand,client:c}));
315+
reject(l10n.value("jdk.extension.progressBar.error_msg.cannotRun",{lsCommand:lsCommand,client:c}));
316316
}
317317
});
318318
});
@@ -435,7 +435,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
435435
}
436436
}
437437
} else {
438-
throw l10n.value("jdk.extenstion.error_msg.doesntSupportNewTeamplate",{client:c});
438+
throw l10n.value("jdk.extension.error_msg.doesntSupportNewTeamplate",{client:c});
439439
}
440440
}));
441441
context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.workspace.newproject', async (ctx) => {
@@ -457,7 +457,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
457457
}
458458
}
459459
} else {
460-
throw l10n.value("jdk.extenstion.error_msg.doesntSupportNewProject",{client,c});
460+
throw l10n.value("jdk.extension.error_msg.doesntSupportNewProject",{client:c});
461461
}
462462
}));
463463

@@ -512,14 +512,14 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
512512
vscode.window.showInformationMessage(err?.message || l10n.value("jdk.extension.fileSelector.label.noTestFound"));
513513
}
514514
} else {
515-
throw l10n.value("jdk.extenstion.error_msg.doesntSupportGoToTest",{client:c});
515+
throw l10n.value("jdk.extension.error_msg.doesntSupportGoToTest",{client:c});
516516
}
517517
}));
518518

519519
context.subscriptions.push(vscode.commands.registerCommand(COMMAND_PREFIX + ".delete.cache", async () => {
520520
const storagePath = context.storageUri?.fsPath;
521521
if (!storagePath) {
522-
vscode.window.showErrorMessage(l10n.value("jdk.extenstion.cache.error_msg.cannotFindWrkSpacePath"));
522+
vscode.window.showErrorMessage(l10n.value("jdk.extension.cache.error_msg.cannotFindWrkSpacePath"));
523523
return;
524524
}
525525

@@ -536,9 +536,9 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
536536
deactivated = true;
537537
await killNbProcess(false, log);
538538
await fs.promises.rmdir(userDir, { recursive: true });
539-
await vscode.window.showInformationMessage(l10n.value("jdk.extenstion.message.cacheDeleted"), reloadWindowActionLabel);
539+
await vscode.window.showInformationMessage(l10n.value("jdk.extension.message.cacheDeleted"), reloadWindowActionLabel);
540540
} catch (err) {
541-
await vscode.window.showErrorMessage(l10n.value("jdk.extenstion.error_msg.cacheDeletionError"), reloadWindowActionLabel);
541+
await vscode.window.showErrorMessage(l10n.value("jdk.extension.error_msg.cacheDeletionError"), reloadWindowActionLabel);
542542
} finally {
543543
vscode.commands.executeCommand("workbench.action.reloadWindow");
544544
}
@@ -579,7 +579,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
579579
const locations: any[] = await vscode.commands.executeCommand(COMMAND_PREFIX + '.java.super.implementation', uri.toString(), position) || [];
580580
return vscode.commands.executeCommand('editor.action.goToLocations', window.activeTextEditor.document.uri, position,
581581
locations.map(location => new vscode.Location(vscode.Uri.parse(location.uri), new vscode.Range(location.range.start.line, location.range.start.character, location.range.end.line, location.range.end.character))),
582-
'peek', l10n.value('jdk.extenstion.error_msg.noSuperImpl'));
582+
'peek', l10n.value('jdk.extension.error_msg.noSuperImpl'));
583583
}));
584584
context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.rename.element.at', async (offset) => {
585585
const editor = window.activeTextEditor;
@@ -1525,7 +1525,7 @@ class NetBeansDebugAdapterDescriptionFactory implements vscode.DebugAdapterDescr
15251525
if (cnt-- > 0) {
15261526
setTimeout(fnc, 1000);
15271527
} else {
1528-
reject(new Error(l10n.value('jdk.extenstion.debugger.error_msg.debugAdapterNotInitialized')));
1528+
reject(new Error(l10n.value('jdk.extension.debugger.error_msg.debugAdapterNotInitialized')));
15291529
}
15301530
} else {
15311531
// resolve(new vscode.DebugAdapterServer(debugPort));

0 commit comments

Comments
 (0)