Kohana.diff

Default to 'en_US' if none of the locales got accepted by setlocale() - Samuel Vogel, 05/02/2009 09:36 pm

Download (686 Bytes)

 
Kohana.php 2009-05-02 22:27:21.000000000 +0200
134 134 
		// Send default text/html UTF-8 header
135 135 
		header('Content-Type: text/html; charset='.Kohana::CHARSET);
136 136 

  		





  
  137
  
    
		// Define Kohana's default locale

  		





  
  138
  
    
		define('KOHANA_LOCALE', 'en_US');

  		





  
  139
  
    

  		





  137
  140
  
    
		// Load i18n

  		





  138
  141
  
    
		new I18n;

  		





  139
  142
  
    

  		





  ......




  151
  154
  
    

  		





  152
  155
  
    
		// Set locale information

  		





  153
  156
  
    
		self::$locale = setlocale(LC_ALL, $locales);

  		





  154
  
  
    
		

  		





  
  157
  
    

  		





  
  158
  
    
		// Default to the default locale when none of the user defined ones where accepted

  		





  
  159
  
    
		self::$locale = !self::$locale ? KOHANA_LOCALE.'.UTF-8' : self::$locale;

  		





  
  160
  
    

  		





  155
  161
  
    
		// Set locale for the I18n system

  		





  156
  162
  
    
		I18n::set_locale(self::$locale);

  		





  157
  163