Changeset 2214

Show
Ignore:
Timestamp:
03/03/2008 12:34:48 PM (7 months ago)
Author:
Shadowhand
Message:

Updated locale handling to be i18n-ized.

Location:
trunk/system
Files:
1 added
2 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/system/config/locale.php

    r2202 r2214  
    1111 * Default country locale. 
    1212 */ 
    13 $config['country'] = 'US'; 
     13$config['country'] = 'USA'; 
    1414 
    1515/** 

  • trunk/system/core/Kohana.php

    r2203 r2214  
    853853                        // Loop through the files and include each one, so SYSPATH files 
    854854                        // can be overloaded by more localized files 
    855                         foreach(self::find_file('l10n', $filename) as $file) 
     855                        foreach(self::find_file('l10n', Config::item('locale.language').'/'.$filename) as $file) 
    856856                        { 
    857857                                include $file;