Wrap form error message in i18n tags
Refactor form field templates

This allows the form field template to be customised and re-used,
avoiding duplication.

Fixes #754