X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Validation%2FV_PROC_ETAPE.py;h=8399ede193cc2ae88faa8cf02012dbcc8cd03eec;hb=f1fe188d679966c43c6e965bde6d63bd89451262;hp=94ba4eae290fdaf083eff8e900ebe34cffb7925a;hpb=860a50d7df32b5c86f9ab536178d030ea882cae5;p=tools%2Feficas.git

diff --git a/Validation/V_PROC_ETAPE.py b/Validation/V_PROC_ETAPE.py
index 94ba4eae..8399ede1 100644
--- a/Validation/V_PROC_ETAPE.py
+++ b/Validation/V_PROC_ETAPE.py
@@ -1,24 +1,23 @@
-# -*- coding: utf-8 -*-
-#@ MODIF V_PROC_ETAPE Validation  DATE 26/09/2003   AUTEUR DURAND C.DURAND 
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR   
-# (AT YOUR OPTION) ANY LATER VERSION.                                 
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT 
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF          
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU    
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                            
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE   
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
-#                                                                       
-#                                                                       
-# ======================================================================
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
 """
    Ce module contient la classe mixin PROC_ETAPE qui porte les méthodes
    nécessaires pour réaliser la validation d'un objet de type PROC_ETAPE
@@ -27,22 +26,21 @@
    Une classe mixin porte principalement des traitements et est
    utilisée par héritage multiple pour composer les traitements.
 """
-# Modules Python
-import string,types
-
 # Modules EFICAS
 import V_ETAPE
 from Noyau.N_Exception import AsException
 from Noyau.N_utils import AsType
+from Noyau.strfunc import ufmt
+
 
 class PROC_ETAPE(V_ETAPE.ETAPE):
    """
-      On réutilise les méthodes report,verif_regles 
+      On réutilise les méthodes report,verif_regles
       de ETAPE par héritage.
    """
 
    def isvalid(self,sd='oui',cr='non'):
-      """ 
+      """
          Methode pour verifier la validité de l'objet PROC_ETAPE. Cette méthode
          peut etre appelée selon plusieurs modes en fonction de la valeur
          de sd et de cr (sd n'est pas utilisé).
@@ -56,23 +54,18 @@ class PROC_ETAPE(V_ETAPE.ETAPE):
           - produire un compte-rendu : self.cr
 
           - propager l'éventuel changement d'état au parent
-
       """
       if CONTEXT.debug : print "ETAPE.isvalid ",self.nom
       if self.state == 'unchanged' :
         return self.valid
       else:
         valid=self.valid_child()
-
         valid=valid * self.valid_regles(cr)
-
         if self.reste_val != {}:
           if cr == 'oui' :
-            self.cr.fatal("Mots cles inconnus :" + string.join(self.reste_val.keys(),','))
+            self.cr.fatal(_(u"Mots clés inconnus : %s"), ','.join(self.reste_val.keys()))
           valid=0
-
         self.set_valid(valid)
-
         return self.valid