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

2013-11-06 16:05:57 +01:00
parent 7c897c758d 8d40605091
commit 14aa93a32d
5 changed files with 62 additions and 20 deletions
--- a/core/lib/Thelia/Core/Translation/Translator.php
+++ b/core/lib/Thelia/Core/Translation/Translator.php
@@ -52,7 +52,7 @@ class Translator extends BaseTranslator
     *
     * @api
     */
-    public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)
+    public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null, $return_default_if_not_available = true)
    {
        if (null === $locale) {
            $locale = $this->getLocale();
@@ -64,7 +64,9 @@ class Translator extends BaseTranslator

        if ($this->catalogues[$locale]->has((string) $id, $domain))
            return parent::trans($id, $parameters, $domain, $locale);
-        else
+        else if ($return_default_if_not_available)
            return strtr($id, $parameters);
+        else
+            return '';
    }
 }