[#2] i18n fixes, needed for extract_messages command to parse templates