template errors
Merge pull request #560 from edx/adam/i18n-bug-fixes

template errors