Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lang: Translation more clear

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-07 06:33:35 +00:00
parent d1e66db5ff
commit 342853591f
9 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/system/dolibarr.php
View File

@ -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>';

2
htdocs/conf/conf.class.php
View File

@ -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

2
htdocs/langs/en_US/admin.lang
View File

@ -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

2
htdocs/langs/es_ES/admin.lang
View File

@ -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)

2
htdocs/langs/fr_BE/admin.lang
View File

@ -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

2
htdocs/langs/fr_FR/admin.lang
View File

@ -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

34
htdocs/lib/doleditor.class.php
View File

@ -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();

4
htdocs/main.inc.php
View File

@ -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);

24
htdocs/translate.class.php
View File

@ -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()
{