diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 6311eea0abe6c905a229af48371f8307bc0accd4..2477021e86ad63ffeb948431b2050aaefb847dd7 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -18,10 +18,10 @@
*/
/**
- \file htdocs/admin/system/dolibarr.php
- \brief Fichier page info systemes Dolibarr
- \version $Id$
-*/
+ * \file htdocs/admin/system/dolibarr.php
+ * \brief Fichier page info systemes Dolibarr
+ * \version $Id$
+ */
require("./pre.inc.php");
@@ -31,7 +31,11 @@ $langs->load("install");
if (!$user->admin)
accessforbidden();
-
+
+/*
+ * View
+ */
+
llxHeader();
print_fiche_titre("Dolibarr",'','setup');
@@ -83,7 +87,7 @@ print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTopMenuHandle
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentLeftMenuHandler")."</td><td>".$conf->left_menu."</td></tr>\n";
$var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentDolibarrLanguage")."</td><td>".$langs->getDefaultLang()."</td></tr>\n";
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentUserLanguage")."</td><td>".$langs->getDefaultLang()."</td></tr>\n";
print '</table>';
print '<br>';
diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index 78241010031c9ee471982c7b73427cf0b5a7038d..11c3c6f0fad158f3f4daa4036382e33ec213756d 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -135,7 +135,7 @@ class Conf
/*
* Charge l'objet de traduction et positionne langage courant global
*/
- if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT="fr_FR";
+ if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT="en_US";
/*
* Autres parametres globaux de configurations
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 14e2d01e61c1b90d343e35311fb33950e2e494fb..30e672f77220acb0e25355c622bfa25b9c436c0f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -69,7 +69,7 @@ ParameterInDolibarr=Parameter %s
LanguageParameter=Language parameter %s
LanguageBrowserParameter=Parameter %s
LocalisationDolibarrParameters=Localisation parameters
-CurrentDolibarrLanguage=Dolibarr current language
+CurrentUserLanguage=Current language
DolibarrTZ=Time Zone
ServerTZ=Time Zone Server
PHPTZ=Time Zone PHP
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index b9edfdb8e92cd09d3e236697152a920a60648e28..88e2e8669865fff70e757895fe8df7fcd6070a48 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -71,7 +71,7 @@ ParameterInDolibarr=Variable %s
LanguageParameter=Variable idioma %s
LanguageBrowserParameter=Variable %s
LocalisationDolibarrParameters=Par�metros de localizaci�n
-CurrentDolibarrLanguage=Idioma actual Dolibarr
+CurrentUserLanguage=Idioma actual
DolibarrTZ=Zona hoaria
ServerTZ=Zona hoaria
PHPServerOffsetWithGreenwich=Offset con Greenwich (segundos)
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index af1661016b6b902090e54b91ecd6f17e2962720e..f210c38562becac64df2937fc508f94ece784a47 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -38,7 +38,7 @@ ParameterInDolibarr=Param
LanguageParameter=Param�tre linguistique %s
LanguageBrowserParameter=Param�tre linguistique %s du navigateur
LanguageDolibarrParameter=Param�tre linguistique de Dolibarr
-CurrentDolibarrLanguage=Langue courante de Dolibarr
+CurrentUserLanguage=Langue utilisateur actuelle
CurrentDolibarrTZ=Time Zone Dolibarr courante
OSEnv=Environnement du syst�me d'exploitation
Box=Bo�te
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 37492082856575d8a5493e13a230f4dfb3dad341..cd7caa71a8b487cab31046ec7c5b14280ab8a82b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -69,7 +69,7 @@ ParameterInDolibarr=Variable %s
LanguageParameter=Variable langue %s
LanguageBrowserParameter=Variable %s
LocalisationDolibarrParameters=Param�tres de localisation
-CurrentDolibarrLanguage=Langue Dolibarr courante
+CurrentUserLanguage=Langue utilisateur actuelle
DolibarrTZ=Time Zone
ServerTZ=Time Zone Serveur
PHPTZ=Time Zone PHP
diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php
index 82b40659fc47c8476b0f336e7465ba19967138df..4b00c8034c81a72c36615d84f2f890265a0432ab 100644
--- a/htdocs/lib/doleditor.class.php
+++ b/htdocs/lib/doleditor.class.php
@@ -18,19 +18,18 @@
*/
/**
- \file htdocs/lib/doleditor.class.php
- \brief Classe permettant de g�rer FCKEditor
- \version $Id$
+ * \file htdocs/lib/doleditor.class.php
+ * \brief Classe permettant de g�rer FCKEditor
+ * \version $Id$
*/
/**
- \class DolEditor
- \brief Classe de gestion de FCKEditor
- \remarks Usage:
- \remarks $doleditor=new DolEditor('body',$message,320,'toolbar_mailing');
- \remarks $doleditor->Create();
-*/
-
+ * \class DolEditor
+ * \brief Classe de gestion de FCKEditor
+ * \remarks Usage:
+ * \remarks $doleditor=new DolEditor('body',$message,320,'toolbar_mailing');
+ * \remarks $doleditor->Create();
+ */
class DolEditor
{
var $editor;
@@ -81,22 +80,13 @@ class DolEditor
{
$this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
$this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
-// if ($langs->origlang!='auto')
-// {
-// }
- }
- else
- {
-// if ($langs->origlang!='auto')
-// {
-// }
- }
+ }
}
/**
- \brief Affiche zone �dition
- */
+ * \brief Show edit area
+ */
function Create()
{
$this->editor->Create();
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0b5b3e95c3c85870f025645bcb94254697deafd7..98db1f3ebc0f178ae31ac76a01b03bdc2823aae8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -948,7 +948,9 @@ function top_menu($head, $title="", $target="")
$htmltext.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dolibarr_print_date($user->datelastlogin,"dayhour");
$htmltext.='<br><b>'.$langs->trans("PreviousConnexion").'</b>: '.dolibarr_print_date($user->datepreviouslogin,"dayhour");
$htmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"];
-
+ $htmltext.='<br><b>'.$langs->trans("CurrentTheme").'</b>: '.$conf->theme;
+ $htmltext.='<br><b>'.$langs->trans("CurrentUserLanguage").'</b>: '.$langs->getDefaultLang();
+
$html=new Form($db);
print $html->textwithtooltip('',$htmltext,2,1,$text);
diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php
index 69af6967bcfc0eac222a74a9486e2630f835ab52..ac49c4aa9f9a2935501536ecca2d5f773b158976 100644
--- a/htdocs/translate.class.php
+++ b/htdocs/translate.class.php
@@ -19,24 +19,23 @@
* ************************************************************************* */
/**
- \file htdocs/translate.class.php
- \brief Fichier de la classe de traduction
- \author Eric Seigne
- \author Laurent Destailleur
- \version $Id$
-*/
+ * \file htdocs/translate.class.php
+ * \brief File for tanslation class
+ * \author Eric Seigne
+ * \author Laurent Destailleur
+ * \version $Id$
+ */
/**
- \class Translate
- \brief Class to manage translations
-*/
+ * \class Translate
+ * \brief Class to manage translations
+ */
class Translate {
var $dir; // Directory with translation files
var $dir_bis; // Second directory with translation files (for development on two workspaces)
- var $origlang; // Langue origine
var $defaultlang; // Langue courante en vigueur de l'utilisateur
var $tab_loaded=array(); // Tableau pour signaler les fichiers deja charges
@@ -123,8 +122,9 @@ class Translate {
/**
- * \brief Get accessor for this->defaultlang
- * \return string Language used
+ * \brief Return active language code for current user
+ * \remarks Accessor for this->defaultlang
+ * \return string Language code used (en_US, en_AU, fr_FR, ...)
*/
function getDefaultLang()
{