From 8d4c8b33a00ef55da2e10bac834b412b5c502f43 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 7 Apr 2011 19:31:56 +0200
Subject: [PATCH] LSldapobject / Custom Action : Fixed error message on custom
 action execution failed

---
 public_html/custom_action.php                 |   2 +-
 .../includes/class/class.LSldapObject.php     |   4 ++++
 .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 32325 -> 32546 bytes
 .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po |  10 +++++++---
 public_html/lang/ldapsaisie.pot               |  10 ++++++++--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public_html/custom_action.php b/public_html/custom_action.php
index af7a228f..18edce47 100644
--- a/public_html/custom_action.php
+++ b/public_html/custom_action.php
@@ -51,7 +51,7 @@ if(LSsession :: startLSsession()) {
                   LSsession :: redirect('view.php?LSobject='.$_GET['LSobject'].'&refresh');
                 }
                 else {
-                  LSerror :: addErrorCode('LSldapObject_15',$objectname);
+                  LSerror :: addErrorCode('LSldapObject_31',array('objectname' => $objectname,'customAction' => $_GET['customAction']));
                 }
               }
               else {
diff --git a/public_html/includes/class/class.LSldapObject.php b/public_html/includes/class/class.LSldapObject.php
index 52a2d1e2..2fbaa8e0 100644
--- a/public_html/includes/class/class.LSldapObject.php
+++ b/public_html/includes/class/class.LSldapObject.php
@@ -2105,6 +2105,10 @@ LSerror :: defineError('LSldapObject_30',
 _("LSldapObject : Error during generate LDAP filter for %{LSobject}.")
 );
 
+LSerror :: defineError('LSldapObject_31',
+_("LSldapObject : Error during execution of the custom action %{customAction} on %{objectname}.")
+);
+
 // LSrelation
 LSerror :: defineError('LSrelations_05',
 _("LSrelation : Some parameters are missing in the call of methods to handle standard relations (Method : %{meth}).")
diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo
index 39b1dd630d35b86e2ccfbc2e4ae1abd14296ff8a..031bee8697c8039de25820373568f421738cf565 100644
GIT binary patch
delta 5249
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
HeZ&3_B4CZ(

delta 5221
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
T=iiGff80GUu>9NMeS`lGG~S7S

diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
index adda1132..5843039a 100644
--- a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
+++ b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LdapSaisie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-25 18:05+0100\n"
-"PO-Revision-Date: 2011-03-25 18:08+0100\n"
+"POT-Creation-Date: 2011-04-07 19:27+0200\n"
+"PO-Revision-Date: 2011-04-07 19:29+0100\n"
 "Last-Translator: Benjamin Renard <brenard@easter-eggs.com>\n"
 "Language-Team: LdapSaisie <ldapsaisie-users@lists.labs.libre-entreprise.org>\n"
 "Language: \n"
@@ -326,7 +326,11 @@ msgstr "LSldapObject : Erreur durant l'exécution de la méthode %{meth} lors de
 msgid "LSldapObject : Error during generate LDAP filter for %{LSobject}."
 msgstr "LSldapObject : Erreur durant la génération du filtre LDAP de l'objet %{LSobject}."
 
-#: includes/class/class.LSldapObject.php:2110
+#: includes/class/class.LSldapObject.php:2109
+msgid "LSldapObject : Error during execution of the custom action %{customAction} on %{objectname}."
+msgstr "LSldapObject : Erreur durant l'exécution de l'action personnalisée %{customAction} sur l'objet %{objectname}."
+
+#: includes/class/class.LSldapObject.php:2114
 msgid "LSrelation : Some parameters are missing in the call of methods to handle standard relations (Method : %{meth})."
 msgstr "LSrelation : Des paramètres sont manquant dans l'appel des méthodes de manipulation des relations standards."
 
diff --git a/public_html/lang/ldapsaisie.pot b/public_html/lang/ldapsaisie.pot
index 6852ecef..ed25589e 100644
--- a/public_html/lang/ldapsaisie.pot
+++ b/public_html/lang/ldapsaisie.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-25 18:05+0100\n"
+"POT-Creation-Date: 2011-04-07 19:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -391,7 +391,13 @@ msgstr ""
 msgid "LSldapObject : Error during generate LDAP filter for %{LSobject}."
 msgstr ""
 
-#: includes/class/class.LSldapObject.php:2110
+#: includes/class/class.LSldapObject.php:2109
+msgid ""
+"LSldapObject : Error during execution of the custom action %{customAction} "
+"on %{objectname}."
+msgstr ""
+
+#: includes/class/class.LSldapObject.php:2114
 msgid ""
 "LSrelation : Some parameters are missing in the call of methods to handle "
 "standard relations (Method : %{meth})."