Changeset 23476 for trunk/include/template.class.php

Timestamp:

Jun 23, 2013, 8:39:31 PM (11 years ago)

Author:

rvelices

Message:

Smarty3 added 'translate_dec' compilermodifier (generated code is a lot better than $pwg->l10n_dec)

File:

• trunk/include/template.class.php (modified) (7 diffs)

trunk/include/template.class.php

@@ -56 +56 @@
     global $conf, $lang_info;
 
+    SmartyException::$escape = false;
+
     $this->scriptLoader = new ScriptLoader;
     $this->smarty = new SmartyBC;
@@ -92 +94 @@
     $this->smarty->assign( 'pwg', new PwgTemplateAdapter() );
     $this->smarty->registerPlugin('modifiercompiler', 'translate', array('Template', 'modcompiler_translate') );
+    $this->smarty->registerPlugin('modifiercompiler', 'translate_dec', array('Template', 'modcompiler_translate_dec') );
     $this->smarty->registerPlugin('modifier', 'explode', array('Template', 'mod_explode') );
     $this->smarty->registerPlugin( 'modifier', 'get_extent', array($this, 'get_extent') );
@@ -332 +335 @@
   function clear_assign($tpl_var)
   {
-    $this->smarty->clear_assign( $tpl_var );
+    $this->smarty->clearAssign( $tpl_var );
   }
 
@@ -362 +365 @@
     if ( $conf['compiled_template_cache_language'] and isset($lang_info['code']) )
     {
-      $this->smarty->compile_id .= '.'.$lang_info['code'];
+      $this->smarty->compile_id .= '_'.$lang_info['code'];
     }
 
@@ -512 +515 @@
     }
     return 'l10n('.$params[0].')';
+  }
+
+  static function modcompiler_translate_dec($params)
+  {
+    global $conf, $lang, $lang_info;
+    if ( $conf['compiled_template_cache_language'])
+    {
+      $ret = 'sprintf(';
+      if ($lang_info['zero_plural'])
+      {
+        $ret .= '($tmp=('.$params[0].'))>1||$tmp==0';
+      }
+      else
+      {
+        $ret .= '('.$params[0].')>1';
+      }
+      $ret .= '?';
+      $ret .= self::modcompiler_translate( array($params[2]) );
+      $ret .= ':';
+      $ret .= self::modcompiler_translate( array($params[1]) );
+      $ret .= ','.$params[0];
+      $ret .= ')';
+      return $ret;
+    }
+    return 'l10n_dec('.$params[1].','.$params[2].','.$params[0].')';
   }
 
@@ -770 +798 @@
           list($type, $callback) = $filter;
           $compile_id .= $type.( is_array($callback) ? implode('', $callback) : $callback );
-          call_user_func(array($this->smarty, 'register_'.$type), $callback);
+          $this->smarty->registerFilter($type, $callback);
         }
       }
@@ -786 +814 @@
         {
           list($type, $callback) = $filter;
-          call_user_func(array($this->smarty, 'unregister_'.$type), $callback);
+          $this->smarty->unregisterFilter($type, $callback);
         }
       }