diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php index 7945d25d013..bc26245c2de 100644 --- a/htdocs/includes/menus/barre_top/default.php +++ b/htdocs/includes/menus/barre_top/default.php @@ -39,41 +39,49 @@ else if ($conf->commercial->enabled) { + $langs->load("commercial"); + $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/comm\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } print ''; - print 'Commercial'; + print ''.$langs->trans("Commercial").''; print ''; } if ($conf->adherent->enabled) { + $langs->load("members"); + $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } print ''; - print 'Adhérents'; + print ''.$langs->trans("Members").''; print ''; } if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled) { + $langs->load("compta"); + $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } print ''; - print 'Compta/Tréso'; + print ''.$langs->trans("Accountancy")."/".$langs->trans("Treasury").''; print ''; } if ($conf->produit->enabled || $conf->service->enabled) { + $langs->load("products"); + $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } $chaine=""; - if ($conf->produit->enabled) { $chaine.="Produits"; } + if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); } if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } if ($conf->service->enabled) { $chaine.="Services"; } print ''; @@ -83,12 +91,13 @@ else if ($conf->webcal->enabled) { + $langs->load("other"); + $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/projet\/",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } print ''; -// print 'Calendrier'; - print 'Calendrier'; + print ''.$langs->trans("Calendar").''; print ''; }; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang new file mode 100644 index 00000000000..75beee3ceb6 --- /dev/null +++ b/htdocs/langs/en_US/admin.lang @@ -0,0 +1,8 @@ +# Dolibarr language file - en_US - admin +GlobalSetup=Global setup +GUISetup=GUI Setup +DictionnarySetup=Dictionnary setup +OtherSetup=Other setup +Modules=Modules +Boxes=Boxes +System=System diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang new file mode 100644 index 00000000000..10a2fa9dcf4 --- /dev/null +++ b/htdocs/langs/en_US/commercial.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - en_US - commercial +Commercial=Commercial \ No newline at end of file diff --git a/htdocs/langs/en_US/soc.lang b/htdocs/langs/en_US/companies.lang similarity index 95% rename from htdocs/langs/en_US/soc.lang rename to htdocs/langs/en_US/companies.lang index b548c4cb4c0..c63abd12f3c 100644 --- a/htdocs/langs/en_US/soc.lang +++ b/htdocs/langs/en_US/companies.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - soc NewCompany=New company (prospect, customer, supplier) Company=Company +Companies=Companies Name=Name Surname=Surname Address=Addrese diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang new file mode 100644 index 00000000000..560d94ec1af --- /dev/null +++ b/htdocs/langs/en_US/compta.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - en_US - compta +Accountancy=Accountancy +Tresury=Tresury \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 95fddbb1e6b..a00a018b545 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1,5 +1,7 @@ # Dolibarr language file - en_US - main charset="iso-8859-1" +Home=Home +Help=Help Activate=Activate Activated=Activated Add=Add @@ -10,7 +12,9 @@ Edit=Edit Search=Search ChooseLangage=Please choose your language User=User +Users=Users Group=Group +Groups=Groups Name=Name Value=Value Type=Type @@ -18,4 +22,6 @@ Note=Note Action=Action About=About WelcomeString=We are %s, and you are connected with name %s - +Number=Number +DevelopmentTeam=Development Team +Logout=Logout \ No newline at end of file diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang new file mode 100644 index 00000000000..0f74e8704d8 --- /dev/null +++ b/htdocs/langs/en_US/members.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - en_US - members +Members=Members +Attributs=Attributs \ No newline at end of file diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang new file mode 100644 index 00000000000..45a21923f46 --- /dev/null +++ b/htdocs/langs/en_US/other.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - en_US - other +Calendar=Calendar \ No newline at end of file diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang new file mode 100644 index 00000000000..ec1dedfd706 --- /dev/null +++ b/htdocs/langs/en_US/products.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - en_US - products +Products=Products +Services=Services \ No newline at end of file diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang new file mode 100644 index 00000000000..eb048751031 --- /dev/null +++ b/htdocs/langs/en_US/suppliers.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - en_US - suppliers +Suppliers=Suppliers \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang new file mode 100644 index 00000000000..46b528eed6d --- /dev/null +++ b/htdocs/langs/fr_FR/admin.lang @@ -0,0 +1,8 @@ +# Dolibarr language file - fr_FR - admin +GlobalSetup=Configuration générale +GUISetup=Configuration IHM +DictionnarySetup=Configuration dictionnaires +OtherSetup=Configuration autre +Modules=Modules +Boxes=Boites +System=Système \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang new file mode 100644 index 00000000000..599a0e202d5 --- /dev/null +++ b/htdocs/langs/fr_FR/commercial.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - fr_FR - commercial +Commercial=Commercial \ No newline at end of file diff --git a/htdocs/langs/fr_FR/soc.lang b/htdocs/langs/fr_FR/companies.lang similarity index 95% rename from htdocs/langs/fr_FR/soc.lang rename to htdocs/langs/fr_FR/companies.lang index f098c2cc59b..2aeaea23919 100644 --- a/htdocs/langs/fr_FR/soc.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - soc NewCompany=Nouvelle société (prospect, client, fournisseur) Company=Société +Companies=Sociétés Name=Nom Surname=Prénom Address=Adresse diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang new file mode 100644 index 00000000000..99caa80cade --- /dev/null +++ b/htdocs/langs/fr_FR/compta.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - fr_FR - compta +Accountancy=Compta +Treasury=Treso \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index b61be6e30ce..b235bfd0a06 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -1,5 +1,7 @@ # Dolibarr language file - fr_FR - main charset="iso-8859-1" +Home=Accueil +Help=Aide Activate=Activer Activated=Activé Add=Ajouter @@ -10,7 +12,9 @@ Edit=Editer Search=Rechercher ChooseLangage=Choisissez votre langue User=Utilisateur +Users=Utilisateurs Group=Groupe +Groups=Groupes Name=Nom Value=Valeur Type=Type @@ -18,4 +22,6 @@ Note=Note Action=Action About=A propos WelcomeString=Nous sommes le %s, et vous êtes connectés sous le user %s - +Number=Nombre +DevelopmentTeam=Equipe de développement +Logout=Deconnexion diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang new file mode 100644 index 00000000000..962915c2bd4 --- /dev/null +++ b/htdocs/langs/fr_FR/members.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - fr_FR - members +Members=Adhérents +Attributs=Attributs \ No newline at end of file diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang new file mode 100644 index 00000000000..1dcfb4aaab7 --- /dev/null +++ b/htdocs/langs/fr_FR/other.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - fr_FR - other +Calendar=Calendrier \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang new file mode 100644 index 00000000000..bbc7e9575d7 --- /dev/null +++ b/htdocs/langs/fr_FR/products.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - fr_FR - products +Products=Produits +Services=Services \ No newline at end of file diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang new file mode 100644 index 00000000000..564730b7f85 --- /dev/null +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - fr_FR - suppliers +Suppliers=Fournisseurs \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 40d6186e147..d4566e423d4 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -444,11 +444,11 @@ function top_menu($head, $title="", $target="") print $langs->lang_header(); print $head; - print ''; - print ''; + print ''; + print ''; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; @@ -486,8 +486,7 @@ function top_menu($head, $title="", $target="") { print ''; print "'; + print 'Pour cela cliquez sur Mettre à jour !!'; print "
Votre système nécessite d'être mis à jour. "; - print "Pour cela "; - print 'cliquez sur Mettre à jour !!
"; } @@ -504,7 +503,7 @@ function top_menu($head, $title="", $target="") $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "accueil") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/[^\\\/]+$",$PHP_SELF) || ereg("^".DOL_URL_ROOT."\/user\/",$PHP_SELF) || ereg("^".DOL_URL_ROOT."\/admin\/",$PHP_SELF)) { $class="menusel"; } - print '
Accueil
'; + print '
'.$langs->trans("Home").'
'; // Sommet géré par gestionnaire de menu du haut print ''; @@ -522,7 +521,7 @@ function top_menu($head, $title="", $target="") print ''.$user->login.'' ; print ''; - print 'Logout'; + print ''.$langs->trans('; } else @@ -550,7 +549,7 @@ function top_menu($head, $title="", $target="") */ Function left_menu($menu, $help_url='', $form_search='', $author='') { - global $user, $conf, $rtplang; + global $user, $conf, $langs; /* * Colonne de gauche @@ -572,6 +571,7 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') if ((defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) || (defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0)) { + $langs->load("companies"); print '
'."\n"; if (defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) @@ -584,7 +584,7 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') { print '
'; } - print 'Societes
'; + print ''.$langs->trans("Companies").'
'; print ''; print ''; print ''; @@ -595,8 +595,8 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') if (defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0) { - print ''; - print 'Contacts
'; + print ''; + print ''.$langs->trans("Contacts").'
'; print ''; print ''; print ' '; @@ -606,8 +606,9 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') if ($conf->produit->enabled) { + $langs->load("products"); print ''; - print 'Produits
'; + print ''.$langs->trans("Products").'
'; print ' '; print ''; print "
\n"; diff --git a/htdocs/soc.php b/htdocs/soc.php index c3986b4e35c..d29c65cd061 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -24,7 +24,7 @@ require("pre.inc.php"); -$langs->load("soc"); +$langs->load("companies"); /*