Changeset 4578 for trunk/core/localization.core.php

Timestamp:

08/15/10 18:45:12 (22 months ago)

Author:

vain

Message:

• several changes to copyright, router, bootstrap, frontcontroller and various other files

File:

• trunk/core/localization.core.php (modified) (8 diffs)

trunk/core/localization.core.php

@@ -24 +24 @@
     *
     * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE".
-    *
     * @author     Jens-André Koch <vain@clansuite.com>
     * @copyright  Jens-André Koch (2005 - onwards)
-    *
     * @link       http://www.clansuite.com
-    * @link       http://gna.org/projects/clansuite
-    *
+    * 
     * @version    SVN: $Id$
     */
@@ -42 +39 @@
 /**
  * Clansuite Core Class for Localization (l10n) & Internationalization (i18n) Handling
- *
- * @author     Jens-André Koch   <vain@clansuite.com>
- * @copyright  Jens-André Koch (2005 - onwards)
  *
  * @category    Clansuite
@@ -66 +60 @@
 
     # References
-    private $config    = null;
+    private static $config    = null;
 
     public function __construct(Clansuite_Config $config)
     {
         # Set Reference to Config
-        $this->config = $config;
+        self::$config = $config;
 
         # Set Locale Defaults
         $this->domain = 'clansuite';
-        $this->encoding = $config['language']['outputcharset'];
+        $this->encoding = self::$config['language']['outputcharset'];
 
         # Get Locale
@@ -101 +95 @@
          * @link http://www.gnu.org/software/gettext/manual/gettext.html GNU Gettext
          */
-        if ( function_exists('_get_reader') === false )
+        if(function_exists('_get_reader') === false)
         {
             include ROOT_LIBRARIES . '/php-gettext/gettext.inc';
@@ -131 +125 @@
             if(empty($this->locale)) # 3) get the default language from config as fallback
             {
-                $this->locale = $this->config['language']['language'];
+                $this->locale = self::$config['language']['language'];
             }
         }
@@ -154 +148 @@
     public function loadTextDomain($category, $domain, $locale, $module = null)
     {
-        # if, $locale string is not over 3 -> $locale = "en", build "en_EN"
+        #Clansuite_Debug::firebug($module);
+
+        # if, $locale string is not over 3 chars long -> $locale = "en", build "en_EN"
         if(isset($locale{3}) == false)
         {
@@ -174 +170 @@
             $domain_directory = ROOT_LANGUAGES;
         }
-        else # tp a specific module directory
-        {
-
+        else # set a specific module directory
+        {
             $domain_directory = ROOT_MOD . $module . DS . 'languages' . DS;
         }
@@ -185 +180 @@
         T_textdomain($domain);
 
-        #Clansuite_Debug::firebug('<p>Textdomain "' .$domain .'" loaded from path "'. $domain_directory .'"</p>');
+        #Clansuite_Debug::firebug('<p>Textdomain "' .$domain .'" loaded from path "'. $domain_directory .'" for "'. $module .'"</p>');
         return true;
     }