From 4e7294530df007dbc8b52f0c384657e9dd92d687 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Feb 2009 12:29:55 +0000 Subject: [PATCH] Comment deprecate code and update regional number formats --- htdocs/admin/system/dolibarr.php | 64 +++++++++++++++++--------------- htdocs/langs/ca_ES/main.lang | 2 +- htdocs/langs/da_DA/main.lang | 2 +- htdocs/langs/de_DE/main.lang | 2 +- htdocs/langs/en_AU/main.lang | 2 + htdocs/langs/en_US/main.lang | 2 +- htdocs/langs/es_ES/main.lang | 2 +- htdocs/langs/fi_FI/main.lang | 4 +- htdocs/langs/fr_FR/main.lang | 2 +- htdocs/langs/it_IT/main.lang | 2 +- htdocs/langs/nl_NL/main.lang | 4 +- htdocs/langs/no_NO/main.lang | 4 +- htdocs/langs/pl_PL/main.lang | 4 +- htdocs/langs/pt_PT/main.lang | 9 +---- htdocs/langs/ro_RO/main.lang | 4 +- htdocs/langs/ru_RU/main.lang | 4 +- htdocs/translate.class.php | 7 +++- 17 files changed, 63 insertions(+), 57 deletions(-) diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 8c90382afe8..db82d25725f 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2009 Laurent Destailleur * Copyright (C) 2007 Rodolphe Quiedeville * * This program is free software; you can redistribute it and/or modify @@ -31,20 +31,21 @@ $langs->load("other"); if (!$user->admin) accessforbidden(); - - + + /* * View */ $form=new Form($db); - + llxHeader(); print_fiche_titre("Dolibarr",'','setup'); print "
\n"; +// Version $var=true; print ''; print ''."\n"; @@ -57,13 +58,35 @@ print "
'.$langs->trans("Version").''.$langs->trans("Value").'
".$langs->trans("VersionLastUpgrade") print '
'; print '
'; -// Language +// Session +$var=true; +print ''; +print ''."\n"; +$var=!$var; +print "\n"; +$var=!$var; +print "\n"; +$var=!$var; +print "\n"; +$var=!$var; +print "\n"; +$var=!$var; +print "\n"; +print '
'.$langs->trans("Session").''.$langs->trans("Value").'
".$langs->trans("SessionId").''.session_id()."
".$langs->trans("CurrentSessionTimeOut").''.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds"); +print ''; +print $form->textwithhelp('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); +print "
".$langs->trans("CurrentTheme").''.$conf->theme."
".$langs->trans("CurrentTopMenuHandler").''.$conf->top_menu."
".$langs->trans("CurrentLeftMenuHandler").''.$conf->left_menu."
'; +print '
'; + +// Localisation $var=true; print ''; print ''."\n"; $var=!$var; print "\n"; $var=!$var; +print "\n"; +/*$var=!$var; print "\n"; $var=!$var; print "\n"; @@ -71,10 +94,7 @@ $var=!$var; print "\n"; //$var=!$var; //print "\n"; -$var=!$var; -print ""; -$var=!$var; -print ""; +*/ // Thousands $var=!$var; $thousand=$langs->trans("SeparatorThousand"); @@ -84,6 +104,9 @@ print "\n"; +// Show results of functions to see if everything works +$var=!$var; +print ""; $var=!$var; print ""; if (($thousand != ',' && $thousand != '.') || ($thousand != ' ')) @@ -92,6 +115,8 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' ')) print ""; print "\n"; } +$var=!$var; +print ""; //print ''."\n"; // Timezone $var=!$var; @@ -111,27 +136,8 @@ $var=!$var; print "\n"; $var=!$var; print "\n"; -print '
'.$langs->trans("LocalisationDolibarrParameters").''.$langs->trans("Value").'
".$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE")."".$_SERVER["HTTP_ACCEPT_LANGUAGE"]."
".$langs->trans("CurrentUserLanguage").''.$langs->getDefaultLang()."
".$langs->trans("LanguageBrowserParameter","LANG")."".$_ENV["LANG"]."
".$langs->trans("LanguageParameter","PHP LC_ALL")."".setlocale(LC_ALL,0)."
".$langs->trans("LanguageParameter","PHP LC_NUMERIC")."".setlocale(LC_NUMERIC,0)."
".$langs->trans("LanguageParameter","PHP LC_MONETARY")."".setlocale(LC_MONETARY,0)."
=> price2num(1234.56)'.price2num(1233.56+1,'2')."
=> dol_print_date(0,"dayhourtext")'.dol_print_date(0,"dayhourtext")."
".$langs->trans("CurrentValueSeparato $var=!$var; $dec=$langs->trans("SeparatorDecimal"); print "
".$langs->trans("CurrentValueSeparatorDecimal")."".$dec."
=> price2num(1233.56+1)'.price2num(1233.56+1,'2')."
=> price2num('."'1".$thousand."234".$dec."56')".price2num("1".$thousand."234".$dec."56",'2')."
=> price2num('."'1 234.56')".price2num("1 234.56",'2')."
=> price(1234.56)'.price(1234.56)."
'.$langs->trans("TimeZone").''.$langs->trans("Value").'
=> ".$langs->trans("PHPServerOffsetWithGreenwich")."".(- dolibarr_mktime(0,0,0,1,1,1970))."
=> ".$langs->trans("CurrentHour")."".dolibarr_print_date(time(),'dayhour')."
'; -print '
'; - -$var=true; -print ''; -print ''."\n"; $var=!$var; -print "\n"; -$var=!$var; -print "\n"; -$var=!$var; -print "\n"; -$var=!$var; -print "\n"; -$var=!$var; -print "\n"; -$var=!$var; -print "\n"; +print ""; print '
'.$langs->trans("Session").''.$langs->trans("Value").'
".$langs->trans("SessionId").''.session_id()."
".$langs->trans("CurrentSessionTimeOut").''.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds"); -print ''; -print $form->textwithhelp('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); -print "
".$langs->trans("CurrentTheme").''.$conf->theme."
".$langs->trans("CurrentTopMenuHandler").''.$conf->top_menu."
".$langs->trans("CurrentLeftMenuHandler").''.$conf->left_menu."
".$langs->trans("CurrentUserLanguage").''.$langs->getDefaultLang()."
=> dol_print_date(0,"dayhourtext")'.dol_print_date(0,"dayhourtext")."
'; print '
'; diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index fbc6a9f027f..23222e40746 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -1,8 +1,8 @@ # Dolibarr language file - ca_ES - main CHARSET = UTF-8 -DatabaseConnection = Connexió a la base de dades SeparatorDecimal = , SeparatorThousand = . +DatabaseConnection = Connexió a la base de dades Error = Error ErrorFieldRequired = El camp '%s' és obligatori ErrorFieldFormat = El camp '%s' té un valor incorrecte diff --git a/htdocs/langs/da_DA/main.lang b/htdocs/langs/da_DA/main.lang index ebfe61b30fd..8bf9f6c66e3 100644 --- a/htdocs/langs/da_DA/main.lang +++ b/htdocs/langs/da_DA/main.lang @@ -11,9 +11,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 -DatabaseConnection=Database forbindelse SeparatorDecimal=. SeparatorThousand=, +DatabaseConnection=Database forbindelse Error=Fejl ErrorFieldRequired=Felt '% s' er påkrævet ErrorFieldFormat=Felt '% s' har en dårlig værdi diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index f83a197ada6..38ef0c01cd0 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -9,9 +9,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 -DatabaseConnection=Datenbank-Verbindung SeparatorDecimal=. SeparatorThousand=, +DatabaseConnection=Datenbank-Verbindung Error=Fehler ErrorFieldRequired=Feld '% s' ist erforderlich ErrorFieldFormat=Feld '% s' hat einen schlechten Wert diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index f53b15efdbd..79c42e51f1f 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -1,6 +1,8 @@ # Dolibarr language file - en_AU - main # This file contains only line that must differs from en_US file CHARSET=UTF-8 +SeparatorDecimal=. +SeparatorThousand=, UnitPrice=Unit price UnitPriceHT=Unit price (excl GST) UnitPriceTTC=Unit price diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b509588c6f3..4c596475498 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1,8 +1,8 @@ # Dolibarr language file - en_US - main CHARSET=UTF-8 -DatabaseConnection=Database connection SeparatorDecimal=. SeparatorThousand=, +DatabaseConnection=Database connection Error=Error ErrorFieldRequired=Field '%s' is required ErrorFieldFormat=Field '%s' has a bad value diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 798e4ffce27..2289df20bc8 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -1,8 +1,8 @@ # Dolibarr language file - es_ES - main CHARSET = UTF-8 -DatabaseConnection = Conexión a la base de datos SeparatorDecimal = , SeparatorThousand = +DatabaseConnection = Conexión a la base de datos Error = Error ErrorFieldRequired = El campo '%s' es obligatorio ErrorFieldFormat = El campo '%s' tiene un valor incorrecto diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index c200e3d35a4..f45108de53f 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -9,9 +9,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 -DatabaseConnection=Tietokannan yhteydessä SeparatorDecimal=. -SeparatorThousand=, +SeparatorThousand= +DatabaseConnection=Tietokannan yhteydessä Error=Virhe ErrorFieldRequired=Kenttä '% s' on ErrorFieldFormat=Kenttä "% s \" on huono arvo diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index c9f853aa1ce..7c60d7f8766 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -1,8 +1,8 @@ # Dolibarr language file - fr_FR - main CHARSET=UTF-8 -DatabaseConnection=Connexion à la base SeparatorDecimal=, SeparatorThousand= +DatabaseConnection=Connexion à la base Error=Erreur ErrorFieldRequired=Le champ '%s' est obligatoire ErrorFieldFormat=Le champ '%s' a une valeur incorrecte diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index d0029fd7726..5ae6a3518c9 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -1,8 +1,8 @@ # Dolibarr language file - it_IT - main CHARSET =ISO-8859-1 -DatabaseConnection =Connessione al database SeparatorDecimal =, SeparatorThousand = +DatabaseConnection =Connessione al database Error =Errore ErrorFieldRequired =Il campo '%s' necessaria ErrorFieldFormat =Il campo '%s' ha un valore cattivo diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index b77005e28d5..68794e19d8d 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -11,9 +11,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= DatabaseConnection=Database connectie -SeparatorDecimal=. -SeparatorThousand=, Error=Fout ErrorFieldRequired=Veld '% s' is vereist ErrorFieldFormat=Veld '% s' heeft een slechte waarde diff --git a/htdocs/langs/no_NO/main.lang b/htdocs/langs/no_NO/main.lang index eba426d9844..b67f2adc093 100644 --- a/htdocs/langs/no_NO/main.lang +++ b/htdocs/langs/no_NO/main.lang @@ -9,9 +9,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= DatabaseConnection=Database-tilkobling -SeparatorDecimal=. -SeparatorThousand=, Error=Feil ErrorFieldRequired=Feltet '% s' er nødvendig ErrorFieldFormat=Feltet '% s' har en dårlig verdi diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 71dcae50f0a..80e3e48a756 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -11,9 +11,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= DatabaseConnection=Połączenia z bazą danych -SeparatorDecimal=. -SeparatorThousand=, Error=Błąd ErrorFieldRequired=Pole '% s' jest wymagane ErrorFieldFormat=Pole '% s' ma złe wartości diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 2ac8213b1b1..6ffb4921c21 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -1,5 +1,7 @@ # Dolibarr language file - pt_PT - principal CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= Error=Erro ErrorFieldRequired=O campo '%s' é obrigatório ErrorFileDoesNotExists=O ficheiro %s não existe @@ -192,14 +194,7 @@ Photos=Imagens AddPhoto=Adicionar imagem - -// Date 2009-01-18 18:56:33 -// START - Lines generated via parser -// Reference language: en_US -CHARSET=ISO-8859-1 DatabaseConnection=Database conexão -SeparatorDecimal=. -SeparatorThousand=, ErrorFieldFormat=Domínio '% s' tem um valor negativo ErrorFailedToOpenFile=Falha ao abrir o arquivo% s ErrorCanNotReadDir=Não é possível ler dir% s diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index 849fb436acf..eb606a0f774 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -9,9 +9,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= DatabaseConnection=Baza de date de conectare -SeparatorDecimal=. -SeparatorThousand=, Error=Eroare ErrorFieldRequired=Câmp "% s" este necesar ErrorFieldFormat=Câmp "% s" are o valoare de rău diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index c481bd1028e..965347320e9 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -9,9 +9,9 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 +SeparatorDecimal=, +SeparatorThousand= DatabaseConnection=Подключение к базе данных -SeparatorDecimal=. -SeparatorThousand=, Error=Ошибка ErrorFieldRequired=Поле '% S' требуется ErrorFieldFormat=Поле '% S' имеет значения плохо diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index 146348801f7..0d673a4ed87 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -141,11 +141,13 @@ class Translate { \brief Positionne environnement PHP en fonction du langage \remarks Le code langue long (fr_FR, en_US, ...) doit avoir etre positionne par setDefaultLang \return int >0 si ok, <0 so ko + \deprecated */ function setPhpLang() { //dolibarr_syslog("Translate::setPhpLang ".$this->defaultlang,LOG_DEBUG); - + return; +/* $code_lang_tiret=ereg_replace('_','-',$this->defaultlang); //print 'code_lang_tiret='.$code_lang_tiret; setlocale(LC_ALL, $this->defaultlang); // Some OS (Windows) need local with _ @@ -159,7 +161,8 @@ class Translate { $res_lc_monetary=setlocale(LC_MONETARY, MAIN_FORCE_SETLOCALE_LC_MONETARY.'UTF-8', MAIN_FORCE_SETLOCALE_LC_MONETARY); //print 'x'.$res_lc_all; return 1; - } +*/ + } /**