Skip to content

Commit

Permalink
Merge branch 'hotfix/translator-alias'
Browse files Browse the repository at this point in the history
Close #186
  • Loading branch information
weierophinney committed May 6, 2013
2 parents 8e445f9 + d1f7296 commit 0253af3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"homepage": "http://framework.zend.com/",
"require": {
"php": ">=5.3.3",
"zendframework/zendframework": ">2.1.3"
"zendframework/zendframework": ">2.2.0rc1"
}
}
4 changes: 2 additions & 2 deletions module/Application/config/module.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
'Zend\Cache\Service\StorageCacheAbstractServiceFactory',
'Zend\Log\LoggerAbstractServiceFactory',
),
'factories' => array(
'translator' => 'Zend\I18n\Translator\TranslatorServiceFactory',
'aliases' => array(
'translator' => 'MvcTranslator',
),
),
'translator' => array(
Expand Down

0 comments on commit 0253af3

Please sign in to comment.