Ticket #543: 543-beta.diff

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

@@ -106 +106 @@
-    /**
-    * loads a given resource from its path.
-    */
-chier
+le
-
+        if(!file_exists($file))
+            throw new Exception('Cannot load the resource '.$file,212);
+
+        $new_line = true;
+        foreach(explode("\n",file_get_contents($file)) as $linenumber=>$line){
+            if(strpos($line,'#')===0)
+                continue;
+
+            if($new_line){
+                if(!preg_match('#^([^=]+)=(.+)(\\\{1,2})?$#U',$line,$matches))
+                    throw new Exception('Syntax error in localization file "'.$file.'" at line '.($linenumber+1),210);
+
+                $key = trim($matches[1]);
+                $this->_strings[$charset][$key] = '';
+                $string_index = 2;
+                $eol_index = 3;
+            }
+            else{
+                if(!preg_match('#^(.+)(\\\{1,2})?$#U',$line,$matches))
+                    throw new Exception('Syntax error in localization file "'.$file.'" at line '.($linenumber+1),210);
+                
+                $string_index = 1;
+                $eol_index = 2;
+            }
+            
+           
+            $string = html_entity_decode(ltrim($matches[$string_index]),ENT_COMPAT,$charset);
+            $new_line = true;
+            if(isset($matches[$eol_index])){
+                $new_line = false;                
+                if(strlen($matches[$eol_index]) == 2)
+                    $string .= "\n";
+                else
+                    $string .= ' ';
+            }
+            $this->_strings[$charset][$key] .= $string;         
+            
+        }
+        /*
-        if (($f = @fopen ($fichier, 'r')) !== false) {
-            $multiline=false;
-            $linenumber=0;
@@ -151 +190 @@
-        }else{
-            throw new Exception('Cannot load the resource '.$fichier,212);
-        }
+        */
-    }
-}
-