Fixes translation issue and template values.
Merge pull request #421 from LearningLocker/issue/419

Fixes translation issue and template values.