[phpwebapp-commits] CVS: web_app/parser class.Render.php,1.22,1.23

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19183

Modified Files:
	class.Render.php 
Log Message:
translatable strings can contain variables inside, so translation
should be done before replacing variables


Index: class.Render.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Render.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** class.Render.php	13 Jun 2005 06:55:20 -0000	1.22
--- class.Render.php	13 Jun 2005 14:24:17 -0000	1.23
***************
*** 53,63 ****
    function render_string($str, $indent =true)
    {
-     //replace all {{tpl_vars}}
-     $str = WebApp::replaceVars($str);
- 
      //translate all T_("xyz") strings
      global $l10n;
      if (ereg('T_\\("[^"]*"\\)', $str))  $str = $l10n->translate($str);
  
      //extra replacements
      $str = $this->other_replaces($str);
--- 53,63 ----
    function render_string($str, $indent =true)
    {
      //translate all T_("xyz") strings
      global $l10n;
      if (ereg('T_\\("[^"]*"\\)', $str))  $str = $l10n->translate($str);
  
+     //replace all {{tpl_vars}}
+     $str = WebApp::replaceVars($str);
+ 
      //extra replacements
      $str = $this->other_replaces($str);