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

core/lib/Thelia/Controller/Admin/TranslationsController.php

@@ -94,6 +94,10 @@ class TranslationsController extends BaseAdminController
                 case 'pf' :
                     $template = new TemplateDefinition($item_id, TemplateDefinition::PDF);
                 break;
+
+                case 'ma' :
+                    $template = new TemplateDefinition($item_id, TemplateDefinition::EMAIL);
+                break;
             }
 
             if ($template) {

core/lib/Thelia/Core/Template/Loop/Template.php

@@ -64,7 +64,8 @@ class Template extends BaseLoop implements ArraySearchLoopInterface
                     new Type\EnumListType(array(
                         'front-office',
                         'back-office',
-                        'pdf'
+                        'pdf',
+                        'email'
                     ))
                 )
             )
@@ -80,6 +81,8 @@ class Template extends BaseLoop implements ArraySearchLoopInterface
             $templateType = TemplateDefinition::BACK_OFFICE;
         else if ($type == 'pdf')
             $templateType = TemplateDefinition::PDF;
+        else if ($type == 'email')
+            $templateType = TemplateDefinition::EMAIL;
 
         return TemplateHelper::getInstance()->getList($templateType);
     }