From 616197c43fff355bd33c13290f0439bb3bd3b98a Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@aconit.easter-eggs.fr>
Date: Thu, 31 Dec 2009 14:43:59 +0100
Subject: [PATCH] LSattr_html_select_list : Added translation of possiblies
 values labels. Updated consequently generate_lang_file.php and trad. FR
 files.

---
 .../conf/LSobjects/config.LSobjects.LSpeople.php  |  6 +++---
 .../class/class.LSattr_html_select_list.php       |  2 +-
 public_html/lang/fr_FR.UTF8/lang.php              | 15 +++++++++++++--
 public_html/lang/generate_lang_file.php           |  9 +++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/public_html/conf/LSobjects/config.LSobjects.LSpeople.php b/public_html/conf/LSobjects/config.LSobjects.LSpeople.php
index da0ab18d..7ec8f26f 100644
--- a/public_html/conf/LSobjects/config.LSobjects.LSpeople.php
+++ b/public_html/conf/LSobjects/config.LSobjects.LSpeople.php
@@ -409,9 +409,9 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
       'html_type' => 'select_list',
       'html_options' => array (
         'possible_values' => array(
-          'M.' => 'M.',
-          'Mme' => 'Mme',
-          'Mlle' => 'Mlle'
+          'M.' => 'Mr',
+          'Mme' => 'Mrs',
+          'Mlle' => 'Ms'
         )
       ),
       'required' => 1,
diff --git a/public_html/includes/class/class.LSattr_html_select_list.php b/public_html/includes/class/class.LSattr_html_select_list.php
index 764ba511..6c00a379 100644
--- a/public_html/includes/class/class.LSattr_html_select_list.php
+++ b/public_html/includes/class/class.LSattr_html_select_list.php
@@ -129,7 +129,7 @@ class LSattr_html_select_list extends LSattr_html{
         }
         else {
           $val_name=$this->attribute->ldapObject->getFData($val_name);
-          $val=$this->attribute->ldapObject->getFData($val);
+          $val=$this->attribute->ldapObject->getFData(__($val));
           $retInfos[$val_name]=$val;
         }
       }
diff --git a/public_html/lang/fr_FR.UTF8/lang.php b/public_html/lang/fr_FR.UTF8/lang.php
index e4177488..c1e5ce3a 100644
--- a/public_html/lang/fr_FR.UTF8/lang.php
+++ b/public_html/lang/fr_FR.UTF8/lang.php
@@ -83,6 +83,15 @@ $GLOBALS['LSlang'] = array (
 "Members" =>
   "Membres",
 
+"Mr" =>
+  "M.",
+
+"Mrs" =>
+  "Mms",
+
+"Ms" =>
+  "Mlle",
+
 "Name" =>
   "Nom",
 
@@ -142,7 +151,8 @@ $GLOBALS['LSlang'] = array (
 
 "To proceed password recovery procedure, please follow that link:
 %{url}" =>
-  "Pour poursuivre la procédure de récupération de mot de passe, merci de suivre ce lien :\n%{url}",
+  "Pour poursuivre la procédure de récupération de mot de passe, merci de suivre ce lien :
+%{url}",
 
 "Users" =>
   "Utilisateurs",
@@ -152,7 +162,8 @@ $GLOBALS['LSlang'] = array (
 
 "Your password has been changed.
 New password : %{mdp}" =>
-  "Votre mot de passe a été modifié.\nNouveau mot de passe : %{mdp}",
+  "Votre mot de passe a été modifié.
+Nouveau mot de passe : %{mdp}",
 
 "Your password must contain from 8 to 10 characters." =>
   "Votre mot de passe doit contenir entre 8 et 10 caractères.",
diff --git a/public_html/lang/generate_lang_file.php b/public_html/lang/generate_lang_file.php
index ec1c9bb1..4379105a 100755
--- a/public_html/lang/generate_lang_file.php
+++ b/public_html/lang/generate_lang_file.php
@@ -81,6 +81,15 @@ if (loadDir('../'.LS_OBJECTS_DIR)) {
         add($attr['html_options']['mail']['subject']);
         add($attr['html_options']['mail']['msg']);
         
+        // LSattr_html_select_list
+        if ($attr['html_type']=='select_list' && is_array($attr['html_options']['possible_values'])) {
+          foreach($attr['html_options']['possible_values'] as $pkey => $pname) {
+            if ($pkey != 'OTHER_OBJECT') {
+              add($pname);
+            }
+          }
+        }
+        
         // Check data
         if (is_array($attr['check_data'])) {
           foreach($attr['check_data'] as $check) {