Development

Changeset 14422

You must first sign up to be able to contribute.

Changeset 14422

Show
Ignore:
Timestamp:
01/02/09 08:24:21 (1 year ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/dwhittle/1.0/lib/controller/sfController.class.php

    r9949 r14422  
    270270        if (sfConfig::get('sf_i18n')) 
    271271        { 
    272           $this->context->getI18N()->setMessageSourceDir(sfLoader::getI18NDir($moduleName), $this->context->getUser()->getCulture()); 
     272          if (sfLoader::getI18NDir($moduleName)) 
     273          { 
     274            $this->context->getI18N()->setMessageSourceDir(sfLoader::getI18NDir($moduleName), $this->context->getUser()->getCulture()); 
     275          } 
     276          else 
     277          { 
     278            $this->context->getI18N()->setMessageSourceDir(sfConfig::get('sf_app_i18n_dir'), $this->context->getUser()->getCulture()); 
     279          } 
    273280        } 
    274281 
  • branches/dwhittle/1.2/lib/task/project/sfProjectFreezeTask.class.php

    r13292 r14422  
    3737the current project: 
    3838 
    39   [./symfony project:freeze|INFO] 
     39  [./symfony project:freeze /path/to/symfony/data/directory|INFO] 
     40 
     41The task takes a mandatory argument of the path to the symfony data 
     42directory. 
    4043 
    4144The task also changes [config/config.php|COMMENT] to switch to the 

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting.
Sensio Labs also supports several large Open-Source projects.