diff --git a/src/View/BoundaryCondition/BoundaryConditionWindow.py b/src/View/BoundaryCondition/BoundaryConditionWindow.py index de56722de107521295e2079646edaa885638ce18..3c76311808dc313c94c538909641b7956a49ff14 100644 --- a/src/View/BoundaryCondition/BoundaryConditionWindow.py +++ b/src/View/BoundaryCondition/BoundaryConditionWindow.py @@ -31,18 +31,11 @@ from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, TimeOverZ, TimeOverDebit, ZOverDebit ) -from View.BoundaryCondition.EditBoundaryConditionWindow import EditBoundaryConditionWindow +from View.BoundaryCondition.translate import long_types +from View.BoundaryCondition.Edit.Window import EditBoundaryConditionWindow _translate = QCoreApplication.translate -long_types = { - "ND": _translate("BoundaryCondition", "Not defined"), - "PC": _translate("BoundaryCondition", "Ponctual contribution"), - "TZ": _translate("BoundaryCondition", "Time over Z"), - "TD": _translate("BoundaryCondition", "Time over Debit"), - "ZD": _translate("BoundaryCondition", "Z over Debit"), -} - table_headers = { "name": _translate("BoundaryCondition", "Name"), "type": _translate("BoundaryCondition", "Type"), diff --git a/src/View/BoundaryCondition/EditBoundaryConditionWindow.py b/src/View/BoundaryCondition/Edit/Window.py similarity index 87% rename from src/View/BoundaryCondition/EditBoundaryConditionWindow.py rename to src/View/BoundaryCondition/Edit/Window.py index 3695d260b90fffbf5939734f7c25815ef5e97fd9..895ac1b6f583108492825931c66a34678645c3d2 100644 --- a/src/View/BoundaryCondition/EditBoundaryConditionWindow.py +++ b/src/View/BoundaryCondition/Edit/Window.py @@ -12,6 +12,8 @@ from PyQt5.QtWidgets import ( QFileDialog, QTableView, QAbstractItemView, ) +from View.BoundaryCondition.translate import long_types + _translate = QCoreApplication.translate class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow): @@ -31,8 +33,8 @@ class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow): else _translate("BoundaryCondition", "Not associate")) title = ( _translate("BoundaryCondition", self._title) + - f"{self._data.name} " + - f"({self._data.name} - {node_name})" + f" - {self._data.name} " + + f"({long_types[self._data.bctype]} - {node_name})" ) self.ui.setWindowTitle(title) else: diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py new file mode 100644 index 0000000000000000000000000000000000000000..bcd1be54d3f986a2d5d5d799a61ea3ba23df4301 --- /dev/null +++ b/src/View/BoundaryCondition/translate.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +from PyQt5.QtCore import QCoreApplication + +_translate = QCoreApplication.translate + +long_types = { + "ND": _translate("BoundaryCondition", "Not defined"), + "PC": _translate("BoundaryCondition", "Ponctual contribution"), + "TZ": _translate("BoundaryCondition", "Time over Z"), + "TD": _translate("BoundaryCondition", "Time over Debit"), + "ZD": _translate("BoundaryCondition", "Z over Debit"), +}