Merge pull request #95 from cbattarel/develop

resolve product translation bug
This commit is contained in:
Regis Houssin 2012-01-19 00:37:33 -08:00
commit 1d10dc9d98

View File

@ -63,7 +63,7 @@ $_POST["cancel"] != $langs->trans("Cancel") &&
$current_lang = $langs->getDefaultLang();
// update de l'objet
if ( $_POST["lang"] == $current_lang )
if ( $_POST["translang"] == $current_lang )
{
$product->libelle = $_POST["libelle"];
$product->description = dol_htmlcleanlastbr($_POST["desc"]);
@ -71,9 +71,9 @@ $_POST["cancel"] != $langs->trans("Cancel") &&
}
else
{
$product->multilangs[$_POST["lang"]]["libelle"] = $_POST["libelle"];
$product->multilangs[$_POST["lang"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
$product->multilangs[$_POST["lang"]]["note"] = dol_htmlcleanlastbr($_POST["note"]);
$product->multilangs[$_POST["translang"]]["libelle"] = $_POST["libelle"];
$product->multilangs[$_POST["translang"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
$product->multilangs[$_POST["translang"]]["note"] = dol_htmlcleanlastbr($_POST["note"]);
}
// sauvegarde en base
@ -240,7 +240,7 @@ if ($_GET["action"] == 'add' && ($user->rights->produit->creer || $user->rights-
print '<table class="border" width="100%">';
print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Translation').'</td><td>';
print $formadmin->select_language('','lang',0,$product->multilangs);
print $formadmin->select_language('','translang',0,$product->multilangs);
print '</td></tr>';
print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';