[#384] Fix some template i18n issues
Merge pull request #386 from andylolz/384-i18n

[#384] Fix some template i18n issues