EmailTemplate error localization
Merge branch 'EmailTemplateErrorLocalization'