From 2b77ef3c6db46e9926eb822186bfae403f54d5ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 12 Jan 2005 20:12:07 +0000
Subject: [PATCH] Gestion de la traduction des noms et description des modules.

---
 htdocs/admin/modules.php                          | 10 ++++++----
 htdocs/includes/modules/DolibarrModules.class.php |  4 ++++
 htdocs/langs/en_US/admin.lang                     |  2 ++
 htdocs/langs/fr_FR/admin.lang                     |  4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 313eb5f117c..8e9cea92a35 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -237,9 +237,9 @@ foreach ($orders as $key => $value)
 	  }
         print "</td>\n";
         print "  <td>";
-        print $objMod->name;
+        print $objMod->getName();
         print "</td>\n  <td>";
-        print $objMod->description;
+        print $objMod->getDesc();
         print "</td>\n  <td align=\"center\">";
 
         if ($const_value == 1)
@@ -256,7 +256,8 @@ foreach ($orders as $key => $value)
 
         if ($const_value == 1)
 	  {
-            print "<a href=\"modules.php?action=reset&amp;value=" . $modName . "&amp;spe=" . $_GET["spe"] . "\">" . $langs->trans("Disable") . "</a></td>\n";
+            // Module actif
+            print "<a href=\"modules.php?id=".$objMod->numero."&amp;action=reset&amp;value=" . $modName . "&amp;spe=" . $_GET["spe"] . "\">" . $langs->trans("Disable") . "</a></td>\n";
 
 
             if ($objMod->config_page_url)
@@ -290,7 +291,8 @@ foreach ($orders as $key => $value)
         }
         else
 	  {
-            print "<a href=\"modules.php?action=set&amp;value=" . $modName . "&amp;spe=" . $_GET["spe"] . "\">" . $langs->trans("Activate") . "</a></td>\n  <td>&nbsp;</td>\n";
+            // Module non actif
+            print "<a href=\"modules.php?id=".$objMod->numero."&amp;action=set&amp;value=" . $modName . "&amp;spe=" . $_GET["spe"] . "\">" . $langs->trans("Activate") . "</a></td>\n  <td>&nbsp;</td>\n";
 	  }
 	
         print "</tr>\n";
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index 88eb24ee794..ba5f8fbc778 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -271,6 +271,8 @@ class DolibarrModules
     function getName()
     {
         global $langs;
+        $langs->load("admin");
+
         if ($langs->trans("Module".$this->numero."Name") != ("Module".$this->numero."Name"))
         {
             // Si traduction du nom du module existe
@@ -291,6 +293,8 @@ class DolibarrModules
     function getDesc()
     {
         global $langs;
+        $langs->load("admin");
+
         if ($langs->trans("Module".$this->numero."Desc") != ("Module".$this->numero."Desc"))
         {
             // Si traduction de la description du module existe
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e9c047214c7..9b41fafd983 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -45,6 +45,8 @@ Module75Name=Trips
 Module75Desc=Trips' management
 Module80Name=Shipping
 Module80Desc=Shippings' management
+Module310Name=Members
+Module310Desc=Members' foundation management
 DictionnaryCompanyType=Juridical kinds of company
 DictionnaryCanton=Cantons
 DictionnaryRegion=Regions
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 17163e4e569..288ab2234d8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -41,10 +41,12 @@ Module54Name=Contrats
 Module54Desc=Gestion des contrats
 Module70Name=Interventions
 Module70Desc=Gestion des interventions
-Module75Name=Déplacement
+Module75Name=Déplacements
 Module75Desc=Gestion des déplacements
 Module80Name=Expéditions
 Module80Desc=Gestion des expéditions
+Module310Name=Adhérents
+Module310Desc=Gestion des adhérents d'une association
 DictionnaryCompanyType=Formes juridiques
 DictionnaryCanton=Départements/Provinces/Cantons
 DictionnaryRegion=Régions