NXDRIVE-2948: Add translations to hardcoded strings and refractor the…

… code -moved TaskManager qml into a seperate folder
nuxeo · Jul 8, 2024 · d86bcbc · d86bcbc
1 parent 529e146
commit d86bcbc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/nxdrive/data/qml/Main.qml b/nxdrive/data/qml/Main.qml
@@ -5,6 +5,7 @@ import QtQuick 2.15
 import QtQuick.Window 2.15
 import SystrayWindow 1.0
 import CustomWindow 1.0
+import "tasksManager"
 
 QtObject {
 

diff --git a/nxdrive/data/qml/TaskListItem.qml → ...ve/data/qml/tasksManager/TaskListItem.qml b/nxdrive/data/qml/TaskListItem.qml → ...ve/data/qml/tasksManager/TaskListItem.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import "../"
 
 Button {
     id: control

diff --git a/nxdrive/data/qml/TaskManager.qml → ...ive/data/qml/tasksManager/TaskManager.qml b/nxdrive/data/qml/TaskManager.qml → ...ive/data/qml/tasksManager/TaskManager.qml
@@ -2,7 +2,8 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.15
-import "icon-font/Icon.js" as MdiFont
+import "../icon-font/Icon.js" as MdiFont
+import "../"
 
 Rectangle {
     id: taskManager

diff --git a/nxdrive/gui/application.py b/nxdrive/gui/application.py
@@ -393,7 +393,9 @@ def create_custom_window_for_task_manager(self) -> None:
         self.task_manager_window.setMinimumHeight(600)
         self._fill_qml_context(self.task_manager_window.rootContext())
         self.task_manager_window.setSource(
-            QUrl.fromLocalFile(str(find_resource("qml", file="TaskManager.qml")))
+            QUrl.fromLocalFile(
+                str(find_resource("qml/tasksManager", file="TaskManager.qml"))
+            )
         )
 
     def init_workflow(self) -> Workflow:

diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
@@ -104,6 +104,7 @@ def mocked_open_authentication_dialog():
 def test_text_red(manager_factory):
     manager = manager_factory(with_engine=False)
     manager.application = ""
+    Translator(find_resource("i18n"), lang="en")
 
     def mocked_open_authentication_dialog():
         return