Ticket #95: ticket_95.diff

lib/jelix/core/jSelector.class.php

@@ -13 +13 @@
-* @contributor Loic Mathaud
-* @contributor Rahal
-* @contributor Thibault PIRONT < nuKs >
+* @contributor Julien Issler
-* @copyright   2005-2007 Laurent Jouanneau, 2007 Loic Mathaud, 2007 Rahal
-* @copyright   2007 Thibault PIRONT
+* @copyright   2007 Julien Issler
-* @link        http://www.jelix.org
-* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
-*/
@@ -456 +458 @@
-        if(strpos($locale,'_') === false){
-            $locale.='_'.strtoupper($locale);
-        }
-        $this->locale = $locale;
-        $this->charset = $charset;
-
-
-
+
-        $this->_compilerPath=JELIX_LIB_CORE_PATH.'jLocalesCompiler.class.php';
-
-#if ENABLE_PHP_JELIX
@@ -486 +485 @@
-        }
-    }
-
+
+    protected function _setLocale($locale){
+        $this->locale = $locale;
+        $this->_dirname =  'locales/' .$locale.'/';
+        $this->_suffix = '.'.$this->charset.'.properties';
+        $this->_cacheSuffix = '.'.$locale.'.'.$this->charset.'.php'; // added $locale in the cache filename
+    }
+
-    protected function _createPath(){
-        global $gJConfig;
-        if(!isset($gJConfig->_modulesPathList[$this->module])){
@@ -503 +510 @@
-        $this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.$this->resource.$this->_suffix;
-
-        if (!is_readable ($this->_path)){
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        $this->_where = 'modules/';
-    }
@@ -725 +747 @@
-        return 'cForm_'.$this->module.'_Jx_'.$this->resource;
-    }
-
-
-    protected function _createPath(){
-        global $gJConfig;
-        if(!isset($gJConfig->_modulesPathList[$this->module])){

lib/jelix/core/jLocale.class.php

@@ -4 +4 @@
-* @subpackage core
-* @author     Laurent Jouanneau
-* @author     Gerald Croes
-
+ Julien Issler
-* @copyright  2001-2005 CopixTeam, 2005-2007 Laurent Jouanneau
-* Some parts of this file are took from Copix Framework v2.3dev20050901, CopixI18N.class.php, http://www.copix.org.
-* copyrighted by CopixTeam and released under GNU Lesser General Public Licence.
-* initial authors : Gerald Croes, Laurent Jouanneau.
-* enhancement by Laurent Jouanneau for Jelix.
+* @copyright   2007 Julien Issler
-* @link        http://www.jelix.org
-* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
-*/
@@ -108 +109 @@
-    */
-    protected function _loadResources ($fichier, $charset){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
+                else{
+                    $value='';
+                }
+
+                $this->_strings[$charset][$key] =$value;
+
-            }
-fclose ($f);
-}else{
-throw new Exception('Cannot load the resource '.$fichier,212);
+else if(!preg_match("/^\s*(\#.*)?$/",$line, $match)){
+        throw new Exception('Syntaxe error in file properties '.$fichier.' line '.$linenumber,211);
+}
-        }
+
-    }
-}
-
@@ -201 +201 @@
-    */
-    static function get ($key, $args=null, $locale=null, $charset=null) {
-        global $gJConfig;
+
+        $selector = self::_getSelector($key, $locale, $charset);
+        $bundle = self::_getBundle($selector);
+        $string = $bundle->get($selector->messageKey, $selector->charset);
+
+        if(is_null($string)){ 
+            if(self::isGenericLocale($locale)){
+                if($selector->locale === $gJConfig->locale){
+                    throw new Exception('(210)The given locale key "'.$selector->toString().'" does not exists in the default lang ('.$gJConfig->locale.') for the '.$selector->charset.' charset ');
+                }
+                else{
+                    $string = self::getStringFromDefaultLocale($key);
+                }
+            }
+            else{
+                $generic_locale = self::getGenericLocaleForLocale($selector->locale);
+                $string = self::get($key, $args, $generic_locale, $selector->charset);
+            }
+        }
+
+        if(is_null($args)) return $string;
+
+        return vsprintf($string, is_array ($args) ? $args : array ($args));
+    }
+
+    /**
+     * Gets the generic locale for the given locale (en_US -> en_EN, fr_CA -> fr_FR, ...)
+     * @param string $locale The locale to get the generic locale from
+     * @return string The generic locale
+     */
+    static public function getGenericLocaleForLocale($locale){
+        global $gJConfig;
+        if ($locale === null)  $locale = $gJConfig->locale;
+        return substr($locale,0,2).'_'.strtoupper(substr($locale,0,2));
+    }
+
+    /**
+     * Checks if the given locale is "generic" (en_EN, fr_FR, xx_XX, ...)
+     * @param string $locale The locale to check
+     * @return boolean
+     */
+    static public function isGenericLocale($locale){
+        global $gJConfig;
+        if ($locale === null)  $locale = $gJConfig->locale;
+        return $locale === substr($locale,0,2).'_'.strtoupper(substr($locale,0,2));
+    }
+
+    /**
+     * Gets the string from the default locale with default charset
+     * @param string $key The selector for the string
+     * @return string The string
+     * @throws Exception An exception if failure
+     */
+    static public function getStringFromDefaultLocale($key){
+        global $gJConfig;
+        $selector = self::_getSelector($key, $gJConfig->locale, $gJConfig->charset);        
+        $bundle = self::_getBundle($selector);
+
+        $string = $bundle->get($selector->messageKey, $selector->charset);
+
+        if(is_null($string)){
+            throw new Exception('(210)The given locale key "'.$selector->toString().'" does not exists in the default lang ('.$gJConfig->locale.') for the '.$selector->charset.' charset ');
+        }
+
+        return $string;
+    }
+
+    /**
+     * Gets the jSelectorLoc object for the bundle
+     * @param string $key The selector string
+     * @param string $locale The wanted locale
+     * @param string $charset The wanted charset
+     * @return jSelectorLoc The jSelectorLoc object for the bundle
+     * @throws jExceptionSelector An exception if failure
+     */
+    static protected function _getSelector($key, $locale, $charset){
+        global $gJConfig;
-        try{
-            $file = new jSelectorLoc($key, $locale, $charset);
-
+
+
+
-            if($e->getCode() == 12) throw $e;
-            if ($locale === null)  $locale = $gJConfig->locale;
-            if ($charset === null) $charset = $gJConfig->charset;
-            throw new Exception('(200)The given locale key "'.$key.'" is invalid  (for charset '.$charset.', lang '.$locale.')');
-        }
+    }
-
-
-
+
+
+
+
+
+
+
+
-        if (!isset (self::$bundles[$keySelector][$locale])){
-file
+selector
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-}
-
+

lib/jelix/core/defaultconfig.ini.php

@@ -7 +7 @@
-charset = "UTF-8"
-timeZone = "Europe/Paris"
-
+; internal locale, for jelix localized errors, when no locale can be found at all 
+; (specific (de_AT) > generic (de_DE) > default-specific (es_AR) > default generic (es_ES)). 
+; Must be en_EN of fr_FR (one the the native jelix generic locales)
+internalLocale = en_EN
+
-checkTrustedModules = off
-
-; list of modules : module,module,module