Ignore:
Timestamp:
2006-10-17T20:30:41+02:00 (8 years ago)
Author:
moo
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/admin/common.php

    r134 r255  
    33function get_language_file_ex($name, $l, $s) 
    44{ 
    5     static $map = array( 
     5    static $lmap = array( 
    66            'zh'    => 'zh-simplified', 
    77            'zh-hk' => 'zh-traditional', 
    88            'zh-tw' => 'zh-traditional', 
    99            ); 
     10    static $smap = array( 
     11            'gbk'     => 'gb2312', 
     12            'gb18030' => 'gb2312', 
     13            ); 
    1014 
    11     if (isset($map[$l])) { 
    12         $l = $map[$l]; 
     15    if (isset($lmap[$l])) { 
     16        $l = $lmap[$l]; 
    1317    } 
    1418    if (file_exists($file = "$name-$l-$s.lang.php")) { 
    1519        return $file; 
     20    } 
     21    if (isset($smap[$s])) { 
     22        $s = $smap[$s]; 
     23        if (file_exists($file = "$name-$l-$s.lang.php")) { 
     24            return $file; 
     25        } 
    1626    } 
    1727    if (file_exists($file = "$name-$l.lang.php")) { 
Note: See TracChangeset for help on using the changeset viewer.