Development

Changeset 6821

You must first sign up to be able to contribute.

Changeset 6821

Show
Ignore:
Timestamp:
12/30/07 08:24:13 (5 years ago)
Author:
fabien
Message:

removed i18n.yml from config_handlers.yml + fixed comment about default culture

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/data/config/config_handlers.yml

    r5384 r6821  
    3030  class:    sfRoutingConfigHandler 
    3131 
    32 config/i18n.yml: 
    33   class:    sfDefineEnvironmentConfigHandler 
    34   param: 
    35     prefix: sf_i18n_ 
    36  
    3732modules/*/config/generator.yml: 
    3833  class:    sfGeneratorConfigHandler 

  • branches/1.1/lib/user/sfUser.class.php

    r6660 r6821  
    8888    // otherwise 
    8989    //  - use the culture defined in the user session 
    90     //  - use the default culture set in i18n.yml 
     90    //  - use the default culture set in settings.yml 
    9191    $currentCulture = $storage->read(self::CULTURE_NAMESPACE); 
    9292    $this->setCulture($this->getParameter('culture', !is_null($currentCulture) ? $currentCulture : $this->getParameter('default_culture', 'en')));