Add translation to missing items (jupyterlab#1180)

* add translation to Git Clone tooltip

* add translation for git menu

* add translation to submenu

* add phrases object for merge addon translations

* Update src/components/diff/PlainTextDiff.ts

Change to CodeMirror 5 translations.

Co-authored-by: Frédéric Collonval <[email protected]>

* Update src/components/diff/PlainTextDiff.ts

Change translation to type Record.

Co-authored-by: Frédéric Collonval <[email protected]>

* Update src/components/diff/PlainTextDiff.ts

Change translation to type Record.

Co-authored-by: Frédéric Collonval <[email protected]>

* Update schema/plugin.json

Fix indentation

Co-authored-by: Frédéric Collonval <[email protected]>

* Update src/components/diff/mergeview.ts

Make phrases optional

Co-authored-by: Frédéric Collonval <[email protected]>

Co-authored-by: Frédéric Collonval <[email protected]>

Author: kostyafarber

schema/plugin.json

@@ -180,5 +180,11 @@
         "rank": 1
       }
     ]
+  },
+  "jupyter.lab.internationalization": {
+    "selectors": [
+        "jupyter.lab.menus/.*/args/text"
+    ],
+    "domain": "jupyterlab_git"
   }
 }

src/cloneCommand.ts

@@ -83,10 +83,10 @@ export const gitCloneCommandPlugin: JupyterFrontEndPlugin<void> = {
       }
     });
     // Add a clone button to the file browser extension toolbar
-    addCloneButton(gitModel, fileBrowser, app.commands);
+    addCloneButton(gitModel, fileBrowser, app.commands, trans);
 
     // Add the context menu items for the default file browser
-    addFileBrowserContextMenu(gitModel, fileBrowser, app.contextMenu);
+    addFileBrowserContextMenu(gitModel, fileBrowser, app.contextMenu, trans);
   },
   autoStart: true
 };

src/commandsAndMenu.tsx

@@ -234,7 +234,7 @@ export function addCommands(
 
   /** Open URL externally */
   commands.addCommand(CommandIDs.gitOpenUrl, {
-    label: args => args['text'] as string,
+    label: args => trans.__(args['text'] as string),
     execute: args => {
       const url = args['url'] as string;
       window.open(url);
@@ -1300,7 +1300,7 @@ export function createGitMenu(
   ];
 
   const menu = new Menu({ commands });
-  menu.title.label = 'Git';
+  menu.title.label = trans.__('Git');
   [
     CommandIDs.gitInit,
     CommandIDs.gitClone,
@@ -1382,7 +1382,8 @@ export function addMenuItems(
 export function addFileBrowserContextMenu(
   model: IGitExtension,
   filebrowser: FileBrowser,
-  contextMenu: ContextMenuSvg
+  contextMenu: ContextMenuSvg,
+  trans: TranslationBundle
 ): void {
   let gitMenu: Menu;
   let _commands: ContextCommandIDs[];
@@ -1505,7 +1506,7 @@ export function addFileBrowserContextMenu(
 
     const selectorNotDir = '.jp-DirListing-item[data-isdir="false"]';
     gitMenu = new GitMenu({ commands: contextMenu.menu.commands });
-    gitMenu.title.label = 'Git';
+    gitMenu.title.label = trans.__('Git');
     gitMenu.title.icon = gitIcon.bindprops({ stylesheet: 'menuItem' });
 
     contextMenu.addItem({

src/components/diff/PlainTextDiff.ts

@@ -47,6 +47,45 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
     this._model = model;
     this._trans = translator ?? nullTranslator.load('jupyterlab_git');
 
+    // The list of internal strings is available at https://codemirror.net/examples/translate/
+    this._translations = {
+      // @codemirror/view
+      'Control character': this._trans.__('Control character'),
+      // @codemirror/commands
+      'Selection deleted': this._trans.__('Selection deleted'),
+      // @codemirror/language
+      'Folded lines': this._trans.__('Folded lines'),
+      'Unfolded lines': this._trans.__('Unfolded lines'),
+      to: this._trans.__('to'),
+      'folded code': this._trans.__('folded code'),
+      unfold: this._trans.__('unfold'),
+      'Fold line': this._trans.__('Fold line'),
+      'Unfold line': this._trans.__('Unfold line'),
+      // @codemirror/search
+      'Go to line': this._trans.__('Go to line'),
+      go: this._trans.__('go'),
+      Find: this._trans.__('Find'),
+      Replace: this._trans.__('Replace'),
+      next: this._trans.__('next'),
+      previous: this._trans.__('previous'),
+      all: this._trans.__('all'),
+      'match case': this._trans.__('match case'),
+      replace: this._trans.__('replace'),
+      'replace all': this._trans.__('replace all'),
+      close: this._trans.__('close'),
+      'current match': this._trans.__('current match'),
+      'replaced $ matches': this._trans.__('replaced $ matches'),
+      'replaced match on line $': this._trans.__('replaced match on line $'),
+      'on line': this._trans.__('on line'),
+      // From https://codemirror.net/5/addon/merge/merge.js
+      'Identical text collapsed. Click to expand.': this._trans.__(
+        'Identical text collapsed. Click to expand.'
+      ),
+      'Toggle locked scrolling': this._trans.__('Toggle locked scrolling'),
+      'Push to left': this._trans.__('Push to left'),
+      'Revert chunk': this._trans.__('Revert chunk')
+    };
+
     // Load file content early
     Promise.all([
       this._model.reference.content(),
@@ -124,6 +163,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
           this.createDiffView(
             this._challenger,
             this._reference,
+            this._translations,
             this._hasConflict ? this._base : null
           );
         }
@@ -166,6 +206,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
       this.createDiffView(
         this._challenger,
         this._reference,
+        this._translations,
         this._hasConflict ? this._base : null
       );
 
@@ -205,6 +246,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
   protected async createDiffView(
     challengerContent: string,
     referenceContent: string,
+    translations: Record<string, string>,
     baseContent?: string
   ): Promise<void> {
     if (!this._mergeView) {
@@ -216,6 +258,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
         value: challengerContent,
         orig: referenceContent,
         mode: mode.mime,
+        phrases: translations,
         ...this.getDefaultOptions()
       };
 
@@ -276,6 +319,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
   protected _mergeView: MergeView.MergeViewEditor;
   protected _model: Git.Diff.IModel;
   protected _trans: TranslationBundle;
+  protected _translations: Record<string, string>;
 
   private _reference: string | null = null;
   private _challenger: string | null = null;

src/components/diff/mergeview.ts

@@ -90,6 +90,11 @@ export namespace MergeView {
      */
     showDifferences?: boolean;
 
+    /**
+     * Mapping of displayed string with their translation.
+     */
+    phrases?: Record<string, string>;
+
     revertChunk?: (
       mergeView: IMergeViewEditor,
       from: CodeMirror.Editor,

src/index.ts

@@ -201,13 +201,18 @@ async function activate(
     }
 
     // Add a clone button to the file browser extension toolbar
-    addCloneButton(gitExtension, fileBrowser, app.commands);
+    addCloneButton(gitExtension, fileBrowser, app.commands, trans);
 
     // Add the status bar widget
     addStatusBarWidget(statusBar, gitExtension, settings, trans);
 
     // Add the context menu items for the default file browser
-    addFileBrowserContextMenu(gitExtension, fileBrowser, app.contextMenu);
+    addFileBrowserContextMenu(
+      gitExtension,
+      fileBrowser,
+      app.contextMenu,
+      trans
+    );
   }
 
   // Register diff providers

src/widgets/gitClone.tsx

@@ -5,6 +5,7 @@ import {
 } from '@jupyterlab/apputils';
 import { IChangedArgs } from '@jupyterlab/coreutils';
 import { FileBrowser } from '@jupyterlab/filebrowser';
+import { TranslationBundle } from '@jupyterlab/translation';
 import { CommandRegistry } from '@lumino/commands';
 import * as React from 'react';
 import { cloneIcon } from '../style/icons';
@@ -13,7 +14,8 @@ import { CommandIDs, IGitExtension } from '../tokens';
 export function addCloneButton(
   model: IGitExtension,
   filebrowser: FileBrowser,
-  commands: CommandRegistry
+  commands: CommandRegistry,
+  trans: TranslationBundle
 ): void {
   filebrowser.toolbar.addItem(
     'gitClone',
@@ -33,7 +35,7 @@ export function addCloneButton(
             onClick={() => {
               commands.execute(CommandIDs.gitClone);
             }}
-            tooltip={'Git Clone'}
+            tooltip={trans.__('Git Clone')}
           />
         )}
       </UseSignal>