From 6ddcca037da6b6a063f5185ea8882b110602692d Mon Sep 17 00:00:00 2001
From: Benjamin Renard
Date: Mon, 27 May 2019 18:11:56 +0200
Subject: [PATCH] Fix question on remove object page
---
.../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 47814 -> 47958 bytes
.../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 9 ++++++---
public_html/lang/ldapsaisie.pot | 7 +++++--
public_html/remove.php | 2 +-
public_html/templates/default/question.tpl | 2 +-
5 files changed, 13 insertions(+), 7 deletions(-)
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 21807596dce50bb4c447b43e6801b3b09c419f71..155be2263e36153d3bd7319f9ef83f75ca3e9dc0 100644
GIT binary patch
delta 7654
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
KsZ;Vw_WuA?dG=ZW
delta 7558
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\n"
"Language-Team: LdapSaisie \n"
@@ -1235,7 +1235,6 @@ msgid "updating relations"
msgstr "mise à jour des relations"
#: includes/class/class.LSrelation.php:214 includes/class/class.LSform.php:213
-#: remove.php:49
msgid "Do you really want to delete"
msgstr "Voulez-vous vraiment supprimer"
@@ -1875,6 +1874,10 @@ msgstr "Suppression"
msgid "has been deleted successfully"
msgstr "a bien été supprimé"
+#: remove.php:49
+msgid "Do you really want to delete %{displayName} ?"
+msgstr "Voulez-vous vraiment supprimer %{displayName} ?"
+
#~ msgid "SSH Support : Unable to connect to SSH Server (%{host}:%{port})."
#~ msgstr ""
#~ "Support SSH : Impossible de se connecter au serveur SSH (%{host}:%{port})."
diff --git a/public_html/lang/ldapsaisie.pot b/public_html/lang/ldapsaisie.pot
index a2982c66..2ca5acc3 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: 2019-05-21 12:02+0200\n"
+"POT-Creation-Date: 2019-05-27 18:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -1051,7 +1051,6 @@ msgid "updating relations"
msgstr ""
#: includes/class/class.LSrelation.php:214 includes/class/class.LSform.php:213
-#: remove.php:49
msgid "Do you really want to delete"
msgstr ""
@@ -1612,3 +1611,7 @@ msgstr ""
#: remove.php:39
msgid "has been deleted successfully"
msgstr ""
+
+#: remove.php:49
+msgid "Do you really want to delete %{displayName} ?"
+msgstr ""
diff --git a/public_html/remove.php b/public_html/remove.php
index 201e0177..2638ca38 100644
--- a/public_html/remove.php
+++ b/public_html/remove.php
@@ -46,7 +46,7 @@ if(LSsession :: startLSsession()) {
else {
// Définition du Titre de la page
LStemplate :: assign('pagetitle',_('Deleting').' : '.$object -> getDisplayName());
- LStemplate :: assign('question',_('Do you really want to delete').' '.$object -> getDisplayName().' ?');
+ LStemplate :: assign('question', getFData(_('Do you really want to delete %{displayName} ?'), $object -> getDisplayName()));
LStemplate :: assign('validation_url','remove.php?LSobject='.$LSobject.'&dn='.urlencode($dn).'&valid');
LStemplate :: assign('validation_label',_('Validate'));
}
diff --git a/public_html/templates/default/question.tpl b/public_html/templates/default/question.tpl
index 8368da05..09a1a9b4 100644
--- a/public_html/templates/default/question.tpl
+++ b/public_html/templates/default/question.tpl
@@ -8,6 +8,6 @@
{/if}
- {$question|escape:"htmlall"}
+ {$question}
{$validation_label|escape:"htmlall"}
{include file='ls:bottom.tpl'}