Changeset 5167 for branches/gettext/include

Timestamp:

Mar 17, 2010, 8:46:45 PM (15 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})

Location:

branches/gettext/include

Files:

• common.inc.php (modified) (1 diff)
• constants.php (modified) (1 diff)
• functions.inc.php (modified) (4 diffs)
• template.class.php (modified) (4 diffs)

branches/gettext/include/common.inc.php

@@ -148 +148 @@
 load_language('local.lang', '', array('no_fallback'=>true) );
 
+bind_pwg_textdomain();
+
 // only now we can set the localized username of the guest user (and not in
 // include/user.inc.php)

branches/gettext/include/constants.php

@@ -98 +98 @@
 if (!defined('OLD_PERMALINKS_TABLE'))
   define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
+if (!defined('THEMES_TABLE'))
+  define('THEMES_TABLE', $prefixeTable.'themes');
 
 ?>

branches/gettext/include/functions.inc.php

@@ -542 +542 @@
     // we ask midday because Windows think it's prior to midnight with a
     // zero and refuse to work
-    $formated_date.= $lang['day'][date('w', mktime(12,0,0,$ymdhms[1],$ymdhms[2],$ymdhms[0]))];
+    $formated_date.= l10n(date('l', mktime(12,0,0,$ymdhms[1],$ymdhms[2],$ymdhms[0])));
   }
   $formated_date.= ' '.$ymdhms[2];
-  $formated_date.= ' '.$lang['month'][(int)$ymdhms[1]];
+  $formated_date.= ' '.l10n(date('F', mktime(12,0,0,$ymdhms[1],$ymdhms[2],$ymdhms[0])));
   $formated_date.= ' '.$ymdhms[0];
   if ($show_time and count($ymdhms)>=5 )
@@ -714 +714 @@
 function get_pwg_themes()
 {
-  global $conf;
   $themes = array();
 
-  $template_dir = PHPWG_ROOT_PATH.'themes';
-
-  foreach (get_dirs($template_dir) as $theme)
-  {
-    if ( $theme != 'default' )
-          {
-      array_push($themes, $theme);
-          }
+  $query = '
+SELECT
+    id,
+    name
+  FROM '.THEMES_TABLE.'
+  ORDER BY name ASC
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $themes[ $row['id'] ] = $row['name'];
   }
 
   // plugins want remove some themes based on user status maybe?
   $themes = trigger_event('get_pwg_themes', $themes);
+  
   return $themes;
 }
@@ -862 +865 @@
 
 /**
+ * bind piwigo textdomain 
+ */
+function bind_pwg_textdomain() 
+{
+  global $user;
+
+  if (empty($user['language']))
+  {
+    $locale = $GLOBALS['language'];
+  }
+  else
+  {
+    $locale = $user['language'];
+  }
+
+  $locale .= '.UTF-8';
+  putenv('LC_ALL='.$locale);
+  T_setlocale(LC_ALL, $locale);
+
+  T_bindtextdomain('piwigo', './language');
+}
+
+/**
  * returns the corresponding value from $lang if existing. Else, the key is
  * returned
  *
  * @param string key
+ * @param string textdomain domain where to find keys
  * @return string
  */
-function l10n($key, $textdomain='messages')
-{
-  global $user;
-
-  if (empty($user['language']))
-  {
-    $locale = $GLOBALS['language'];
-  } 
-  else 
-  {
-    $locale = $user['language'];
-  }
-
-  T_setlocale(LC_ALL, $locale.'.UTF-8');
-
-  // Specify location of translation tables
-  T_bindtextdomain($textdomain, "./language");
-
-  // Choose domain
+function l10n($key, $textdomain='piwigo')
+{
+  T_bind_textdomain_codeset($textdomain, 'UTF-8');
   T_textdomain($textdomain);
-  
+ 
   return T_gettext($key);
 }
@@ -899 +910 @@
  * @param plural string key
  * @param decimal value
+ * @param textdomain string value
  * @return string
  */
 function l10n_dec($singular_fmt_key, $plural_fmt_key, 
-                  $decimal, $textdomain='messages')
-{
-  global $user;
-
-  if (empty($user['language']))
-  {
-    $locale = $GLOBALS['language'];
-  } 
-  else 
-  {
-    $locale = $user['language'];
-  }
-
-  T_setlocale(LC_ALL, $locale.'.UTF-8');
-
-  // Specify location of translation tables
-  T_bindtextdomain($textdomain, "./language");
-
-  // Choose domain
+                  $decimal, $textdomain='piwigo')
+{
+  T_bind_textdomain_codeset($textdomain, 'UTF-8');
   T_textdomain($textdomain);
 

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);
   }