浏览代码

Merge pull request #252 from stof/translations

Fixed bad change of the translation domain
Thomas 13 年之前
父节点
当前提交
8066b66557
共有 1 个文件被更改,包括 5 次插入11 次删除
  1. 5 11
      Admin/Admin.php

+ 5 - 11
Admin/Admin.php

@@ -840,7 +840,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
      * @param  string $name
      * @param  string $name
      * @param  $object
      * @param  $object
      * @param array $parameters
      * @param array $parameters
-     * 
+     *
      * @return return a complete url
      * @return return a complete url
      */
      */
     public function generateObjectUrl($name, $object, array $parameters = array())
     public function generateObjectUrl($name, $object, array $parameters = array())
@@ -1614,7 +1614,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
         $menu = $menu ?: new Menu;
         $menu = $menu ?: new Menu;
 
 
         $child = $menu->addChild(
         $child = $menu->addChild(
-            $this->trans(sprintf('breadcrumb.link_%s_list', $this->getClassnameLabel()), array(), 'SonataAdminBundle'),
+            $this->trans(sprintf('breadcrumb.link_%s_list', $this->getClassnameLabel())),
             $this->generateUrl('list')
             $this->generateUrl('list')
         );
         );
 
 
@@ -1629,28 +1629,22 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
             );
             );
 
 
             return $childAdmin->buildBreadcrumbs($action, $child);
             return $childAdmin->buildBreadcrumbs($action, $child);
-
         } elseif ($this->isChild()) {
         } elseif ($this->isChild()) {
-
             if ($action != 'list') {
             if ($action != 'list') {
                 $menu = $menu->addChild(
                 $menu = $menu->addChild(
-                    $this->trans(sprintf('breadcrumb.link_%s_list', $this->getClassnameLabel()), array(), 'SonataAdminBundle'),
+                    $this->trans(sprintf('breadcrumb.link_%s_list', $this->getClassnameLabel())),
                     $this->generateUrl('list')
                     $this->generateUrl('list')
                 );
                 );
             }
             }
 
 
             $breadcrumbs = $menu->getBreadcrumbsArray(
             $breadcrumbs = $menu->getBreadcrumbsArray(
-                $this->trans(sprintf('breadcrumb.link_%s_%s', $this->getClassnameLabel(), $action), array(), 'SonataAdminBundle')
+                $this->trans(sprintf('breadcrumb.link_%s_%s', $this->getClassnameLabel(), $action))
             );
             );
-
         } else if ($action != 'list') {
         } else if ($action != 'list') {
-
             $breadcrumbs = $child->getBreadcrumbsArray(
             $breadcrumbs = $child->getBreadcrumbsArray(
-                $this->trans(sprintf('breadcrumb.link_%s_%s', $this->getClassnameLabel(), $action), array(), 'SonataAdminBundle')
+                $this->trans(sprintf('breadcrumb.link_%s_%s', $this->getClassnameLabel(), $action))
             );
             );
-
         } else {
         } else {
-
             $breadcrumbs = $child->getBreadcrumbsArray();
             $breadcrumbs = $child->getBreadcrumbsArray();
         }
         }