[#384] Fix some template i18n issues

Fixes #384.