Mambo > Projects > Mambo CMS > SVN

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

-revision 908, Fri Jan 26 02:34:06 2007 UTC
+revision 1396, Tue Nov 13 09:59:41 2007 UTC
 Line 2
  /**
  * Language Class for Mambo
  * @package Mambo
- * @copyright (C) 2006 - 2007 Mambo Foundation Inc.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @author Mambo Foundation Inc see README.php
+ * @copyright Mambo Foundation Inc.
+ * See COPYRIGHT.php for copyright notices and details.
+ * @license GNU/GPL Version 2, see LICENSE.php
+ * Mambo is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License.
  */
  defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-Line 28
+Line 32
      var $iso3166_3 = '';
      var $locale = '';
      var $charset = '';
-     var $wincodepage = '';
      var $codesets = array();
      var $plural_form = array();
      var $days = array('sun'=>'','mon'=>'','tue'=>'','wed'=>'','thu'=>'','fri'=>'','sat'=>'');
-Line 55
+Line 58
          if (isset($this->$var)) $this->$var = $value;
      }
      function save() {
-     global $page_,$task;
+     global $page_,$task,$mapcharset;
      $this->updateFiles();
      $xml = $this->toXML();
      if( (($page_=="addpage") && ($task=="save")) || ($task=="convert") ){
          if (strtolower($this->charset) != 'utf-8') {
-             if(trim($this->wincodepage)!="")
+                         $xml = $this->iconvert("utf-8",$mapcharset[$this->charset],$xml);
-                 $xml = $this->iconvert("utf-8",$this->wincodepage,$xml);
-             else
-                 $xml = $this->iconvert("utf-8",$this->charset,$xml,TRUE);
          }
      }
          /**/
 Line 102
      }
      function load($load_catalogs = false) {
+                 global $mapcharset;
          if (is_readable($this->path . $this->name . ".xml")) {
              $source = file_get_contents($this->path . $this->name . ".xml");
              if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
-Line 111
+Line 112
              }
              if($encoding == "UTF-8" || $encoding == "US-ASCII" || $encoding == "ISO-8859-1") {
-                 $parser = xml_parser_create($encoding);
+                 $parser = xml_parser_create();
              } else {
                  #if(function_exists('mb_convert_encoding')) {
-                     if(trim($this->wincodepage)!="")
+                                         if(trim($this->charset)!="")
-                         $encoded_source = $this->iconvert($this->wincodepage,"UTF-8",$source);
+                                                 $encoded_source = $this->iconvert($mapcharset[$this->charset],"UTF-8",$source);
                      else
-                         $encoded_source = $this->iconvert($encoding,"UTF-8",$source,TRUE);
+                                                 $encoded_source = $this->iconvert($mapcharset[strtolower($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");
+                 $parser = xml_parser_create();
              }
              xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
-Line 173
+Line 174
                      case 'charset':
                      $this->codesets[] = $value['value'];
                      break;
-                     case 'wincodepage':
-                         $this->wincodepage = $value['value'];
-                     break;
                      case 'days':
                      $this->days = $value['attributes'];
                      break;
-Line 197
+Line 195
                  if(strtolower($encoding)!="utf-8")
                  {
                      $attrs = get_object_vars($this);
-                     if(trim($this->wincodepage)!="")
+                                         $this->arrayEncoding($attrs,$mapcharset[$this->charset]);
-                     {
-                         $this->arrayEncoding($attrs,$this->wincodepage);
-                         $this->bindAttributes($attrs);
-                     }else{
-                         $this->arrayEncoding($attrs,$encoding,TRUE);
                          $this->bindAttributes($attrs);
                      }
                  }
-             }
              return true;
          }
          return false;
-Line 298
+Line 289
              $this->files[] = $file;
          }
          $this->files[] = array('filename'=>"language/" . $this->name . '.xml','domain'=>"",'strings'=>"",'percent'=>"",'translated'=>0,'fuzzy'=>0,'filetype'=>'xml');
-         $this->files[] = array('filename'=>"language/" . $this->name . '/LC_MESSAGES/' . $this->name.".mo",'domain'=>"",'strings'=>"",'percent'=>"",'translated'=>0,'fuzzy'=>0,'filetype'=>'mo');
+         $langfiles = mosReadDirectory($dir.'LC_MESSAGES/', '.mo$');
+         set_time_limit(60);
+         foreach ($langfiles as $lf) {
+             $this->files[] = array('filename'=>"language/" . $this->name . '/LC_MESSAGES/' . $lf,'domain'=>"",'strings'=>"",'percent'=>"",'translated'=>0,'fuzzy'=>0,'filetype'=>'mo');
+         }
+         if(file_exists($this->path.'/glossary/'.  $this->name.".".$this->charset.".po"))
          $this->files[] = array('filename'=>"language/glossary/" . $this->name.".".$this->charset.".po",'domain'=>"",'strings'=>"",'percent'=>"",'translated'=>0,'fuzzy'=>0,'filetype'=>'gl');
      }
-Line 316
+Line 313
          $array[] = array('tag' => 'params', 'type' => 'open', 'level' => 2);
          $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'locale', 'type' => 'text', 'default' => $this->locale, 'label' => 'Locale String', 'description' => 'Locale string for setlocale() (eg. en, english)'));
          $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'charset', 'type' => 'text', 'default' => $this->charset, 'label' => 'Character Set', 'description' => 'Character set for this language.'));
-         $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'text_direction', 'type' => 'text', 'default' => $this->text_direction, 'label' => 'Text Direction', 'description' => 'left-to-right or light-to-left'));
+         $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'text_direction', 'type' => 'text', 'default' => $this->text_direction, 'label' => 'Text Direction', 'description' => 'left-to-right or right-to-left'));
          $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'date_format', 'type' => 'text', 'default' => $this->date_format, 'label' => 'Date Format', 'description' => 'Date format for strftime() (eg. %A, %d %B %Y)'));
          $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'plural_form', 'type' => 'text', 'default' => htmlentities($this->plural_form['expression']), 'label' => 'Plural Forms', 'description' => 'Plural Forms expression'));
          $array[] = array('tag' => 'params', 'type' => 'close', 'level' => 2);
-Line 326
+Line 323
          $array[] = array('tag' => 'codesets', 'type' => 'open', 'level' => 3);
          foreach ($this->codesets as $charset) $array[] = array('tag' => 'charset', 'type' => 'complete', 'level' => 4, 'value' => $charset);
          $array[] = array('tag' => 'codesets', 'type' => 'close', 'level' => 3);
-         $array[] = array('tag' => 'wincodepage', 'type' => 'complete', 'level' => 3,'value'=>$this->wincodepage);
          foreach ($this->days as $name => $day) $days[$name] = $day;
          $array[] = array('tag' => 'days', 'type' => 'complete', 'level' => 3, 'attributes' => $days);
          foreach ($this->months as $name => $month) $months[$name] = $month;
-Line 407
+Line 403
                  case 'date_format':
                  $locale[$iso639]['dateformats'] = $dateformats[$iso639] = $value['value'];
                  break;
-                 case 'wincodepage':
-                 $locale[$iso639]['wincodepage'] = $value['value'];
-                 break;
                  case 'days':
                  $locale[$iso639]['days'] = $value['attributes'];
                  break;
-Line 437
+Line 430
      function getSystemLocale(){
          if (substr(strtoupper(PHP_OS), 0, 3) == 'WIN'){
-             return strtolower($this->title).'_'.strtolower($this->iso3166_3);
+             return strtolower($this->title).($this->iso3166_3?'_'.strtolower($this->iso3166_3):'');
          } else {
              return $this->locale;
          }

 Legend:



Removed from v.908
 


changed lines


 
Added in v.1396
 Legend:



Removed from v.908
 


changed lines


 
Added in v.1396
-Removed from v.908
+Added in v.1396

	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