Merge pull request #2964 from ocallesp/localize-variable

Localize Variable Explorer in vscode insiders
dotnet · May 4, 2023 · bad8771 · bad8771
2 parents 3fc4a4f + 6a5fe6f
commit bad8771
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/eng/Localize/LocProject.json b/eng/Localize/LocProject.json
@@ -54,6 +54,11 @@
           "SourceFile": "src\\polyglot-notebooks-vscode-insiders\\package.nls.json",
           "OutputPath": "src\\polyglot-notebooks-vscode-insiders",
           "CopyOption": "LangIDOnName"
+        },
+        {
+          "SourceFile": "src\\polyglot-notebooks-vscode-insiders\\l10n\\bundle.l10n.json",
+          "OutputPath": "src\\polyglot-notebooks-vscode-insiders\\l10n",
+          "CopyOption": "LangIDOnName"
         }
       ],
       "LanguageSet": "VS_Main_Languages"

diff --git a/src/polyglot-notebooks-vscode-common/src/variableExplorer.ts b/src/polyglot-notebooks-vscode-common/src/variableExplorer.ts
@@ -152,12 +152,12 @@ class WatchWindowTableViewProvider implements vscode.WebviewViewProvider {
         if (this.webview) {
 
             const localizationStrings: GridLocalization = {
-                actionsColumnHeader: 'Actions',
-                nameColumnHeader: 'Name',
-                valueColumnHeader: 'Value',
-                typeColumnHeader: 'Type',
-                kernelNameColumnHeader: 'Kernel',
-                shareTemplate: 'Share value {value-name} from {kernel-name} kernel'
+                actionsColumnHeader: this.translate('VariableGridColumnActions', 'Actions'),
+                nameColumnHeader: this.translate('VariableGridColumnName', 'Name'),
+                valueColumnHeader: this.translate('VariableGridColumnValue', 'Value'),
+                typeColumnHeader: this.translate('VariableGridColumnType', 'Type'),
+                kernelNameColumnHeader: this.translate('VariableGridColumnKernel', 'Kernel'),
+                shareTemplate: this.translate('VariableGridshareTemplate', 'Share value {value-name} from {kernel-name} kernel')
             };
 
             this.webview.postMessage({
@@ -168,6 +168,11 @@ class WatchWindowTableViewProvider implements vscode.WebviewViewProvider {
         }
     }
 
+    private translate(key: string, fallback: string): string {
+        const translation = vscode.l10n.t(key);
+        return translation === key ? fallback : translation;
+    }
+
     showNotebookVariables(notebookUri: vscodeLike.Uri | undefined) {
         let rows: VariableGridRow[] = [];
         if (notebookUri) {

diff --git a/src/polyglot-notebooks-vscode-insiders/l10n/bundle.l10n.json b/src/polyglot-notebooks-vscode-insiders/l10n/bundle.l10n.json
@@ -0,0 +1,8 @@
+{
+    "VariableGridColumnActions": "Actions",
+    "VariableGridColumnName": "Name",
+    "VariableGridColumnValue": "Value",
+    "VariableGridColumnType": "Type",
+    "VariableGridColumnKernel": "Kernel",
+    "VariableGridshareTemplate": "Share value {value-name} from {kernel-name} kernel"
+}
diff --git a/src/polyglot-notebooks-vscode-insiders/package.json b/src/polyglot-notebooks-vscode-insiders/package.json
@@ -65,6 +65,7 @@
     },
     "virtualWorkspaces": true
   },
+  "l10n": "./l10n",
   "contributes": {
     "notebooks": [
       {
@@ -842,4 +843,4 @@
     "vscode-uri": "3.0.6",
     "@vscode/l10n": "^0.0.10"
   }
-}
+}