Merge branch 'master' into frontend

Conflicts: templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
parent f34a4a066d 4c9eff379a
commit 462b2bec5e
16 changed files with 990 additions and 734 deletions
--- a/core/lib/Thelia/Core/Template/TemplateHelper.php
+++ b/core/lib/Thelia/Core/Template/TemplateHelper.php
@@ -250,7 +250,7 @@ class TemplateHelper

                    $translation = str_replace("'", "\'", $translations[$key]);

-                    fwrite($fp, sprintf("\t'%s' => '%s',\n", $text, $translation));
+                    fwrite($fp, sprintf("    '%s' => '%s',\n", $text, $translation));
                }
            }