From fe5c050c61d52a637b9098f416479e3834b2cabb Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr> Date: Mon, 12 Feb 2024 14:58:10 +0100 Subject: [PATCH] Reservoir: Add windows title translate. --- src/View/Reservoir/Edit/Translate.py | 4 ++++ src/View/Reservoir/Edit/Window.py | 5 ++--- src/View/Reservoir/Translate.py | 4 ++++ src/View/Reservoir/Window.py | 5 +++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/View/Reservoir/Edit/Translate.py b/src/View/Reservoir/Edit/Translate.py index f7660885..308a1cad 100644 --- a/src/View/Reservoir/Edit/Translate.py +++ b/src/View/Reservoir/Edit/Translate.py @@ -29,6 +29,10 @@ class EditReservoirTranslate(ReservoirTranslate): def __init__(self): super(EditReservoirTranslate, self).__init__() + self._dict["Edit Reservoir"] = _translate( + "Reservoir", "Edit Reservoir" + ) + self._sub_dict["table_headers"] = { "z": _translate("Reservoir", "Elevation (m)"), "Area": _translate("Reservoir", "Area (hectare)"), diff --git a/src/View/Reservoir/Edit/Window.py b/src/View/Reservoir/Edit/Window.py index 865ae6c8..8903b2e7 100644 --- a/src/View/Reservoir/Edit/Window.py +++ b/src/View/Reservoir/Edit/Window.py @@ -60,12 +60,11 @@ class EditReservoirWindow(PamhyrWindow): self._data = data trad = EditReservoirTranslate() - name = self._pamhyr_name + name = trad[self._pamhyr_name] if self._data is not None: node_name = (self._data.node.name if self._data.node is not None else _translate("Reservoir", "Not associated")) - name = ( - _translate("Edit Reservoir", self._pamhyr_name) + + name += ( f" - {study.name} " + f" - {self._data.name} ({self._data.id}) " + f"({node_name})" diff --git a/src/View/Reservoir/Translate.py b/src/View/Reservoir/Translate.py index 556c9381..22502948 100644 --- a/src/View/Reservoir/Translate.py +++ b/src/View/Reservoir/Translate.py @@ -27,6 +27,10 @@ class ReservoirTranslate(PamhyrTranslate): def __init__(self): super(ReservoirTranslate, self).__init__() + self._dict["Reservoir"] = _translate( + "Reservoir", "Reservoir" + ) + self._sub_dict["table_headers"] = { "name": _translate("Reservoir", "Name"), "node": _translate("Reservoir", "Node") diff --git a/src/View/Reservoir/Window.py b/src/View/Reservoir/Window.py index 147c05d1..f94aa3c2 100644 --- a/src/View/Reservoir/Window.py +++ b/src/View/Reservoir/Window.py @@ -57,13 +57,14 @@ class ReservoirWindow(PamhyrWindow): _pamhyr_name = "Reservoir" def __init__(self, study=None, config=None, parent=None): - name = self._pamhyr_name + " - " + study.name + trad = ReservoirTranslate() + name = trad[self._pamhyr_name] + " - " + study.name super(ReservoirWindow, self).__init__( title=name, study=study, config=config, - trad=ReservoirTranslate(), + trad=trad, parent=parent ) -- GitLab