Fixed l10n messages remaining and updated failing tests

Author: sid-srini

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/CodeEval.java

@@ -46,13 +46,15 @@
  *
  * @author atalati
  */
-@NbBundle.Messages({"InterruptCodeCell.exec.success=Code execution stopped successfully",
-"InterruptCodeCell.info.msg=Code execution stopped successfully"})
+@NbBundle.Messages({
+    "MSG_InterruptCodeCellExecSuccess=Code execution stopped successfully",
+    "MSG_InterruptCodeCellInfo=Code execution was interrupted"
+})
 public class CodeEval {
 
     private static final Logger LOG = Logger.getLogger(CodeEval.class.getName());
-    private static final String CODE_EXEC_INTERRUPT_SUCCESS_MESSAGE = Bundle.InterruptCodeCell_exec_success();
-    private static final String CODE_EXEC_INTERRUPTED_MESSAGE = Bundle.InterruptCodeCell_info_msg();
+    private static final String CODE_EXEC_INTERRUPT_SUCCESS_MESSAGE = Bundle.MSG_InterruptCodeCellExecSuccess();
+    private static final String CODE_EXEC_INTERRUPTED_MESSAGE = Bundle.MSG_InterruptCodeCellInfo();
     private static final Pattern LINEBREAK = Pattern.compile("\\R");
 
     private final Map<String, RequestProcessor> codeExecMap = new ConcurrentHashMap<>();

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/CustomInputStream.java

@@ -32,13 +32,15 @@
  *
  * @author atalati
  */
-@NbBundle.Messages({"GetUserInput.msg=Please provide scanner input here"})
+@NbBundle.Messages({
+    "PROMPT_GetUserInput=Please provide scanner input here"
+})
 public class CustomInputStream extends InputStream {
 
     private static final Logger LOG = Logger.getLogger(CustomInputStream.class.getName());
     private ByteArrayInputStream currentStream;
     private final WeakReference<NbCodeLanguageClient> client;
-    private static final String USER_PROMPT_REQUEST = Bundle.GetUserInput_msg();
+    private static final String USER_PROMPT_REQUEST = Bundle.PROMPT_GetUserInput();
 
     public CustomInputStream(NbCodeLanguageClient client) {
         this.client = new WeakReference<>(client);

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookDocumentServiceHandlerImpl.java

@@ -80,9 +80,12 @@
  * @author atalati
  */
 @ServiceProvider(service = NotebookDocumentServiceHandler.class)
-@NbBundle.Messages({"kernel.initializing=Intializing Java kernel for notebook.",
-    "kernel.initialize.success=Java kernel initialized successfully.",
-    "kernel.initialize.failed=Error could not initialize Java kernel for the notebook."})
+@NbBundle.Messages({
+    "MSG_KernelInitializing=Intializing Java kernel for notebook",
+    "MSG_KernelInitializeSuccess=Java kernel initialized successfully.",
+    "# {0} - error message",
+    "MSG_KernelInitializeFailed=Java kernel initialization for the notebook failed. Error {0}"
+})
 public class NotebookDocumentServiceHandlerImpl implements NotebookDocumentServiceHandler {
 
     private static final Logger LOG = Logger.getLogger(NotebookDocumentServiceHandler.class.getName());
@@ -97,13 +100,13 @@ public void didOpen(DidOpenNotebookDocumentParams params) {
             if (client == null) {
                 return;
             }
-            client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, Bundle.kernel_initializing()));
+            client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, Bundle.MSG_KernelInitializing()));
             NotebookSessionManager.getInstance().createSession(params.getNotebookDocument()).whenComplete((JShell jshell, Throwable t) -> {
                 if (t == null) {
-                    client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, Bundle.kernel_initialize_success()));
+                    client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, Bundle.MSG_KernelInitializeSuccess()));
                 } else {
                     // if package import fails user is not informed ?
-                    client.showMessage(new MessageParams(MessageType.Error, Bundle.kernel_initialize_failed()));
+                    client.showMessage(new MessageParams(MessageType.Error, Bundle.MSG_KernelInitializeFailed(t.getMessage())));
                     LOG.log(Level.SEVERE, "Error could not initialize Java kernel for the notebook. : {0}", t.getMessage());
                 }
             });

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/project/ProjectContext.java

@@ -39,10 +39,13 @@
  *
  * @author atalati
  */
-@NbBundle.Messages({"Select.project.title=Select Project",
-"CurrentProjectContext.title=Current project context: ",
-"NoProjectFound.msg=No projects found",
-"NoProjectContextFound.msg=No project context"})
+@NbBundle.Messages({
+    "PROMPT_SelectProjectTitle=Select Project",
+    "# {0} - project name",
+    "LBL_CurrentProjectContext=Current project context: {0}",
+    "MSG_NoProjectFound=No projects found",
+    "MSG_NoProjectContextFound=No project context"
+})
 public class ProjectContext {
 
     public static Project getProject(String uri) {
@@ -92,7 +95,7 @@ private static CompletableFuture<List<Project>> selectFromMultipleProjects(Proje
         if (client == null) {
             return CompletableFuture.completedFuture(new ArrayList<>());
         }
-        String title = Bundle.Select_project_title();
+        String title = Bundle.PROMPT_SelectProjectTitle();
         List<QuickPickItem> items = new ArrayList<>();
         Map<String, Project> prjMap = new HashMap<>();
         for (Project prj : prjs) {
@@ -101,8 +104,8 @@ private static CompletableFuture<List<Project>> selectFromMultipleProjects(Proje
             prjMap.put(displayName, prj);
             items.add(item);
         }
-        String placeholder = defaultPrjSelected != null ? Bundle.CurrentProjectContext_title() + defaultPrjSelected.getName()
-                : items.isEmpty() ? Bundle.NoProjectFound_msg() : Bundle.NoProjectContextFound_msg();
+        String placeholder = defaultPrjSelected != null ? Bundle.LBL_CurrentProjectContext(defaultPrjSelected.getName())
+                : items.isEmpty() ? Bundle.MSG_NoProjectFound() : Bundle.MSG_NoProjectFound();
 
         ShowQuickPickParams params = new ShowQuickPickParams(title, placeholder, false, items);
         return client.showQuickPick(params).thenApply(selected -> {

vscode/l10n/bundle.l10n.en.json

@@ -88,7 +88,8 @@
   "jdk.extension.error_msg.doesntSupportNewTeamplate":"Client {client} doesn't support creating a new file from template",
   "jdk.extension.error_msg.doesntSupportNewProject":"Client {client} doesn't support new project",
   "jdk.extension.error_msg.doesntSupportGoToTest":"Client {client} doesn't support go to test",
-  "jdk.extension.error_msg.doesntSupportNoteboookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportNotebookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportJShellExecution":"Language Server for {client} doesn't support JShell execution",
   "jdk.extension.error_msg.noSuperImpl":"No super implementation found",
   "jdk.extension.error_msg.cacheDeletionError":"Error deleting the cache",
   "jdk.extension.message.cacheDeleted":"Cache deleted successfully",
@@ -108,15 +109,15 @@
   "jdk.notebook.create.error_msg.invalid.notebook.name": "Invalid notebook file name",
   "jdk.notebook.create.error_msg.invalid.notebook.path": "A notebook already exists with the same name. Please use a different name or folder.",
   "jdk.notebook.create.error_msg.failed": "Failed to create a notebook",
-  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching Jshell",
+  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching JShell",
   "jdk.notebook.project.mapping.error_msg.failed": "An error occurred while changing the project context of the notebook",
-  "jdk.notebook.create.new.notebook.input.name": "Enter new Java notebook file name",
+  "jdk.notebook.create.new.notebook.input.name": "Enter a file name for the new Java notebook",
   "jdk.notebook.parsing.empty.file.error_msg.title": "Empty Notebook",
   "jdk.notebook.parsing.empty.file.error_msg.desc": "The notebook file appears to be empty.",
   "jdk.notebook.parsing.error_msg.title": "Error Opening Notebook",
   "jdk.notebook.parsing.error_msg.desc": "Failed to open notebook: {message}",
   "jdk.notebook.parsing.invalid.structure.error_msg.title": "Invalid Notebook Structure",
-  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid `cells` array.",
+  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid cells array.",
   "jdk.notebook.cell.parsing.error_msg.title": "Cell parsing error",
   "jdk.notebook.cell.type.error_msg": "Invalid cell type: {cellType}",
   "jdk.notebook.cell.missing.error_msg": "Missing field: {fieldName}",

vscode/l10n/bundle.l10n.ja.json

@@ -88,7 +88,8 @@
   "jdk.extension.error_msg.doesntSupportNewTeamplate":"クライアント{client}では、「テンプレートからファイル新規作成」はサポートされていません",
   "jdk.extension.error_msg.doesntSupportNewProject":"クライアント{client}では、新規プロジェクトはサポートされていません",
   "jdk.extension.error_msg.doesntSupportGoToTest":"クライアント{client}では、「テストへ移動」はサポートされていません",
-  "jdk.extension.error_msg.doesntSupportNoteboookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportNotebookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportJShellExecution":"Language Server for {client} doesn't support JShell execution",
   "jdk.extension.error_msg.noSuperImpl":"スーパークラスの実装が見つかりません",
   "jdk.extension.error_msg.cacheDeletionError":"キャッシュの削除中にエラーが発生しました",
   "jdk.extension.message.cacheDeleted":"キャッシュが正常に削除されました",
@@ -108,21 +109,21 @@
   "jdk.notebook.create.error_msg.invalid.notebook.name": "Invalid notebook file name",
   "jdk.notebook.create.error_msg.invalid.notebook.path": "A notebook already exists with the same name. Please use a different name or folder.",
   "jdk.notebook.create.error_msg.failed": "Failed to create a notebook",
-  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching Jshell",
+  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching JShell",
   "jdk.notebook.project.mapping.error_msg.failed": "An error occurred while changing the project context of the notebook",
-  "jdk.notebook.create.new.notebook.input.name": "Enter new Java notebook file name",
+  "jdk.notebook.create.new.notebook.input.name": "Enter a file name for the new Java notebook",
   "jdk.notebook.parsing.empty.file.error_msg.title": "Empty Notebook",
   "jdk.notebook.parsing.empty.file.error_msg.desc": "The notebook file appears to be empty.",
   "jdk.notebook.parsing.error_msg.title": "Error Opening Notebook",
   "jdk.notebook.parsing.error_msg.desc": "Failed to open notebook: {message}",
   "jdk.notebook.parsing.invalid.structure.error_msg.title": "Invalid Notebook Structure",
-  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid `cells` array.",
+  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid cells array.",
   "jdk.notebook.cell.parsing.error_msg.title": "Cell parsing error",
   "jdk.notebook.cell.type.error_msg": "Invalid cell type: {cellType}",
   "jdk.notebook.cell.missing.error_msg": "Missing field: {fieldName}",
   "jdk.notebook.serializer.error_msg": "Failed to serialize notebook: {errorMessage}",
   "jdk.notebook.cell.serializer.error_msg": "Failed to serialize one or more cells",
   "jdk.notebook.validation.failed.error_msg": "Notebook JSON validation failed",
-  "jdk.notebook.mime_type.not.found.cell.output": "Mime Type: {mimeType}\nContent Length: {contentLength}",
+  "jdk.notebook.mime_type.not.found.cell.output": "Mime Type: {mimeType}, Content Length: {contentLength}",
   "jdk.notebook.cell.language.not.found": "Doesn't support {languageId} execution"
 }

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

@@ -88,7 +88,8 @@
   "jdk.extension.error_msg.doesntSupportNewTeamplate":"客户端 {client} 不支持从模板新建文件",
   "jdk.extension.error_msg.doesntSupportNewProject":"客户端 {client} 不支持新项目",
   "jdk.extension.error_msg.doesntSupportGoToTest":"客户端 {client} 不支持转至测试",
-  "jdk.extension.error_msg.doesntSupportNoteboookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportNotebookCellExecution":"Language Server for {client} doesn't support notebook cell execution",
+  "jdk.extension.error_msg.doesntSupportJShellExecution":"Language Server for {client} doesn't support JShell execution",
   "jdk.extension.error_msg.noSuperImpl":"未找到超类实现",
   "jdk.extension.error_msg.cacheDeletionError":"删除高速缓存时出错",
   "jdk.extension.message.cacheDeleted":"已成功删除高速缓存",
@@ -108,21 +109,21 @@
   "jdk.notebook.create.error_msg.invalid.notebook.name": "Invalid notebook file name",
   "jdk.notebook.create.error_msg.invalid.notebook.path": "A notebook already exists with the same name. Please use a different name or folder.",
   "jdk.notebook.create.error_msg.failed": "Failed to create a notebook",
-  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching Jshell",
+  "jdk.jshell.open.error_msg.failed": "Some error occurred while launching JShell",
   "jdk.notebook.project.mapping.error_msg.failed": "An error occurred while changing the project context of the notebook",
-  "jdk.notebook.create.new.notebook.input.name": "Enter new Java notebook file name",
+  "jdk.notebook.create.new.notebook.input.name": "Enter a file name for the new Java notebook",
   "jdk.notebook.parsing.empty.file.error_msg.title": "Empty Notebook",
   "jdk.notebook.parsing.empty.file.error_msg.desc": "The notebook file appears to be empty.",
   "jdk.notebook.parsing.error_msg.title": "Error Opening Notebook",
   "jdk.notebook.parsing.error_msg.desc": "Failed to open notebook: {message}",
   "jdk.notebook.parsing.invalid.structure.error_msg.title": "Invalid Notebook Structure",
-  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid `cells` array.",
+  "jdk.notebook.parsing.invalid.structure.error_msg.desc": "Missing or invalid cells array.",
   "jdk.notebook.cell.parsing.error_msg.title": "Cell parsing error",
   "jdk.notebook.cell.type.error_msg": "Invalid cell type: {cellType}",
   "jdk.notebook.cell.missing.error_msg": "Missing field: {fieldName}",
   "jdk.notebook.serializer.error_msg": "Failed to serialize notebook: {errorMessage}",
   "jdk.notebook.cell.serializer.error_msg": "Failed to serialize one or more cells",
   "jdk.notebook.validation.failed.error_msg": "Notebook JSON validation failed",
-  "jdk.notebook.mime_type.not.found.cell.output": "Mime Type: {mimeType}\nContent Length: {contentLength}",
+  "jdk.notebook.mime_type.not.found.cell.output": "Mime Type: {mimeType}, Content Length: {contentLength}",
   "jdk.notebook.cell.language.not.found": "Doesn't support {languageId} execution"
 }

vscode/package.nls.ja.json

@@ -73,6 +73,7 @@
     "jdk.notebook.addmodules.description": "The specific modules for use in Java notebooks. Defaults to modules of the project context, when empty.",
     "jdk.notebook.enablePreview.description": "Enable the use of Java preview features in Java notebooks",
     "jdk.notebook.implicitImports.description": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of java.util, java.io and java.math packages, when empty.",
+    "jdk.notebook.implicitImports.markdownDescription": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of `java.util`, `java.io` and `java.math` packages, when empty.",
     "jdk.notebook.projects.mapping.description": "Mapping of Java notebook paths to the path of the project that provides it context.",
     "jdk.configuration.java.completion.commit.chars": "コード補完の提案の受入れをトリガーする文字を指定します。たとえば、ピリオド(.)を入力したときに提案を受け入れるには、これを[\".\"]に設定します",
     "jdk.initialConfigurations.launchJavaApp.name": "Javaアプリケーションの起動",

vscode/package.nls.json

@@ -73,6 +73,7 @@
     "jdk.notebook.addmodules.description": "The specific modules for use in Java notebooks. Defaults to modules of the project context, when empty.",
     "jdk.notebook.enablePreview.description": "Enable the use of Java preview features in Java notebooks",
     "jdk.notebook.implicitImports.description": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of java.util, java.io and java.math packages, when empty.",
+    "jdk.notebook.implicitImports.markdownDescription": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of `java.util`, `java.io` and `java.math` packages, when empty.",
     "jdk.notebook.projects.mapping.description": "Mapping of Java notebook paths to the path of the project that provides it context.",
     "jdk.configuration.java.completion.commit.chars": "Specifies the characters that trigger accepting a code completion suggestion. For example, to accept suggestions when typing a dot (.), set this to [\".\"]",
     "jdk.initialConfigurations.launchJavaApp.name": "Launch Java App",

vscode/package.nls.zh-cn.json

@@ -73,6 +73,7 @@
     "jdk.notebook.addmodules.description": "The specific modules for use in Java notebooks. Defaults to modules of the project context, when empty.",
     "jdk.notebook.enablePreview.description": "Enable the use of Java preview features in Java notebooks",
     "jdk.notebook.implicitImports.description": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of java.util, java.io and java.math packages, when empty.",
+    "jdk.notebook.implicitImports.markdownDescription": "List of elements to implicitly import in Java notebooks. Defaults to star-imports of `java.util`, `java.io` and `java.math` packages, when empty.",
     "jdk.notebook.projects.mapping.description": "Mapping of Java notebook paths to the path of the project that provides it context.",
     "jdk.configuration.java.completion.commit.chars": "指定用于触发接受代码补全建议的字符。例如，要在键入点 (.) 时接受建议，请将该字符设为 [\".\"]",
     "jdk.initialConfigurations.launchJavaApp.name": "启动 Java 应用程序",