Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

387
 
393
 
393
 
language.php
_> 11 <?php
  22 /*
<> 3 -  $Id: language.php 387 2006-01-18 16:49:58Z hpdl $
   3+  $Id: language.php 393 2006-01-20 22:54:31Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
3737                                                               'time_format' => $Qlanguages->value('time_format'),
  3838                                                               'text_direction' => $Qlanguages->value('text_direction'),
  3939                                                               'image' => $Qlanguages->value('image'),
<> 40 -                                                              'directory' => $Qlanguages->value('directory'),
4140                                                               'currencies_id' => $Qlanguages->valueInt('currencies_id'),
  4241                                                               'numeric_separator_decimal' => $Qlanguages->value('numeric_separator_decimal'),
  4342                                                               'numeric_separator_thousands' => $Qlanguages->value('numeric_separator_thousands'));
     
 !
5352     function load($key) {
  5453       global $osC_Cache;
  5554 
<> 56 -      if ($osC_Cache->read('languages-english-' . $key)) {
   55+      if ($osC_Cache->read('languages-' . $this->_code . '-' . $key)) {
5756         $this->_definitions = array_merge($this->_definitions, $osC_Cache->getCache());
  5857       } else {
<> 59 -        $osC_XML = new osC_XML('includes/languages/english.xml');
   58+        $osC_XML = new osC_XML('includes/languages/' . $this->_code . '.xml');
6059         $osC_XML->parse();
  6160 
  6261         $definitions = $osC_XML->getArray();
     
 !
215214       return $this->_languages[$this->_code]['image'];
  216215     }
  217216 
<> 218 -    function getDirectory() {
  219 -      return $this->_languages[$this->_code]['directory'];
  220 -    }
  221 -
222217     function getCurrencyID() {
  223218       return $this->_languages[$this->_code]['currencies_id'];
  224219     }
     
 !
230225     function getNumericThousandsSeparator() {
  231226       return $this->_languages[$this->_code]['numeric_separator_thousands'];
  232227     }
<> 233 -
  234 -    function load_____old($definition = false) {
  235 -      if (is_string($definition)) {
  236 -        include('includes/languages/' . $this->getDirectory() . '/' . $definition);
  237 -      } else {
  238 -        include('includes/languages/' . $this->getDirectory() . '.php');
  239 -      }
  240 -    }
<_ 241228   }
  242229 ?>