lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-14 20:42:17 +00:00
parent fcde5e28bc
commit cdf3368295
9 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/dict.php
View File

@ -849,7 +849,7 @@ function fieldList($fieldlist,$obj='')
} }
elseif ($fieldlist[$field] == 'lang') { elseif ($fieldlist[$field] == 'lang') {
print '<td>'; print '<td>';
$formadmin->select_lang($conf->global->MAIN_LANG_DEFAULT,'lang'); print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
print '</td>'; print '</td>';
} }
// Le type de l'element (pour les type de contact).' // Le type de l'element (pour les type de contact).'

2
htdocs/admin/ihm.php
View File

@ -124,7 +124,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
// Default language // Default language
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
$formadmin->select_lang($conf->global->MAIN_LANG_DEFAULT,'main_lang_default',1); print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'main_lang_default',1);
print '</td>'; print '</td>';
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
print '</tr>'; print '</tr>';

2
htdocs/admin/numberwords.php
View File

@ -167,7 +167,7 @@ print '</select>';
print '</td>'; print '</td>';
print '<td><input type="text" name="value" class="flat" value="'.$_POST["value"].'"></td>'; print '<td><input type="text" name="value" class="flat" value="'.$_POST["value"].'"></td>';
print '<td>'; print '<td>';
$htmlother->select_lang($_POST["lang_id"]?$_POST["lang_id"]:$langs->defaultlang,'lang_id'); print $htmlother->select_language($_POST["lang_id"]?$_POST["lang_id"]:$langs->defaultlang,'lang_id');
print '</td>'; print '</td>';
print '<td><input type="submit" class="button" '.$option.' value="'.$langs->trans("ToTest").'"></td>'; print '<td><input type="submit" class="button" '.$option.' value="'.$langs->trans("ToTest").'"></td>';
print '<td>'.$newvaltest.'</td>'; print '<td>'.$newvaltest.'</td>';

31
htdocs/core/class/html.formadmin.class.php
View File

@ -44,14 +44,15 @@ class FormAdmin
return 1; return 1;
} }
/** /**
* \brief Retourne la liste deroulante des langues disponibles * Output list with available languages.
* \param selected Langue pre-selectionnee * @deprecated Use select_language instead
* \param htmlname Nom de la zone select * @param selected Langue pre-selectionnee
* \param showauto Affiche choix auto * @param htmlname Nom de la zone select
* \param filter Array of keys to exclude in list * @param showauto Affiche choix auto
* \param showempty Add empty value * @param filter Array of keys to exclude in list
* @param showempty Add empty value
*/ */
function select_lang($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0) function select_lang($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0)
{ {
@ -59,19 +60,19 @@ class FormAdmin
} }
/** /**
* \brief Retourne la liste deroulante des langues disponibles * Return html select list with available languages
* \param selected Langue pre-selectionnee * @param selected Langue pre-selectionnee
* \param htmlname Nom de la zone select * @param htmlname Nom de la zone select
* \param showauto Affiche choix auto * @param showauto Affiche choix auto
* \param filter Array of keys to exclude in list * @param filter Array of keys to exclude in list
* \param showempty Add empty value * @param showempty Add empty value
*/ */
function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0) function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0)
{ {
global $langs; global $langs;
$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12); $langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
$out=''; $out='';
$out.= '<select class="flat" name="'.$htmlname.'">'; $out.= '<select class="flat" name="'.$htmlname.'">';
@ -109,7 +110,7 @@ class FormAdmin
} }
} }
$out.= '</select>'; $out.= '</select>';
return $out; return $out;
} }

2
htdocs/core/class/html.formfile.class.php
View File

@ -348,7 +348,7 @@ class FormFile
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php');
$formadmin=new FormAdmin($this->db); $formadmin=new FormAdmin($this->db);
$defaultlang=$codelang?$codelang:$langs->getDefaultLang(); $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
$formadmin->select_lang($defaultlang); print $formadmin->select_language($defaultlang);
} }
else else
{ {

2
htdocs/install/index.php
View File

@ -60,7 +60,7 @@ print '</center>';
print '<br><br><center>'; print '<br><br><center>';
print '<table><tr>'; print '<table><tr>';
print '<td>'.$langs->trans("DefaultLanguage").' : </td><td align="left">'; print '<td>'.$langs->trans("DefaultLanguage").' : </td><td align="left">';
$formadmin->select_lang('auto','selectlang',1); print $formadmin->select_language('auto','selectlang',1);
print '</td>'; print '</td>';
print '</tr></table></center>'; print '</tr></table></center>';

2
htdocs/product/traduction.php
View File

@ -242,7 +242,7 @@ if ($_GET["action"] == 'add' && ($user->rights->produit->creer || $user->rights-
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Translation').'</td><td>'; print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Translation').'</td><td>';
$formadmin->select_lang('','lang',0,$product->multilangs); print $formadmin->select_language('','lang',0,$product->multilangs);
print '</td></tr>'; 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%" 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>'; print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';

4
htdocs/societe/soc.php
View File

@ -864,7 +864,7 @@ else
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n"; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
$formadmin->select_lang(($soc->default_lang?$soc->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1); print $formadmin->select_language(($soc->default_lang?$soc->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
@ -1318,7 +1318,7 @@ else
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n"; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
$formadmin->select_lang($soc->default_lang,'default_lang',0,0,1); print $formadmin->select_language($soc->default_lang,'default_lang',0,0,1);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }

2
htdocs/user/param_ihm.php
View File

@ -175,7 +175,7 @@ if ($_GET["action"] == 'edit')
print ! empty($dolibarr_main_demo)?' disabled="true"':''; // Disabled for demo print ! empty($dolibarr_main_demo)?' disabled="true"':''; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").'</td>'; print '> '.$langs->trans("UsePersonalValue").'</td>';
print '<td>'; print '<td>';
$formadmin->select_lang($fuser->conf->MAIN_LANG_DEFAULT,'main_lang_default',1); print $formadmin->select_language($fuser->conf->MAIN_LANG_DEFAULT,'main_lang_default',1);
print '</td></tr>'; print '</td></tr>';
// Taille max des listes // Taille max des listes