From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 21 Sep 2018 15:06:18 +0000 (+0200)
Subject: fiche 17091
X-Git-Tag: HYDRO_V2_0_0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9ba8436730c19a5b47724f792d01dfb4e9ad329b;p=modules%2Feficas.git

fiche 17091
---

diff --git a/Editeur/Objecttreeitem.py b/Editeur/Objecttreeitem.py
index 21c2408d..cfb4f264 100644
--- a/Editeur/Objecttreeitem.py
+++ b/Editeur/Objecttreeitem.py
@@ -206,7 +206,7 @@ class ObjectTreeItem(TreeItem,Delegate):
         - la couleur du texte
         """
         # None --> fonte et couleur par defaut
-        return self.labeltext,None,None
+        return tr(self.labeltext),None,None
 
     def getNature(self) :
         """ 
diff --git a/Ihm/I_MCCOMPO.py b/Ihm/I_MCCOMPO.py
index e6675cda..34d3f11e 100644
--- a/Ihm/I_MCCOMPO.py
+++ b/Ihm/I_MCCOMPO.py
@@ -41,7 +41,7 @@ class MCCOMPO(I_OBJECT.OBJECT):
        Retourne le label de self 
        utilise pour l'affichage dans l'arbre
     """
-    return self.nom
+    return tr(self.nom)
 
   def getListeMcOrdonnee(self,liste,dico):
     """
diff --git a/Ihm/I_MCFACT.py b/Ihm/I_MCFACT.py
index 5fd31635..b0d49fe9 100644
--- a/Ihm/I_MCFACT.py
+++ b/Ihm/I_MCFACT.py
@@ -63,9 +63,9 @@ class MCFACT(I_MCCOMPO.MCCOMPO):
     try:
       if len(objet) > 1 :
         index = objet.getIndex(self)+1 # + 1 a cause de la numerotation qui commence a 0
-        return self.nom +'_'+repr(index)+':'
+        return tr(self.nom) +'_'+repr(index)+':'
       else:
-        return self.nom
+        return tr(self.nom)
     except:
       return tr("Erreur - mot cle facteur de nom : %s", self.nom)
 
diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index f5e7d554..088f6ab0 100644
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -730,10 +730,10 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
     def updateNodeLabel(self):
         """ Met a jour le label du noeud """
-        #print "NODE updateNodeLabel", self.item.getLabelText()
+        #print ("NODE updateNodeLabel", self.item.getLabelText())
         labeltext,fonte,couleur = self.item.getLabelText()
         # PNPN a reflechir
-        self.setText(0, labeltext)        
+        self.setText(0, tr(labeltext))    
     
     def updateNodeLabelInBlack(self):
         if hasattr(self.appliEficas,'noeudColore'): 
diff --git a/InterfaceQT4/compocomm.py b/InterfaceQT4/compocomm.py
index cedfadce..8a83ce8f 100644
--- a/InterfaceQT4/compocomm.py
+++ b/InterfaceQT4/compocomm.py
@@ -53,7 +53,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
         """
         """
         debComm=self.item.getText()
-        self.setText(1,debComm)
+        self.setText(1,tr(debComm))
 
 
     
diff --git a/generator/generator_TELEMAC.py b/generator/generator_TELEMAC.py
index ad25a7c1..b54b2133 100644
--- a/generator/generator_TELEMAC.py
+++ b/generator/generator_TELEMAC.py
@@ -59,7 +59,7 @@ class TELEMACGenerator(PythonGenerator):
 
 #----------------------------------------------------------------------------------------
    def gener(self,obj,format='brut',config=None,appli=None,statut="Leger"):
-
+ 
       self.statut        = statut
       self.langue        = appli.langue
       try : self.TelemacdicoEn = appli.readercata.TelemacdicoEn