Development

Changeset 5773

You must first sign up to be able to contribute.

Changeset 5773

Show
Ignore:
Timestamp:
10/31/07 08:32:56 (10 months ago)
Author:
fabien
Message:

backported i18n fixes from Prado

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/i18n/sfCultureInfo.class.php

    r4438 r5773  
    120120   */ 
    121121  const SPECIFIC = 2; 
     122 
     123  /** 
     124   * Gets the CultureInfo that for this culture string. 
     125   * 
     126   * @return CultureInfo Invariant culture info is "en" 
     127   */ 
     128  public static function getInstance($culture) 
     129  { 
     130    static $instances = array(); 
     131 
     132    if (!isset($instances[$culture])) 
     133    { 
     134      $instances[$culture] = new CultureInfo($culture); 
     135    } 
     136 
     137    return $instances[$culture]; 
     138  } 
    122139 
    123140  /** 

  • trunk/lib/i18n/sfDateTimeFormatInfo.class.php

    r4341 r5773  
    159159  { 
    160160    static $invariant; 
     161 
    161162    if (is_null($invariant)) 
    162163    { 
    163       $culture = sfCultureInfo::getInvariantCulture(); 
    164       $invariant = $culture->DateTimeFormat; 
     164      $invariant = sfCultureInfo::getInvariantCulture()->DateTimeFormat; 
    165165    } 
    166166 
    …… 
    183183    else if (is_string($culture)) 
    184184    { 
    185       $cultureInfo = new sfCultureInfo($culture); 
    186  
    187       return $cultureInfo->DateTimeFormat; 
     185      return sfCultureInfo::getInstance($culture)->DateTimeFormat; 
    188186    } 
    189187    else 
    190188    { 
    191       $cultureInfo = sfCultureInfo::getInvariantCulture(); 
    192  
    193       return $cultureInfo->DateTimeFormat; 
     189      return sfCultureInfo::getInvariantCulture()->DateTimeFormat; 
    194190    } 
    195191  } 

  • trunk/lib/i18n/sfNumberFormat.class.php

    r4343 r5773  
    211211        else if ($multiGroup && $count >= 1) 
    212212        { 
    213           if ($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0) 
     213          if ($i != 0 && ($i - $groupSize[0]) % $groupSize[1] == 0) 
    214214          { 
    215215            $integer = $groupSeparator.$integer; 

  • trunk/lib/i18n/sfNumberFormatInfo.class.php

    r4341 r5773  
    160160   * @return sfNumberFormatInfo default sfNumberFormatInfo.  
    161161   */ 
    162   public function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL) 
     162  static public function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL) 
    163163  { 
    164164    static $invariant;