Ticket #95: 95-jLocale-with-no-country-code.2.diff

trunk/testapp/modules/jelix_tests/tests/core.jlocale.html_cli.php

@@ -127 +127 @@
-
-        $this->assertEqual('ceci est une phrase fr_FR test2',jLocale::get('tests2.first.locale'));
-        // no test2.properties file for fr_CA, so we should have the fr_FR one
-//
+
-        // no test3.properties file for fr_CA and fr_FR, so we should have the en_EN one
-        //$GLOBALS['gJConfig']->locale = 'en_EN';
-        //$this->assertEqual('this is an en_EN sentence test3',jLocale::get('tests3.first.locale', null, 'fr_CA'));

trunk/lib/jelix/core/jSelector.class.php

@@ -352 +352 @@
-    * @since 1.0b2
-    */
-    public $subpath ='';
- 
+
-    * the class name specified in the selector
-    * @since 1.0b2
-    */
@@ -391 +391 @@
-        global $gJConfig;
-        if (!isset($gJConfig->_modulesPathList[$this->module])) {
-            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
- 
+
-        $this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.$this->subpath.$this->className.$this->_suffix;
-
-        if (!file_exists($this->_path) || strpos($this->subpath,'..') !== false ) { // second test for security issues
@@ -412 +412 @@
-}
-
-/**
- 
+
- *
- * interface is stored in interfacename.iface.php file in the classes/ module directory
- * or one of its subdirectory.
@@ -428 +428 @@
-}
-
-/**
- 
+
- * @package    jelix
- * @subpackage core_selector
- * @since 1.0b2
- 
+
- */
-class jSelectorInterface extends jSelectorIface {}
-
@@ -469 +469 @@
-        }
-        $this->locale = $locale;
-        $this->charset = $charset;
-        $this->_dirname =  'locales/' .$locale.'/';
-        $this->_suffix = '.'.$charset.'.properties';
-        $this->_cacheSuffix = '.'.$locale.'.'.$charset.'.php';
-        $this->_compilerPath=JELIX_LIB_CORE_PATH.'jLocalesCompiler.class.php';
-
-#if ENABLE_PHP_JELIX
@@ -505 +503 @@
-            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-if (!is_readable ($this->_path)
-to avoid infinite loop in a specific lang or charset, we should check if we don't
-// try to retrieve the same message as the one we use for the exception below,
-// and if it is this message, it means that the error message doesn't exist 
-// in the specific lang or charset, so we retrieve it in en_EN language and UTF-8 charset
-if($this->toString() == 'jelix~errors.selector.invalid.target'){
-l = 'en_EN
-$c = 'UTF-8'
+foreach($locales as $locale
+check if the locale has been overloaded
+$overloadedPath = JELIX_APP_VAR_PATH.'overloads/'.$this->module.'/locales/'.$locale.'/'.$this->resource.$this->_suffix;
+if (is_readable ($overloadedPath)){
+    $this->_path = $overloadedPath;
+    $this->_where = 'overloaded/';
+this->_cacheSuffix = '.'.$locale.'.'.$this->charset.'.php
+return
-            }
-
-
-
+
+
+
+
+
+
+
-            }
-            throw new jExceptionSelector('jelix~errors.selector.invalid.target', array($this->toString(), "locale"), 1, $l, $c);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    protected function _createCachePath(){

branches/1.0.x/testapp/modules/jelix_tests/tests/core.jlocale.html.php

@@ -126 +126 @@
-
-        $this->assertEqual('ceci est une phrase fr_FR test2',jLocale::get('tests2.first.locale'));
-        // no test2.properties file for fr_CA, so we should have the fr_FR one
-//
+
-        // no test3.properties file for fr_CA and fr_FR, so we should have the en_EN one
-        //$this->assertEqual('this is an en_EN sentence test3',jLocale::get('tests3.first.locale', null, 'fr_CA'));
-        //$this->assertEqual('this is an en_EN sentence test3',jLocale::get('tests3.first.locale', null, 'fr_FR'));

branches/1.0.x/lib/jelix/core/jSelector.class.php

@@ -352 +352 @@
-    * @since 1.0b2
-    */
-    public $subpath ='';
- 
+
-    * the class name specified in the selector
-    * @since 1.0b2
-    */
@@ -391 +391 @@
-        global $gJConfig;
-        if (!isset($gJConfig->_modulesPathList[$this->module])) {
-            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
- 
+
-        $this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.$this->subpath.$this->className.$this->_suffix;
-
-        if (!file_exists($this->_path) || strpos($this->subpath,'..') !== false ) { // second test for security issues
@@ -412 +412 @@
-}
-
-/**
- 
+
- *
- * interface is stored in interfacename.iface.php file in the classes/ module directory
- * or one of its subdirectory.
@@ -428 +428 @@
-}
-
-/**
- 
+
- * @package    jelix
- * @subpackage core_selector
- * @since 1.0b2
- 
+
- */
-class jSelectorInterface extends jSelectorIface {}
-
@@ -469 +469 @@
-        }
-        $this->locale = $locale;
-        $this->charset = $charset;
-        $this->_dirname =  'locales/' .$locale.'/';
-        $this->_suffix = '.'.$charset.'.properties';
-        $this->_cacheSuffix = '.'.$locale.'.'.$charset.'.php';
-        $this->_compilerPath=JELIX_LIB_CORE_PATH.'jLocalesCompiler.class.php';
-
-#if ENABLE_PHP_JELIX
@@ -505 +503 @@
-            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-if (!is_readable ($this->_path)
-to avoid infinite loop in a specific lang or charset, we should check if we don't
-// try to retrieve the same message as the one we use for the exception below,
-// and if it is this message, it means that the error message doesn't exist 
-// in the specific lang or charset, so we retrieve it in en_EN language and UTF-8 charset
-if($this->toString() == 'jelix~errors.selector.invalid.target'){
-l = 'en_EN
-$c = 'UTF-8'
+foreach($locales as $locale
+check if the locale has been overloaded
+$overloadedPath = JELIX_APP_VAR_PATH.'overloads/'.$this->module.'/locales/'.$locale.'/'.$this->resource.$this->_suffix;
+if (is_readable ($overloadedPath)){
+    $this->_path = $overloadedPath;
+    $this->_where = 'overloaded/';
+this->_cacheSuffix = '.'.$locale.'.'.$this->charset.'.php
+return
-            }
-
-
-
+
+
+
+
+
+
+
-            }
-            throw new jExceptionSelector('jelix~errors.selector.invalid.target', array($this->toString(), "locale"), 1, $l, $c);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    protected function _createCachePath(){