Changeset 5167 for branches/gettext/include/template.class.php

Timestamp:

Mar 17, 2010, 8:46:45 PM (14 years ago)

Author:

nikrou

Message:

Feature 1451 :

• improve speed to generate pages when locales is not present on system
• default domain in now piwigo
• each plugin can have is own domain ({'...'|@translate:my_plugin})

File:

• branches/gettext/include/template.class.php (modified) (4 diffs)

branches/gettext/include/template.class.php

@@ -67 +67 @@
 
     $this->smarty->assign_by_ref( 'pwg', new PwgTemplateAdapter() );
-    $this->smarty->register_modifier( 'translate', array('Template', 'mod_translate') );
+    $this->smarty->register_modifier( 'translate', array(&$this, 'mod_translate') );
     $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') );
     $this->smarty->register_modifier( 'get_extent', array(&$this, 'get_extent') );
     $this->smarty->register_block('html_head', array(&$this, 'block_html_head') );
-    $this->smarty->register_function('known_script', array(&$this, 'func_known_script') );
+    $this->smarty->register_function( 'known_script', array(&$this, 'func_known_script') );
     $this->smarty->register_prefilter( array('Template', 'prefilter_white_space') );
     if ( $conf['compiled_template_cache_language'] )
@@ -99 +99 @@
     include($root.'/'.$theme.'/themeconf.inc.php');
 
-    if (isset($themeconf['parent']))
+    if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
     {
       $this->set_theme($root, $themeconf['parent'], $path);
@@ -386 +386 @@
    * language
    */
-  static function mod_translate($text)
-  {
-    return l10n($text);
+  public function mod_translate($text, $domain='piwigo')
+  {
+    return l10n($text, $domain);
   }
 
@@ -561 +561 @@
 class PwgTemplateAdapter
 {
-  function l10n($text)
-  {
-    return l10n($text);
-  }
-
-  function l10n_dec($s, $p, $v)
-  {
-    return l10n_dec($s, $p, $v);
+  function l10n($text, $domain='piwigo')
+  {
+    return l10n($text, $domain);
+  }
+
+  function l10n_dec($s, $p, $v, $domain='piwigo')
+  {
+    return l10n_dec($s, $p, $v, $domain);
   }