More translation

Author: fcollonval

package-lock.json

@@ -34,12 +34,6 @@ import { diffNotebookGit, diffNotebookCheckpoint, isNbInGit } from './actions';
 
 const pluginId = 'nbdime-jupyterlab:plugin';
 
-/**
- * Error message if the nbdime API is unavailable.
- */
-const serverMissingMsg =
-  'Unable to query nbdime API. Is the server extension enabled?';
-
 const INITIAL_NETWORK_RETRY = 2; // ms
 
 export class NBDiffExtension
@@ -124,6 +118,13 @@ function addCommands(
   const editorFactory = editorServices.factoryService.newInlineEditor.bind(
     editorServices.factoryService,
   );
+  const trans = translator.load('nbdime');
+
+  /**
+   * Error message if the nbdime API is unavailable.
+   */
+  const serverMissingMsg =
+    trans.__('Unable to query nbdime API. Is the server extension enabled?');
 
   // Whether we have our server extension available
   let hasAPI = true;
@@ -199,8 +200,8 @@ function addCommands(
       //let content = current.notebook;
       //diffNotebook({base, remote, translator});
     },
-    label: erroredGen('Notebook diff'),
-    caption: erroredGen('Display nbdiff between two notebooks'),
+    label: erroredGen(trans.__('Notebook diff')),
+    caption: erroredGen(trans.__('Display nbdiff between two notebooks')),
     isEnabled: baseEnabled,
     iconClass:
       'jp-Icon jp-Icon-16 action-notebook-diff action-notebook-diff-notebooks',
@@ -225,9 +226,9 @@ function addCommands(
         shell.activateById(widget.id);
       }
     },
-    label: erroredGen('Notebook checkpoint diff'),
+    label: erroredGen(trans.__('Notebook checkpoint diff')),
     caption: erroredGen(
-      'Display nbdiff from checkpoint to currently saved version',
+      trans.__('Display nbdiff from checkpoint to currently saved version'),
     ),
     isEnabled: baseEnabled,
     iconClass:
@@ -252,9 +253,9 @@ function addCommands(
         shell.activateById(widget.id);
       }
     },
-    label: erroredGen('Notebook Git diff'),
+    label: erroredGen(trans.__('Notebook Git diff')),
     caption: erroredGen(
-      'Display nbdiff from git HEAD to currently saved version',
+      trans.__('Display nbdiff from git HEAD to currently saved version'),
     ),
     isEnabled: hasGitNotebook,
     iconClass:

packages/labextension/src/plugin.ts

@@ -124,6 +124,10 @@ export class NbdimeWidget extends Panel {
     let base = data['base'] as nbformat.INotebookContent;
     let diff = data['diff'] as any as IDiffEntry[];
     let nbdModel = new NotebookDiffModel(base, diff);
+    if (nbdModel.metadata) {
+      const trans = this.translator.load('nbdime');
+      nbdModel.metadata.collapsibleHeader = trans.__('Notebook metadata changed')
+    }
     let nbdWidget = new NotebookDiffWidget({
       model: nbdModel,
       rendermime: this.rendermime,
@@ -237,16 +241,16 @@ namespace Private {
     node.className = 'nbdime-Diff';
     node.innerHTML = `
       <div class="nbdime-header-buttonrow">
-        <label><input class="nbdime-hide-unchanged" type="checkbox">Hide unchanged cells</label>
-        <button class="nbdime-export" style="display: none">Export diff</button>
+        <label><input class="nbdime-hide-unchanged" type="checkbox"></label>
+        <button class="nbdime-export" style="display: none"></button>
       </div>
       <div class="nbdime-header-banner">
         <span class="nbdime-header-base"></span>
         <span class="nbdime-header-remote"></span>
       </div>`;
-    node.querySelector('input.nbdime-hide-unchanged')!.textContent = trans.__(
+    node.querySelector('.nbdime-header-buttonrow > label')!.insertAdjacentText('beforeend', trans.__(
       'Hide unchanged cells',
-    );
+    ));
     node.querySelector('button.nbdime-export')!.textContent =
       trans.__('Export diff');
     (

packages/labextension/src/widget.ts

@@ -14,6 +14,7 @@ import {
   ChangeDesc,
   RangeSetBuilder,
   RangeSet,
+  EditorState,
 } from '@codemirror/state';
 
 import {
@@ -1457,6 +1458,9 @@ export class MergeView extends Panel {
     const additionalExtensions = inMergeView
       ? [listener, mergeControlGutter, getCommonEditorExtensions(inMergeView)]
       : getCommonEditorExtensions(inMergeView);
+    additionalExtensions.push(EditorState.phrases.of({
+      '(…$ unchanged lines…)': this._trans.__('(…$ unchanged lines…)')
+    }))
     if (this._collapseIdentical >= 0) {
       additionalExtensions.push(CollapsedRangesField);
     }