Merge branch 'master' of https://github.com/thelia/thelia

2013-09-06 16:19:06 +02:00
parent 8bd7a6413d 1c307385ce
commit af93f810f7
14 changed files with 249 additions and 54 deletions
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -81,6 +81,17 @@ class BaseController extends ContainerAware
        return $this->container->get('event_dispatcher');
    }

+    /**
+     *
+     * return the Translator
+     *
+     * @return mixed \Thelia\Core\Translation\Translator
+     */
+    public function getTranslator()
+    {
+        return $this->container->get('thelia.translator');
+    }
+
    /**
     * Return the parser context,
     *