merge upstream

Author: bollwyvl

CHANGELOG.md

@@ -1,13 +1,11 @@
 ## Changelog
 
-### `jupyter-lsp 1.6.0` (unreleased)
+### `@krassowski/jupyterlab-lsp 3.9.3` (2021-12-19)
 
-- compatibility:
-  - raises the minimum supported Python to 3.7 as 3.6 reaches its end-of-life ([#723])
-- maintenance and upkeep:
-  - adds Python 3.10, PyPy 3.7, and R 4.x to the automated tests ([#723])
+- bug fixes:
+  - workaround upstream issue in merging translation ([#726], thanks @fcollonval)
 
-[#768]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/723
+[#726]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/726
 
 ### `@krassowski/jupyterlab-lsp 3.9.2` (2021-12-12)
 

package.json

@@ -13,7 +13,6 @@
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.21.5",
     "husky": "^3.0.9",
-    "typescript-language-server": "^0.6.4",
     "jest-github-actions-reporter": "^1.0.2",
     "lerna": "^3.13.2",
     "npm-run-all": "^4.1.5",
@@ -22,6 +21,7 @@
     "pyright": "^1.1",
     "sql-language-server": "^1.1.0",
     "typescript": "~4.1.3",
+    "typescript-language-server": "^0.6.4",
     "unified-language-server": "^0.3.0",
     "vscode-css-languageserver-bin": "^1.4.0",
     "vscode-html-languageserver-bin": "^1.4.0",

packages/jupyterlab-lsp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",

packages/jupyterlab-lsp/src/components/statusbar.tsx

@@ -844,7 +844,8 @@ export namespace LSPStatus {
           uninitialized.delete(initialized);
         }
         // servers for n documents did not respond to the initialization request
-        msg = this.trans._n(
+        msg = this.trans._np(
+          'pluralized',
           'Fully connected, but %2/%3 virtual document stuck uninitialized: %4',
           'Fully connected, but %2/%3 virtual documents stuck uninitialized: %4',
           status.detected_documents.size,
@@ -858,7 +859,8 @@ export namespace LSPStatus {
           unconnected.delete(connected);
         }
 
-        msg = this.trans._n(
+        msg = this.trans._np(
+          'pluralized',
           '%2/%3 virtual document connected (%4 connections; waiting for: %5)',
           '%2/%3 virtual documents connected (%4 connections; waiting for: %5)',
           status.detected_documents.size,

packages/metapackage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp-metapackage",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp",
   "bugs": {