diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index abcc5511bdb..df2897a86cf 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -92,6 +92,7 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan $form = new Form($db); $formadmin = new FormAdmin($db); + /* * Actions */ @@ -379,9 +380,9 @@ if ($action == 'edit') { // Language by default print ''.$langs->trans("Language").''; print ''; - $s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); + $s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT')); print $s ? $s.' ' : ''; - print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT'))); + print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT'))); print ''; print 'conf->MAIN_LANG_DEFAULT) ? " checked" : ""); print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo @@ -426,13 +427,13 @@ if ($action == 'edit') { // Max size of lists print ''.$langs->trans("MaxSizeList").''; $mainsizelistelimit = getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'); - print ''.($mainsizelistelimit > 0 ? getDolGlobalString('MAIN_SIZE_LISTE_LIMIT') : ''.$langs->trans("Automatic").'').''; + print ''.($mainsizelistelimit > 0 ? getDolGlobalString('MAIN_SIZE_LISTE_LIMIT') : ''.$langs->trans("Automatic").'').''; print 'conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : ""); print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo print '> '; print ''; - // Max size of lists + // Max size of short lists print ''.$langs->trans("MaxSizeShortList").''; print '' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').''; print 'conf->MAIN_SIZE_SHORTLIST_LIMIT) ? " checked" : ""); @@ -501,9 +502,9 @@ if ($action == 'edit') { // Language print ''.$langs->trans("Language").''; print ''; - $s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); + $s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT')); print($s ? $s.' ' : ''); - print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT'))); + print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT'))); print ''; print 'conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").''; print ''; @@ -568,11 +569,11 @@ if ($action == 'edit') { // Max size for lists print ''.$langs->trans("MaxSizeList").''; $mainsizelistelimit = getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'); - print ''.($mainsizelistelimit > 0 ? getDolGlobalString('MAIN_SIZE_LISTE_LIMIT') : ''.$langs->trans("Automatic").'').''; + print ''.($mainsizelistelimit > 0 ? getDolGlobalString('MAIN_SIZE_LISTE_LIMIT') : ''.$langs->trans("Automatic").'').''; print 'conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").''; print ''.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : ' ').''; - // Max size for lists + // Max size for short lists print ''.$langs->trans("MaxSizeShortList").''; print ''.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT', ' ').''; print 'conf->MAIN_SIZE_SHORTLIST_LIMIT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'';