diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 741a0106cdd..32bbbe0df75 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); $langs->load("admin"); +$langs->load("languages"); $langs->load("other"); $langs->load("companies"); @@ -302,7 +303,7 @@ else // Show print ''.$langs->trans("Parameter").''.$langs->trans("Value").' '; $var=!$var; - print ''.$langs->trans("DefaultLanguage").'' . ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$conf->global->MAIN_LANG_DEFAULT) . ''; + print ''.$langs->trans("DefaultLanguage").'' . ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)) . ''; print ' '; print ""; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index fa307f5b1d4..9dffdcb0586 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -1,5 +1,6 @@ + * Copyright (C) 2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,13 +32,14 @@ $langs->load("companies"); $langs->load("products"); $langs->load("admin"); $langs->load("users"); +$langs->load("languages"); // Defini si peux lire/modifier permisssions $canreaduser=($user->admin || $user->rights->user->user->lire); if ($_REQUEST["id"]) { - // $user est le user qui edite, $_REQUEST["id"] est l'id de l'utilisateur edit� + // $user est le user qui edite, $_REQUEST["id"] est l'id de l'utilisateur edite $caneditfield=( (($user->id == $_REQUEST["id"]) && $user->rights->user->self->creer) || (($user->id != $_REQUEST["id"]) && $user->rights->user->user->creer)); } @@ -60,12 +62,12 @@ $dirtop = "../includes/menus/barre_top"; $dirleft = "../includes/menus/barre_left"; $dirtheme = "../theme"; -// Charge utilisateur edit� +// Charge utilisateur edite $fuser = new User($db, $id); $fuser->fetch(); $fuser->getrights(); -// Liste des zone de recherche permanantes support�es +// Liste des zone de recherche permanentes supportees $searchform=array("main_searchform_societe","main_searchform_contact","main_searchform_produitservice"); $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE); $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$langs->trans("ProductsAndServices")); @@ -164,7 +166,7 @@ if ($_GET["action"] == 'edit') // Langue par defaut $var=!$var; print ''.$langs->trans("Language").''; - print ''.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$conf->global->MAIN_LANG_DEFAULT).''; + print ''.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)).''; print 'conf->MAIN_LANG_DEFAULT?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="true"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; @@ -206,9 +208,9 @@ else $var=!$var; print ''.$langs->trans("Language").''; - print ''.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$conf->global->MAIN_LANG_DEFAULT).''; + print ''.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)).''; print 'conf->MAIN_LANG_DEFAULT?" checked":"").'> '.$langs->trans("UsePersonalValue").''; - print ''.($fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$fuser->conf->MAIN_LANG_DEFAULT).''; + print ''.($fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):($fuser->conf->MAIN_LANG_DEFAULT?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):'')).''; $var=!$var; print ''.$langs->trans("MaxSizeList").''; @@ -231,7 +233,7 @@ else } else { - if ($caneditfield || $user->admin) // Si utilisateur �dit� = utilisateur courant ayant les droits de cr�er ou admin + if ($caneditfield || $user->admin) // Si utilisateur edite = utilisateur courant ayant les droits de creer ou admin { print ''.$langs->trans("Modify").''; }