More translator propagation

Author: fcollonval

packages/nbdime/src/common/collapsiblepanel.ts

@@ -22,9 +22,7 @@ export class CollapsiblePanel extends Panel {
     let header = new Panel();
     header.addClass(COLLAPSIBLE_HEADER);
     if (headerTitle) {
-      // let title = document.createElement('span');
-      header.node.innerText = headerTitle;
-      // header.appendChild(title);
+      header.node.textContent = headerTitle;
     }
     let button = document.createElement('button');
     button.className = COLLAPSIBLE_HEADER_ICON;
@@ -37,8 +35,7 @@ export class CollapsiblePanel extends Panel {
     super();
     this.addClass(COLLAPSIBLE_CLASS);
     this.inner = inner;
-    let constructor = this.constructor as typeof CollapsiblePanel;
-    let header = constructor.createHeader(headerTitle);
+    let header = CollapsiblePanel.createHeader(headerTitle);
     this.header = header;
     this.button = header.node.getElementsByClassName(
       COLLAPSIBLE_HEADER_ICON,

packages/nbdime/src/diff/widget/cell.ts

@@ -107,6 +107,7 @@ export class CellDiffWidget extends DiffPanel<CellDiffModel> {
       editorClasses: CURR_DIFF_CLASSES,
       rendermime: this._rendermime,
       editorFactory: this._editorFactory,
+      translator: this._translator,
       ...this._viewOptions,
     });
     sourceView.addClass(SOURCE_ROW_CLASS);
@@ -125,6 +126,7 @@ export class CellDiffWidget extends DiffPanel<CellDiffModel> {
         editorClasses: CURR_DIFF_CLASSES,
         rendermime: this._rendermime,
         editorFactory: this._editorFactory,
+        translator: this._translator,
         ...this._viewOptions,
       });
       metadataView.addClass(METADATA_ROW_CLASS);
@@ -144,6 +146,7 @@ export class CellDiffWidget extends DiffPanel<CellDiffModel> {
             editorClasses: CURR_DIFF_CLASSES,
             rendermime: this._rendermime,
             editorFactory: this._editorFactory,
+            translator: this._translator,
             ...this._viewOptions,
           });
           container.addWidget(outputsWidget);
@@ -164,6 +167,7 @@ export class CellDiffWidget extends DiffPanel<CellDiffModel> {
               editorClasses: CURR_DIFF_CLASSES,
               rendermime: this._rendermime,
               editorFactory: this._editorFactory,
+              translator: this._translator,
               ...this._viewOptions,
             });
             target.addWidget(outputsWidget);

packages/nbdime/src/merge/widget/cell.ts

@@ -245,6 +245,7 @@ export class CellMergeWidget extends MergePanel<CellMergeModel> {
             editorClasses: CURR_CLASSES,
             rendermime: this._rendermime,
             editorFactory: this._editorFactory,
+            translator: this._translator,
           });
           container.addWidget(view);
         }
@@ -324,6 +325,7 @@ export class CellMergeWidget extends MergePanel<CellMergeModel> {
           merged: model.merged.metadata,
           editorClasses: CURR_CLASSES,
           editorFactory: this._editorFactory,
+          translator: this._translator,
           ...this._viewOptions,
           readOnly: true, // Do not allow manual edit of metadata
         });

packages/nbdime/src/merge/widget/metadata.ts

@@ -44,9 +44,10 @@ export class MetadataMergeWidget extends MergePanel<MetadataMergeModel> {
       translator: this._translator,
       ...this._viewOptions,
     });
+    const trans = this._translator.load('nbdime');
     const wrapper = new CollapsiblePanel(
       this.view,
-      'Notebook metadata changed',
+      trans.__('Notebook metadata changed'),
       true,
     );
     this.addWidget(wrapper);

packages/nbdime/src/merge/widget/notebook.ts

@@ -64,6 +64,7 @@ export class NotebookMergeWidget extends MergePanel<NotebookMergeModel> {
         this.metadataWidget = new MetadataMergeWidget({
           model: model.metadata,
           editorFactory: this._editorFactory,
+          translator: this._translator,
           ...this._viewOptions,
         });
         this.addWidget(this.metadataWidget);