Skip to content

Commit

Permalink
Merge pull request #1 from thomaroger/troger-fix-translation-user-pla…
Browse files Browse the repository at this point in the history
…yground-273

[RFM] Résoud le problème de traduction, #playground-273
  • Loading branch information
gregorybesson committed Oct 14, 2013
2 parents d78e925 + 39158c6 commit 1eff527
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
10 changes: 10 additions & 0 deletions src/PlaygroundReward/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ public function onBootstrap(MvcEvent $e)
$serviceManager = $application->getServiceManager();
$eventManager = $application->getEventManager();

$options = $serviceManager->get('playgroundcore_module_options');
$locale = $options->getLocale();
$translator = $serviceManager->get('translator');
if (!empty($locale)) {
//translator
$translator->setLocale($locale);

// plugins
$translate = $serviceManager->get('viewhelpermanager')->get('translate');
$translate->getTranslator()->setLocale($locale);
}

AbstractValidator::setDefaultTranslator($translator,'playgroundcore');

Expand Down
4 changes: 2 additions & 2 deletions view/admin/playground-reward/layout/admin.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ if(isset($children[0])){
<!-- <div class="navbar navbar-fixed-top"> -->
<div class="navbar">
<ul class='nav'>
<?php echo $this->adminMenu()->setPartial(array('application/menu.phtml', 'default'));
<?php echo $this->adminMenu()->setPartial(array('playground-design/common/menu.phtml', 'default'));
?>
</ul>
</div>
Expand All @@ -120,7 +120,7 @@ if(isset($children[0])){
<?php echo $this->navigation()
->breadcrumbs('admin_navigation')
->setMaxDepth(3)
->setPartial(array('application/breadcrumbs.phtml', 'default'));
->setPartial(array('playground-design/common/breadcrumbs.phtml', 'default'));
?>
<?php echo $this->content; ?>

Expand Down

0 comments on commit 1eff527

Please sign in to comment.