Added french translation

Author: PierreRaybaut

.vscode/launch.json

@@ -28,6 +28,7 @@
             "justMyCode": false,
             "env": {
                 "QT_COLOR_MODE": "light",
+                // "LANG": "fr",
             }
         },
         {

cdlclient/config.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the BSD 3-Clause
+# (see cdlclient/LICENSE for details)
+
+"""
+DataLab Simple Client configuration module
+------------------------------------------
+
+This module handles `DataLab Simple Client` configuration.
+"""
+
+from __future__ import annotations
+
+import os.path as osp
+
+from guidata import configtools
+
+MOD_NAME = "cdlclient"
+_ = configtools.get_translation(MOD_NAME)
+
+MOD_PATH = configtools.get_module_data_path(MOD_NAME)

cdlclient/locale/fr/LC_MESSAGES/cdlclient.po

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+# cdl module translation file
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2023-11-23 17:34+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: utf-8\n"
+"Generated-By: pygettext.py 1.5\n"
+
+#: cdlclient\tests\remoteclient_app.py:62
+msgid "This the client application, which connects to DataLab."
+msgstr "Ceci l'application cliente, qui se connecte à DataLab."
+
+#: cdlclient\tests\remoteclient_app.py:63
+msgid "Connect to DataLab"
+msgstr "Se connecter à DataLab"
+
+#: cdlclient\tests\remoteclient_app.py:100
+msgid "Execute multiple commands"
+msgstr "Exécuter des commandes multiples"
+
+#: cdlclient\tests\remoteclient_app.py:101
+msgid "Get object titles"
+msgstr "Obtenir la liste des titres"
+
+#: cdlclient\tests\remoteclient_app.py:102
+msgid "Get object uuids"
+msgstr "Obtenir la liste des uuids"
+
+#: cdlclient\tests\remoteclient_app.py:103
+msgid "Get object"
+msgstr "Obtenir un objet"
+
+#: cdlclient\tests\remoteclient_app.py:104
+msgid "Get object using dialog box"
+msgstr "Obtenir un objet en utilisant une boîte de dialogue"
+
+#: cdlclient\tests\remoteclient_base.py:88
+msgid "Host application"
+msgstr "Application hôte"
+
+#: cdlclient\tests\remoteclient_base.py:115
+msgid "Raise window"
+msgstr "Mettre la fenêtre au premier plan"
+
+#: cdlclient\tests\remoteclient_base.py:117
+msgid "Add signal objects"
+msgstr "Ajouter des objets signal"
+
+#: cdlclient\tests\remoteclient_base.py:118
+msgid "Add image objects"
+msgstr "Ajouter des objets image"
+
+#: cdlclient\tests\remoteclient_base.py:119
+msgid "Remove all objects"
+msgstr "Supprimer tous les objets"
+
+#: cdlclient\tests\remoteclient_base.py:120
+msgid "Close DataLab"
+msgstr "Fermer DataLab"
+
+#: cdlclient\widgets\connection.py:58
+msgid "Connection to DataLab"
+msgstr "Connexion à DataLab"
+
+#: cdlclient\widgets\connection.py:70
+msgid "Waiting for connection..."
+msgstr "En attente de connexion..."
+
+#: cdlclient\widgets\connection.py:101
+msgid "Connecting to server..."
+msgstr "Connexion au serveur..."
+
+#: cdlclient\widgets\connection.py:109
+msgid "Connection successful!"
+msgstr "Connecté avec succès !"
+
+#: cdlclient\widgets\connection.py:117
+msgid "Connection failed."
+msgstr "Echec de la connexion."
+
+#: cdlclient\widgets\objectdialog.py:174
+msgid "Select object"
+msgstr "Sélectionner un objet"
+
+#: cdlclient\widgets\objectdialog.py:191
+msgid "Signals"
+msgstr "Signaux"
+
+#: cdlclient\widgets\objectdialog.py:192
+msgid "Images"
+msgstr "Images"
+
+#: cdlclient\widgets\objectdialog.py:196
+msgid "Active panel:"
+msgstr "Panneau actif :"
+
+#~ msgid "Get object from DataLab"
+#~ msgstr "Obtenir un objet depuis DataLab"

cdlclient/widgets/qthelpers.py cdlclient/qthelpers.pycdlclient/widgets/qthelpers.py renamed to cdlclient/qthelpers.py

@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the BSD 3-Clause
+# (see cdlclient/LICENSE for details)
+
 """Qt helpers"""
 
 from __future__ import annotations
@@ -13,8 +17,9 @@
 from qtpy import QtSvg as QS
 from qtpy import QtWidgets as QW
 
-PKG_PATH = osp.join(osp.dirname(__file__), os.pardir, os.pardir)
-WIDGETS_PATH = osp.join(PKG_PATH, "cdlclient", "widgets")
+from cdlclient.config import MOD_PATH
+
+WIDGETS_PATH = osp.join(MOD_PATH, "widgets")
 
 
 def svgtext_to_icon(text: str) -> QG.QIcon:
@@ -77,14 +82,14 @@ def imagefile_to_python_module(filename: str, destmod: str) -> None:
     """
     data = imagefile_to_base64(filename)
     destmod_path = osp.join(WIDGETS_PATH, destmod + ".py")
+    if osp.isfile(destmod_path):
+        os.remove(destmod_path)
     with open(destmod_path, "wb") as fn:
         fn.write("# -*- coding: utf-8 -*-\n\n".encode("utf-8"))
         fn.write("# pylint: skip-file\n\n".encode("utf-8"))
         fn.write("DATA = b'".encode("utf-8"))
         fn.write(data)
         fn.write("'".encode("utf-8"))
-        fn.write(data)
-        fn.write("'".encode("utf-8"))
 
 
 @contextmanager
@@ -99,3 +104,5 @@ def block_signals(widget: QW.QWidget, enable: bool) -> Generator[None, None, Non
         if enable:
             widget.blockSignals(False)
             widget.blockSignals(False)
+            widget.blockSignals(False)
+            widget.blockSignals(False)

cdlclient/tests/get_object_dialog.py

@@ -20,7 +20,7 @@ def test_dialog():
     proxy = SimpleRemoteProxy()
     proxy.connect()
     with qt_app_context():
-        dlg = GetObjectDialog(None, "Get object", proxy)
+        dlg = GetObjectDialog(None, proxy)
         if dlg.exec():
             obj_uuid = dlg.get_current_object_uuid()
             obj = proxy.get_object(obj_uuid)

cdlclient/tests/imagefile_to_code.py

@@ -3,16 +3,18 @@
 
 # guitest: skip
 
+import os
 import os.path as osp
 
 from guidata.qthelpers import qt_app_context
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
 from qtpy import QtWidgets as QW
 
-from cdlclient.widgets.qthelpers import PKG_PATH, imagefile_to_python_module
+from cdlclient.config import MOD_NAME, MOD_PATH
+from cdlclient.qthelpers import imagefile_to_python_module
 
-RES_PATH = osp.join(PKG_PATH, "resources")
+RES_PATH = osp.join(MOD_PATH, os.pardir, "resources")
 
 
 def test_conv(filename: str, destmod: str) -> None:
@@ -30,7 +32,7 @@ def test_conv(filename: str, destmod: str) -> None:
         label1.setPixmap(QG.QPixmap(filename))
         label2 = QW.QLabel()
         imagefile_to_python_module(filename, destmod)
-        mod = __import__("cdlclient.widgets." + destmod, fromlist=[destmod])
+        mod = __import__(f"{MOD_NAME}.widgets.{destmod}", fromlist=[destmod])
         pixmap = QG.QPixmap()
         pixmap.loadFromData(QC.QByteArray.fromBase64(mod.DATA))
         label2.setPixmap(pixmap)
@@ -41,4 +43,3 @@ def test_conv(filename: str, destmod: str) -> None:
 
 if __name__ == "__main__":
     test_conv(osp.join(RES_PATH, "DataLab-Banner-200.png"), "datalab_banner")
-    test_conv(osp.join(RES_PATH, "DataLab-Banner-200.png"), "datalab_banner")

cdlclient/tests/remoteclient_app.py

@@ -23,6 +23,7 @@
 from qtpy import QtWidgets as QW
 
 from cdlclient import SimpleRemoteProxy
+from cdlclient.config import _
 from cdlclient.tests.remoteclient_base import AbstractClientWindow
 from cdlclient.tests.remoteclient_unit import multiple_commands
 from cdlclient.widgets import ConnectionDialog, GetObjectDialog
@@ -58,8 +59,8 @@ def method_wrapper(*args, **kwargs):
 class HostWindow(AbstractClientWindow):
     """Test main view"""
 
-    PURPOSE = "This the client application, which connects to DataLab."
-    INIT_BUTTON_LABEL = "Connect to DataLab"
+    PURPOSE = _("This the client application, which connects to DataLab.")
+    INIT_BUTTON_LABEL = _("Connect to DataLab")
     SIG_TITLES = ("Oscilloscope", "Digitizer", "Radiometer", "Voltmeter", "Sensor")
     IMA_TITLES = (
         "Camera",
@@ -96,11 +97,11 @@ def close_cdl(self):
     def add_additional_buttons(self):
         """Add additional buttons"""
         add_btn = self.host.add_button
-        add_btn("Execute multiple commands", self.exec_multiple_cmd, 10)
-        add_btn("Get object titles", self.get_object_titles, 10)
-        add_btn("Get object uuids", self.get_object_uuids, 10)
-        add_btn("Get object", self.get_object)
-        add_btn("Get object using dialog box", self.get_object_dialog)
+        add_btn(_("Execute multiple commands"), self.exec_multiple_cmd, 10)
+        add_btn(_("Get object titles"), self.get_object_titles, 10)
+        add_btn(_("Get object uuids"), self.get_object_uuids, 10)
+        add_btn(_("Get object"), self.get_object)
+        add_btn(_("Get object using dialog box"), self.get_object_dialog)
 
     @try_send_command()
     def exec_multiple_cmd(self):
@@ -150,7 +151,7 @@ def get_object(self):
     def get_object_dialog(self):
         """Get object (signal/image) using dialog box"""
         if self.cdl is not None:
-            dialog = GetObjectDialog(self, "Get object from DataLab", self.cdl)
+            dialog = GetObjectDialog(self, self.cdl)
             if dialog.exec():
                 uuid = dialog.get_current_object_uuid()
                 obj = self.cdl.get_object(uuid)

cdlclient/tests/remoteclient_base.py

@@ -16,6 +16,8 @@
 from guidata.widgets.codeeditor import CodeEditor
 from qtpy import QtWidgets as QW
 
+from cdlclient.config import _
+
 
 class HostWidget(QW.QWidget):
     """Host widget: menu with action buttons, log viewer"""
@@ -83,7 +85,7 @@ class AbstractClientWindow(QW.QMainWindow, metaclass=AbstractClientWindowMeta):
     def __init__(self):
         super().__init__()
         win32_fix_title_bar_background(self)
-        self.setWindowTitle("Host application")
+        self.setWindowTitle(_("Host application"))
         self.setWindowIcon(get_std_icon("ComputerIcon"))
         self.cdl = None  # CDLMainWindow instance
         self.host = HostWidget(self)
@@ -110,12 +112,12 @@ def setup_window(self):
         self.host.add_label(self.PURPOSE)
         add_btn = self.host.add_button
         add_btn(self.INIT_BUTTON_LABEL, self.init_cdl, 10, "DialogApplyButton")
-        add_btn("Raise window", self.raise_cdl, 0, "FileDialogToParent")
+        add_btn(_("Raise window"), self.raise_cdl, 0, "FileDialogToParent")
         self.add_additional_buttons()
-        add_btn("Add signal objects", self.add_signals, 10, "CommandLink")
-        add_btn("Add image objects", self.add_images, 0, "CommandLink")
-        add_btn("Remove all objects", self.remove_all, 5, "MessageBoxWarning")
-        add_btn("Close DataLab", self.close_cdl, 10, "DialogCloseButton")
+        add_btn(_("Add signal objects"), self.add_signals, 10, "CommandLink")
+        add_btn(_("Add image objects"), self.add_images, 0, "CommandLink")
+        add_btn(_("Remove all objects"), self.remove_all, 5, "MessageBoxWarning")
+        add_btn(_("Close DataLab"), self.close_cdl, 10, "DialogCloseButton")
 
     def add_additional_buttons(self):
         """Add additional buttons"""
@@ -145,3 +147,6 @@ def add_images(self):
     @abc.abstractmethod
     def remove_all(self):
         """Remove all objects from DataLab"""
+
+    def remove_all(self):
+        """Remove all objects from DataLab"""

cdlclient/widgets/connection.py

@@ -21,10 +21,11 @@
 from qtpy import QtGui as QG
 from qtpy import QtWidgets as QW
 
+from cdlclient.config import _
 from cdlclient.widgets import datalab_banner
 
 
-class DataLabConnectionThread(QC.QThread):
+class ConnectionThread(QC.QThread):
     """DataLab Connection thread"""
 
     SIG_CONNECTION_OK = QC.Signal()
@@ -54,7 +55,7 @@ class ConnectionDialog(QW.QDialog):
     def __init__(self, connect_callback: Callable, parent: QW.QWidget = None) -> None:
         super().__init__(parent)
         win32_fix_title_bar_background(self)
-        self.setWindowTitle("Connection to DataLab")
+        self.setWindowTitle(_("Connection to DataLab"))
         self.resize(300, 50)
         self.host_label = QW.QLabel()
         pixmap = QG.QPixmap()
@@ -66,7 +67,7 @@ def __init__(self, connect_callback: Callable, parent: QW.QWidget = None) -> Non
         status = QW.QWidget()
         status_layout = QW.QHBoxLayout()
         status.setLayout(status_layout)
-        self.status_label = QW.QLabel("Waiting for connection...")
+        self.status_label = QW.QLabel(_("Waiting for connection..."))
         self.status_icon = QW.QLabel()
         status_layout.addWidget(self.status_icon)
         status_layout.addWidget(self.status_label)
@@ -77,7 +78,7 @@ def __init__(self, connect_callback: Callable, parent: QW.QWidget = None) -> Non
         layout.addWidget(self.progress_bar)
         layout.addWidget(status)
         self.setLayout(layout)
-        self.thread = DataLabConnectionThread(connect_callback)
+        self.thread = ConnectionThread(connect_callback)
         self.thread.SIG_CONNECTION_OK.connect(self.on_connection_successful)
         self.thread.SIG_CONNECTION_KO.connect(self.on_connection_failed)
         button_box = QW.QDialogButtonBox(QW.QDialogButtonBox.Cancel)
@@ -97,23 +98,23 @@ def connect_to_server(self) -> None:
         """Connect to server"""
         self.progress_bar.setRange(0, 0)
         self.set_status_icon("BrowserReload")
-        self.status_label.setText("Connecting to server...")
+        self.status_label.setText(_("Connecting to server..."))
         self.thread.start()
 
     def on_connection_successful(self) -> None:
         """Connection successful"""
         self.progress_bar.setRange(0, 1)
         self.progress_bar.setValue(1)
         self.set_status_icon("DialogApplyButton")
-        self.status_label.setText("Connection successful!")
+        self.status_label.setText(_("Connection successful!"))
         QC.QTimer.singleShot(1000, self.accept)
 
     def on_connection_failed(self) -> None:
         """Connection failed"""
         self.progress_bar.setRange(0, 1)
         self.progress_bar.setValue(1)
         self.set_status_icon("MessageBoxCritical")
-        self.status_label.setText("Connection failed.")
+        self.status_label.setText(_("Connection failed."))
         QC.QTimer.singleShot(2000, self.reject)