From 3dffc99c5fa54e1a8fad6c7a36010303067a1e8d Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Thu, 15 Dec 2011 14:44:01 +0000
Subject: [PATCH] =?UTF-8?q?Ferme=20#2459=20en=20corrigeant=20deux=20coquil?=
=?UTF-8?q?les=20venues=20de=20r17800=20(la=20globale=20est=20toujours=20d?=
=?UTF-8?q?=C3=A9finie)=20et=20r18667=20(la=20classe=20est=20maintenant=20?=
=?UTF-8?q?dans=20le=20tableau=20d'option)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/utils.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 1e1bb82d8e..76270bad65 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -463,7 +463,7 @@ function test_plugin_actif($plugin){
*/
function _T($texte, $args=array(), $options=array()) {
static $traduire=false ;
- $o = array('class'=>'','force'=>true);
+ $o = array('class'=>'', 'force'=>true);
if ($options){
// support de l'ancien argument $class
if (is_string($options))
@@ -494,12 +494,14 @@ function _T($texte, $args=array(), $options=array()) {
return '';
$text = $texte;
+
// pour les chaines non traduites, assurer un service minimum
- if (!isset($GLOBALS['test_i18n']))
+ if (!$GLOBALS['test_i18n'])
$text = str_replace('_', ' ',
(($n = strpos($text,':')) === false ? $texte :
substr($texte, $n+1)));
- $class=null;
+ $o['class'] = null;
+
}
return _L($text, $args, $o['class']);
--
GitLab