From 009707746ac5845258b585bd4f021bbfbccbe4da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 18 Sep 2004 16:44:52 +0000
Subject: [PATCH] Trad: Traduction du dictionnaires des pays.

---
 htdocs/html.form.class.php   |  7 ++++---
 htdocs/langs/en_US/dict.lang | 25 +++++++++++++++++++++++++
 htdocs/langs/fr_BE/dict.lang | 25 +++++++++++++++++++++++++
 htdocs/langs/fr_FR/dict.lang | 25 +++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100755 htdocs/langs/en_US/dict.lang
 create mode 100755 htdocs/langs/fr_BE/dict.lang
 create mode 100755 htdocs/langs/fr_FR/dict.lang

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index e680c741165..230225c8013 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -171,6 +171,7 @@ class Form
    * \brief     Retourne la liste déroulante des pays actifs, dans la langue de l'utilisateur
    * \param     selected    code pays pré-sélectionné
    * \param     htmlname    nom de la liste deroulante
+   * \todo      trier liste sur noms après traduction plutot que avant
    */
   function select_pays($selected='',$htmlname='pays_id')
   {
@@ -179,7 +180,7 @@ class Form
     
     $sql = "SELECT rowid, libelle, code, active FROM ".MAIN_DB_PREFIX."c_pays";
     $sql .= " WHERE active = 1";
-    $sql .= " ORDER BY libelle ASC;";
+    $sql .= " ORDER BY code ASC;";
     
     if ($this->db->query($sql))
     {
@@ -202,8 +203,8 @@ class Form
                     print '<option value="'.$obj->rowid.'">';
                 }
                 # Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
-                print ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->libelle!='-'?$obj->libelle:''));
-                if ($obj->code) { print ' ('.$obj->code.')'; }
+                if ($obj->code) { print '['.$obj->code.'] '; }
+                print ($langs->trans("Country".$obj->code)!="Country".$obj->code?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:''));
                 print '</option>';
                 $i++;
             }
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
new file mode 100755
index 00000000000..bc1e8f15467
--- /dev/null
+++ b/htdocs/langs/en_US/dict.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Suitzerland
+CountryGB=Gret Britain
+CountryIE=Irland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Maroco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Deutchland
+CountryHU=Hongria
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Côte d'Ivoire
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroun
\ No newline at end of file
diff --git a/htdocs/langs/fr_BE/dict.lang b/htdocs/langs/fr_BE/dict.lang
new file mode 100755
index 00000000000..8ce4e4958c9
--- /dev/null
+++ b/htdocs/langs/fr_BE/dict.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - en_FR - dict
+CountryFR=France
+CountryBE=Belgique
+CountryIT=Italie
+CountryES=Espagne
+CountryDE=Allemagne
+CountryCH=Suisse
+CountryGB=Royaume uni
+CountryIE=Irlande
+CountryCN=Chine
+CountryTN=Tunisie
+CountryUS=Etats Unis
+CountryMA=Maroc
+CountryDZ=Algérie
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Pays Bas
+CountryHU=Hongrie
+CountryRU=Russie
+CountrySE=Suède
+CountryCI=Côte d'Ivoire
+CountrySN=Sénégal
+CountryAR=Argentine
+CountryCM=Cameroun
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
new file mode 100755
index 00000000000..8ce4e4958c9
--- /dev/null
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - en_FR - dict
+CountryFR=France
+CountryBE=Belgique
+CountryIT=Italie
+CountryES=Espagne
+CountryDE=Allemagne
+CountryCH=Suisse
+CountryGB=Royaume uni
+CountryIE=Irlande
+CountryCN=Chine
+CountryTN=Tunisie
+CountryUS=Etats Unis
+CountryMA=Maroc
+CountryDZ=Algérie
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Pays Bas
+CountryHU=Hongrie
+CountryRU=Russie
+CountrySE=Suède
+CountryCI=Côte d'Ivoire
+CountrySN=Sénégal
+CountryAR=Argentine
+CountryCM=Cameroun
\ No newline at end of file