Changeset 24916

Timestamp:

11/29/08 08:59:08 (6 weeks ago)

Author:

bp

Message:

added gettext functionality to Zikula.class and LanguageUtil?.class and locale files

Location:

development/main

Files:

• includes/BlockUtil.class.php (modified) (3 diffs)
• includes/DBConnectionStack.class.php (modified) (1 diff)
• includes/LanguageUtil.class.php (modified) (7 diffs)
• includes/Renderer.class.php (modified) (1 diff)
• includes/Theme.class.php (modified) (6 diffs)
• includes/Zikula.class.php (modified) (1 diff)
• locale/en (added)
• locale/eng (deleted)
• locale/en/zikula.po (added)
• locale/ja (added)
• locale/ja/LC_MESSAGES (added)
• locale/ja/LC_MESSAGES/zikula.mo (added)
• locale/ja/zikula.mo (added)
• locale/ja/zikula.po (added)
• locale/postnuke.po (deleted)

development/main/includes/BlockUtil.class.php

@@ -74 +74 @@
             $blockinfo = self::getInfo($blockplacement['bid']);
             // block filtering
+//bp 2008-02-12 - if session variable 'area' is set retrieve it    
+            $area = SessionUtil::getVar('area',null);
+
             if (!empty($blockinfo['filter']['modules']) ||
                 !empty($blockinfo['filter']['type']) ||
@@ -92 +95 @@
                 if (!empty($blockinfo['filter']['customargs'])) {
                     $blockinfo['filter']['customargs'] = explode(',', $blockinfo['filter']['customargs']);
-                    $customargs = array();
-                    static $filtervars = array('module', 'name', 'type', 'func', 'theme', 'authid');
-                    foreach ($_GET as $var => $value) {
+                    $customargs = array();
+                    static $filtervars = array('module', 'name', 'type', 'func', 'theme', 'authid');
+
+// bp                    foreach ($_GET as $var => $value) {
+                    $_get = $_GET;
+                    if (isset($area)) {
+                            $_get['area'] = $area;
+                    }
+                    foreach ($_get as $var => $value) {
+// end bp
+
                         if (!in_array($var, $filtervars)) {
                             $customargs[] = DataUtil::formatForOS(strip_tags($var)) . '=' . DataUtil::formatForOS(strip_tags($value));
@@ -102 +113 @@
                 }
             }
+//bp area set but empty customargs  -> we hide the block           
+                if (!empty($area) && empty($blockinfo['filter']['customargs'])) continue;
+
             // dont display the block if it's not active or not in matching langauge
             if (!$blockinfo['active'] || (!empty($blockinfo['language']) && $blockinfo['language'] != $currentlang)) continue;

development/main/includes/DBConnectionStack.class.php

@@ -119 +119 @@
         }
 */
+
+        // ensure mysql handles utf-8 ok.
+        // bplagge - 2008/11/18
+        if (!defined('_PNINSTALLVER') && ($dbdriver == 'mysql' || $dbdriver == 'mysqli')) {
+                if (isset($dbcharset)) {
+                        $cs = str_replace('-','', strtolower($dbcharset));
+                        $conn->Execute("set names $cs");
+                }
+        }
 
         $GLOBALS['PNRuntime']['DB'][$count]             = $GLOBALS['PNConfig']['DBInfo'][$name];

development/main/includes/LanguageUtil.class.php

@@ -141 +141 @@
     static function setLocale($category, $locale) 
     {
-        $winos = stristr(getenv('OS'),'windows');
-        !isset($category) ? $category = "LC_ALL" : "";
-        is_array($locale) ? implode(',', $locale) : '';
-        $result = setlocale($category, $locale);
-
-        $p = strpos($result, '.');
-        if ($p > 0) {
-            $encoding = substr($result, $p + 1);
-            if ($winos) {
-                $encoding = 'CP' . $encoding;
-                }
-        }
-        # ensure that we always return the valid character set
-        empty($encoding) ? $encoding = _CHARSET : '';
-        # session variable is used in DateUtil
-        SessionUtil::setVar('encoding', $encoding);
+         $winos = stristr(getenv('OS'),'windows');
+        !isset($category) ? $category = "LC_ALL" : "";         
+
+                $envlanguage = Zikula::getConfigVar('syslocale');
+        
+        // set the LANGUAGE environment variable
+        # NOTE: if the locale to set is not included in LANGUAGE environment variable translations won't work!
+                $re = putenv("LANGUAGE=$envlanguage");
+        /*
+                $lv = getenv('LANGUAGE');
+                echo "putenv returned: $re language environment var set to: $lv<br>";
+        */
+
+        /* debug
+                if (is_Array($locale)) {
+                        print_r($locale); echo "<br>";
+                } else {                
+                        echo "locale: $locale<br>";        
+                }
+        */ 
+        
+        $encoding = setlocale($category, $locale);
+
+        /*
+                echo "encoding: $encoding<br>";
+        */
+
+        if ($winos) {
+            $enc = 'CP' . $encoding;
+            } else {
+                $p = strpos($encoding, '.');
+                $enc = ($p > 0) ? substr($encoding, $p+1) : $encoding;          
+            }
+        # setlocale return value but:
+        # Linux: without charset, Windows: CP. prefix
+                SessionUtil::setVar('encoding', $enc);
+
         return $encoding;
         }
+        
 
    /**
@@ -178 +200 @@
 
     /**
-     * This file sets textdomain and locale for gettext error messages
-     * It is included in the ../modules/MailingList/pntables.php file
+     * This function sets textdomain and locale for gettext error messages
      * @param    $modname         module name - lowercase only
      * @param    $bindtextdom     defaults to the module name - lowercase only
@@ -207 +228 @@
     static function initGettext($modname = '') {
 
-        $winos = stristr(getenv('OS'), 'windows');
-        $syscharset = _CHARSET;
-        $syslocale = $winos ? _LOCALEWIN : _LOCALE;
-        $locarray = array(_LOCALE, _LOCALEWIN);
-        $sysdomain = "zikula";
+                $winos = stristr(getenv('OS'),'windows');
+                $syscharset = Zikula::getConfigVar('syscharset');
+                $syslocale  = Zikula::getConfigVar('syslocale');
+                $sysdom = Zikula::getConfigVar('sysdom');               
 
         $currentlang = LanguageUtil::getUserLang();
@@ -219 +239 @@
         }
 
-        if (isset($modname)) {
+                if (!empty($modname)) {         
             $modinfo = ModuleUtil::getInfo(ModuleUtil::getIDFromName($modname));
             if (!$modinfo) {
@@ -232 +252 @@
             $usmoddir = "config/locale/$directory"; 
                 } else {
-            // use $sysdomain
-            $dom = strtolower($sysdomain);
+            // use $sysdom
+            $dom = strtolower($sysdom);
             $locdir = "locale";
                 }
@@ -252 +272 @@
         $locdir = $b . '/' . $locdir;
 
-        $enc = LanguageUtil::setLocale(LC_ALL, $locarray);
-        if (!$enc) {
-            ($winos) ? $loc = _LOCALEWIN : $loc = _LOCALE;
-            LogUtil::registerError(__fGT(_('Could not set locale to %s'), array(array($loc, true))));
-        }
+                $extlocale = $syslocale.'.'.$syscharset;
+                $locarray       = array($extlocale, $syslocale);
+                $enc = LanguageUtil::setLocale(LC_ALL, $locarray);
+                
+                if (!$enc) {
+                        LogUtil::registerError (__fGT( _('Could not set locale to %s'), array( array($syslocale, true))));
+                }
 
         $rt = bindtextdomain($dom, $locdir);
@@ -263 +285 @@
         // this is important for languages like Japanese which can be encoded using different character sets
         $rc = bind_textdomain_codeset($dom, $syscharset);
-        $rd = textdomain($dom);
+
+        // we only set the textdomain for a module
+        if (isset($modname)) {
+                $rd=textdomain($dom);
+                } 
 
         return array($enc, $syscharset);

development/main/includes/Renderer.class.php

@@ -254 +254 @@
         // lastly the theme paths
         $this->assign('themepath',     $this->baseurl . 'themes/' . $theme);
-        $this->assign('stylepath',     $this->baseurl . 'themes/' . $theme . '/style');
+        //bp 2008-11-17 add $themedom variable
+        $this->assign('themedom', $this->themeinfo['name']);
+        // end bp
+        $this->assign('stylepath',     $this->baseurl . 'themes/' . $theme . '/style');
         $this->assign('scriptpath',    $this->baseurl . 'themes/' . $theme . '/javascript');
         $this->assign('imagepath',     $this->baseurl . 'themes/' . $theme . '/images');

development/main/includes/Theme.class.php

@@ -59 +59 @@
         protected $isloggedin;
 
+        //bp 2008-02-11
+        // area, logical subset of the website (similar to category
+        protected $area;
+
         /**
          * Initialize our class
@@ -143 +147 @@
             }
 
+            //bp 2008-11-17 - bindtextdomain
+            //the name of the theme's textdomain must correspond to the name defined in pnversion.php!
+            //e.g. $themeversion['name'] = sql_ledger;
+            $syscharset = Zikula::getConfigVar('syscharset');
+
+            // we need the absolute path!
+            $ldir = dirname(__FILE__);
+            $p = strpos($ldir, '/includes');
+            $b = substr($ldir, 0, $p);
+
+            $themelocpath = $b."/".$this->themepath.'/locale';
+
+            $rt = bindtextdomain($this->name, $themelocpath);
+            $rc = bind_textdomain_codeset($this->name, $syscharset);
+
+            //debug
+            /*
+               $loc =        setlocale(LC_ALL,0); 
+               echo "syscharset: $syscharset, locale: $loc, themelocpath: $themelocpath, themedom: $this->name<br/>
+                        bindtextdomain: $rt, bind_textdomain_codeset: $rc<br/>";
+                echo dgettext($this->name, 'Home');
+                
+                echo "<br/>set textdomain<br/>";
+                $rd=textdomain($this->name);
+                echo _('Home');                 
+             */
+            //end bp        
+
             // Start the output buffering to capture module output
             ob_start();
@@ -277 +309 @@
             // 1. Master template path
             $masterpath = "themes/$os_theme/templates";
+
+            //bp 2008-02-11 area template path -> so we can specify area-specific templates
+            $areapath = "themes/$os_theme/templates/category";
+            //bp end
+
             // 2. The module template path
             $modulepath = "themes/$os_theme/templates/modules";
@@ -284 +321 @@
             $ostemplate = DataUtil::formatForOS($template);
 
+            //bp 2008-02-11 - add $areapath and subdir for module to the search path
             $search_path = array($masterpath,
+                                 $areapath,
+                                 $areapath.'/'.$modulepath,
                                  $modulepath,
                                  $blockpath);
@@ -434 +474 @@
             }
 
+//bp 2008-02-11 - extract and save area id
+            foreach ($queryparts as $querypart) {
+                    if (stristr($querypart, 'area=')) {
+                            $n = strpos($querypart, '=');
+                            $this->area = substr($querypart, $n+1);
+                            $this->assign('area', $this->area);
+                            SessionUtil::setVar('area', $this->area);
+                    }
+            }
+            $this->area = SessionUtil::getVar('area',null);
+//bp
+
+
             // identify and load the correct module configuration
             $this->cachepage = true;
@@ -443 +496 @@
                 $this->cachepage = false;
                 $file = $pageconfigurations['*admin']['file'];
+//bp 2008-02-11
+            } else if (isset($this->area) && isset($pageconfigurations[$this->area])) {
+                    $file = $pageconfigurations[$this->area]['file'];
+//bp
             } else {
                 $customargs = $this->module.'/'.$this->type.'/'.$this->func.$customargs;

development/main/includes/Zikula.class.php

@@ -254 +254 @@
             // Load our language files
             pnLangLoad();
+
+            //bp 2008-11-17
+            // set config variable $sysdom, $syscharset
+            $sysdom = $GLOBALS['PNConfig']['System']['dom'];
+            !$sysdom ? $sysdom = 'zikula' : '';
+            Zikula::setConfigVar('sysdom', $sysdom);
+            $syscharset = $GLOBALS['PNConfig']['DBInfo']['default']['dbcharset'];
+            !$syscharset ? $syscharset = 'UTF-8' : '';
+            Zikula::setConfigVar('syscharset', $syscharset);
+            // locale is currently only set in the old language files
+            $winos = stristr(getenv('OS'),'windows');
+            $syslocale  = $winos ?  _LOCALEWIN : _LOCALE;
+            Zikula::setConfigVar('syslocale', $syslocale);
+
+            // bp 2008-11-17 initialize Gettext
+            list($lc, $cs) = LanguageUtil::initGettext();
+
+            /* debug
+               echo "syscharset: $syscharset<br/>";
+               echo "sysdom: $sysdom, lc: $lc, cs: $cs<br/>";
+               echo dgettext('zikula', 'Home');
+               echo "<br/>set textdomain<br/>";
+               $rd=textdomain($sysdom);
+               echo _('Home');
+             */
         }