From 903ca74ba2ecda4c062153fb674c465d6d3c362d Mon Sep 17 00:00:00 2001
From: Gerald Nicolas <D68518@dsp0677846.(none)>
Date: Thu, 25 Sep 2014 15:58:55 +0200
Subject: [PATCH] =?utf8?q?Pilotage=20de=20la=20langue=20des=20messages=20d?=
 =?utf8?q?e=20l'ex=C3=A9cutable=20HOMARD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/en/tui_homard.rst          | 19 +++++++++++++++++++
 doc/fr/tui_homard.rst          | 19 +++++++++++++++++++
 idl/Gen.xml                    | 32 ++++++++++++++++++++++++++++++++
 idl/HOMARD_Gen.idl             |  7 +++++--
 resources/HOMARDCatalog.xml.in | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/doc/en/tui_homard.rst b/doc/en/tui_homard.rst
index b43da942..b8aab2ad 100644
--- a/doc/en/tui_homard.rst
+++ b/doc/en/tui_homard.rst
@@ -6,6 +6,25 @@ The computation
 Methods of the class homard
 ***************************
 
++---------------------------------------------------------------+
++---------------------------------------------------------------+
+| .. module:: SetLanguageShort                                  |
+|                                                               |
+| **SetLanguageShort(lang)**                                    |
+|     Gives the language of the messages. If the choice is      |
+|     uncorrect, english is choosen.                            |
+|                                                               |
+|     - ``lang`` : the language of the messages.                |
+|                                                               |
+|         * 'fr' : francais                                     |
+|         * 'en' : anglais                                      |
++---------------------------------------------------------------+
+| .. module:: GetLanguageShort                                  |
+|                                                               |
+| **GetLanguageShort()**                                        |
+|     Returns the language of the messages.                     |
++---------------------------------------------------------------+
+
 
 Example
 *******
diff --git a/doc/fr/tui_homard.rst b/doc/fr/tui_homard.rst
index d81278b0..ef3ef557 100644
--- a/doc/fr/tui_homard.rst
+++ b/doc/fr/tui_homard.rst
@@ -6,6 +6,25 @@ Le calcul
 Méthodes de la classe homard
 ****************************
 
++---------------------------------------------------------------+
++---------------------------------------------------------------+
+| .. module:: SetLanguageShort                                  |
+|                                                               |
+| **SetLanguageShort(lang)**                                    |
+|     Affecte la langue des messages. Si le choix transmis est  |
+|     incorrect, l'anglais est utilisé.                         |
+|                                                               |
+|     - ``lang`` : la langue des messages sous forme courte.    |
+|                                                               |
+|         * 'fr' : francais                                     |
+|         * 'en' : anglais                                      |
++---------------------------------------------------------------+
+| .. module:: GetLanguageShort                                  |
+|                                                               |
+| **GetLanguageShort()**                                        |
+|     Retourne la langue des messages sous forme courte.        |
++---------------------------------------------------------------+
+
 
 Exemple
 *******
diff --git a/idl/Gen.xml b/idl/Gen.xml
index be9297ea..ad286aa7 100644
--- a/idl/Gen.xml
+++ b/idl/Gen.xml
@@ -1205,6 +1205,38 @@
                         <outParameter-list></outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
+                    <component-service>
+                        <service-name>SetLanguageShort</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>LanguageShort</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>GetLanguageShort</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list></inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>string</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
                 </component-service-list>
             </component-interface-list>
         </component>
diff --git a/idl/HOMARD_Gen.idl b/idl/HOMARD_Gen.idl
index ca138c49..32b7353d 100644
--- a/idl/HOMARD_Gen.idl
+++ b/idl/HOMARD_Gen.idl
@@ -146,6 +146,11 @@ module HOMARD
     SALOMEDS::Study GetCurrentStudy()                      raises (SALOME::SALOME_Exception);
     long GetCurrentStudyID()                               raises (SALOME::SALOME_Exception);
 //
+// A.4. Les caracteristiques generales
+//
+    void SetLanguageShort (in string LanguageShort)        raises (SALOME::SALOME_Exception);
+    string GetLanguageShort ()                             raises (SALOME::SALOME_Exception);
+//
 // B. Les methodes qui suivent n'apparaissent pas dans le composant HOMARD dans YACS
 //    L'utilisateur ne devrait pas les connaitre (ni s'en servir, a fortiori)
 //
@@ -210,8 +215,6 @@ module HOMARD
 
 //
 //  Les preferences
-    void SetLanguageShort (in string LanguageShort)        raises (SALOME::SALOME_Exception);
-    string GetLanguageShort ()                             raises (SALOME::SALOME_Exception);
     void SetPublisMesh (in long PublisMeshIN, in long PublisMeshOUT)
     raises (SALOME::SALOME_Exception);
     long GetPublisMeshIN ()                                raises (SALOME::SALOME_Exception);
diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in
index a609914b..e90a4b0e 100644
--- a/resources/HOMARDCatalog.xml.in
+++ b/resources/HOMARDCatalog.xml.in
@@ -1116,6 +1116,38 @@
                         <outParameter-list></outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
+                    <component-service>
+                        <service-name>SetLanguageShort</service-name>
+                        <service-author>HOMARD team - EDF RD</service-author>
+                        <service-version>1.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>LanguageShort</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>GetLanguageShort</service-name>
+                        <service-author>HOMARD team - EDF RD</service-author>
+                        <service-version>1.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list></inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>string</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
                 </component-service-list>
             </component-interface-list>
         </component>
-- 
2.30.2