Enabled 3rd party translation in dictionary

Dolibarr · Oct 18, 2011 · f046983 · f046983
1 parent 88ba710
commit f046983
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
@@ -621,6 +621,7 @@
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
             if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
             if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
             if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }
@@ -713,6 +714,7 @@
                 // dans les dictionnaires de donnees
                 $showfield=1;							  	// Par defaut
                 $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+                $valuetoshow=$langs->trans($valuetoshow);   // try to translate
                 if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
                 if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
                 if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }

diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
@@ -901,6 +901,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
                                     $taborder[] = count($tabname)+1;
                                     $tabname[] = $val;
                                 }
+                                $langs->load($objMod->dictionnaries['langs']);
                                 foreach($objMod->dictionnaries['tablib'] as $val) $tablib[] = $val;
                                 foreach($objMod->dictionnaries['tabsql'] as $val) $tabsql[] = $val;
                                 foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tabsqlsort[] = $val;