Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/mambolanguage.class.php

-revision 466, Wed Apr 12 22:31:51 2006 UTC
+revision 556, Wed Jun  7 08:15:51 2006 UTC
 Line 29
      function mamboLanguage($lang, $path = null) {
          $this->name = $lang;
          $this->path = $path;
-         if (is_null($this->path)) $this->path = realpath('../language/') . DIRECTORY_SEPARATOR;
+         if (is_null($this->path)) $this->path = mamboCore::get('rootPath').'/language/';
          $this->load();
      }
-     function &getInstance($lang, $path = null) {
-         static $languages;
-         if (!isset($languages[$lang]) || is_null($languages[$lang])) {
-             $lobj = new mamboLanguage($lang, $path);
-             $languages[$lang] = $lobj;
-         }
-         return $languages[$lang];
-     }
      function getFileName() {
          $file = $this->iso639;
          $file .= strlen($this->iso3166_2) == 2 ? '_' . $this->iso3166_2 : '';
-Line 54
+Line 47
      }
      function save() {
          $this->updateFiles();
+         $xml = $this->toXML();
+         if (strtolower($this->charset) != 'utf-8') {
+             if (function_exists('iconv')) {
+                 $xml = iconv("utf-8", $this->charset, $xml);
+             }
+         }
+         /**/
          $fp = fopen($this->path . $this->getFileName() . '.xml', 'w+');
-         fwrite($fp, $this->toXML());
+         fwrite($fp, $xml);
          fclose($fp);
      }
-Line 64
+Line 66
          foreach($langfiles as $xml) {
              $xml = str_replace($this->path, '', $xml);
              if (substr($xml, 0, -4) != 'locales') {
-                 $lobj = &mamboLanguage::getInstance(substr($xml, 0, -4), $this->path) ;
+                 $lobj = &new mamboLanguage(substr($xml, 0, -4), $this->path) ;
                  $langs[$lobj->name] = $lobj;
              }
          }
-Line 90
+Line 92
      function load($load_catalogs = false) {
          if (is_readable($this->path . $this->name . ".xml")) {
-             $p = xml_parser_create();
-             xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+             $source = file_get_contents($this->path . $this->name . ".xml");
-             xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
-             xml_parse_into_struct($p, implode("", file($this->path . $this->name . ".xml")), $values);
+                 $encoding = strtoupper($m[1]);
-             xml_parser_free($p);
+             } else {
+                 $encoding = "UTF-8";
+             }
+             if($encoding == "UTF-8" || $encoding == "US-ASCII" || $encoding == "ISO-8859-1") {
+                 $parser = xml_parser_create($encoding);
+             } else {
+                 #if(function_exists('mb_convert_encoding')) {
+                     $encoded_source = iconv($encoding, "UTF-8", $source);
+                # }
+                 if($encoded_source != NULL) {
+                     $source = str_replace ( $m[0],'<?xml version="1.0" encoding="utf-8"?>', $encoded_source);
+                 }
+                 $parser = xml_parser_create("UTF-8");
+             }
+             xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
+             xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+             xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+             if (!xml_parse_into_struct($parser, implode("", file($this->path . $this->name . ".xml")), $values)) {
+                 die(sprintf("XML error: %s at ".$this->path . $this->name.".xml in line %d",
+                 xml_error_string(xml_get_error_code($parser)),
+                 xml_get_current_line_number($parser)));
+             }
+             xml_parser_free($parser);
              foreach($values as $key => $value) {
                  $tag = strtolower($value['tag']);
                  switch ($tag) {
-Line 143
+Line 174
                      break;
                  }
              }
+             $this->codesets = array_unique($this->codesets);
              return true;
          }
          return false;
      }
      function updateFiles() {
          $dir = $this->path . $this->name . '/';
          $langfiles = mosReadDirectory($dir, '.po$');
-Line 168
+Line 203
              $file['fuzzy'] = 0;
              $pluralfuzz = false;
              foreach ($catalog->strings as $msg) {
+                 if (is_array($msg->msgstr)) {
+                     foreach ($msg->msgstr as $i) {
+                         $unt = empty($i);
+                     }
+                     if (!$unt) {
+                         $file['translated']++;
+                     }
+                 }
                  if (!is_array($msg->msgstr) && !empty($msg->msgstr) && !$msg->is_fuzzy) {
                      $file['translated']++;
                  }
-Line 258
+Line 301
          }
          return $xml;
      }
- }
- function getlocales() {
+     function getLocales() {
      $xmlfile = "../language/locales.xml";
      $p = xml_parser_create();
      xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
-Line 314
+Line 356
      $locales['plural_forms'] = $plural_forms;
      return $locales;
  }
+ }
+ function getlocales() {
+     return mamboLanguage::getLocales();
+ }
  ?>

 Legend:



Removed from v.466
 


changed lines


 
Added in v.556
 Legend:



Removed from v.466
 


changed lines


 
Added in v.556
-Removed from v.466
+Added in v.556

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/includes/mambolanguage.class.php