Context Navigation

← Previous Ticket
Next Ticket →

developer.jelix.org is not used any more and exists only for history. Post new tickets on the Github account.
developer.jelix.org n'est plus utilisée, et existe uniquement pour son historique. Postez les nouveaux tickets sur le compte github.

Opened 11 years ago

Closed 11 years ago

Last modified 11 years ago

#1118 closed enhancement (fixed)

html non encodé dans des locales

Reported by:	hadrien	Owned by:
Priority:	normal	Milestone:	Jelix 1.2 beta
Component:	jelix:plugins:tpl	Version:	1.1.6
Severity:	normal	Keywords:
Cc:		Blocked By:
Blocking:		Documentation needed:	no
Hosting Provider:		Php version:

Description

voici un patch de function.jlocale.php pour qu'il accepte de ne pas encoder le texte des locales quand elles se terminent par ".html" :

diff --git a/lib/jelix/plugins/tpl/html/function.jlocale.php b/lib/jelix/plugins/tpl/html/function.jlocale.php
index 0cfd538..da9caa6 100644
--- a/lib/jelix/plugins/tpl/html/function.jlocale.php
+++ b/lib/jelix/plugins/tpl/html/function.jlocale.php
@@ -21,14 +21,19 @@ function jtpl_function_html_jlocale($tpl, $locale)
 {
      if(func_num_args() == 3 && is_array(func_get_arg(2))){
          $param = func_get_arg(2);
-         echo nl2br(htmlspecialchars(jLocale::get($locale, $param)));
+         $str = jLocale::get($locale, $param);
      }elseif(func_num_args() > 2){
          $params = func_get_args();
          unset($params[0]);
          unset($params[1]);
-         echo nl2br(htmlspecialchars(jLocale::get($locale, $params)));
+         $str = jLocale::get($locale, $params);
      }else{
-         echo nl2br(htmlspecialchars(jLocale::get($locale)));
+         $str = jLocale::get($locale);
+     }
+     if (preg_match('@\.html$@', $locale)){
+         echo $str;
+     }else{
+         echo nl2br(htmlspecialchars($str));
      }
 }

Ainsi, text.kikoo = Kikoo <strong>Lol</strong> sera htmlencodé, mais pas text.kikoo.html = Kikoo <strong>Lol</strong>.