Merge pull request #91 from symfony-cmf/get-locale

dbu · dbu · commit 3eed1c3b3f4b · 2013-09-06T03:08:58.000-07:00
use the explicit method to get locale
diff --git a/Admin/Extension/TranslatableExtension.php b/Admin/Extension/TranslatableExtension.php
@@ -66,7 +66,7 @@ public function alterNewInstance(AdminInterface $admin, $object)
         }
 
         if ($admin->hasRequest()) {
-            $currentLocale = $admin->getRequest()->attributes->get('_locale');
+            $currentLocale = $admin->getRequest()->getLocale();
 
             if (in_array($currentLocale, $this->locales)) {
                 $object->setLocale($currentLocale);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function alterNewInstance(AdminInterface $admin, $object)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if ($admin->hasRequest()) {`
`69`		`- $currentLocale = $admin->getRequest()->attributes->get('_locale');`
	`69`	`+ $currentLocale = $admin->getRequest()->getLocale();`
`70`	`70`
`71`	`71`	`if (in_array($currentLocale, $this->locales)) {`
`72`	`72`	`$object->setLocale($currentLocale);`