Use i18n in places
Merge pull request #3 from sarahsemark/i18n

Use i18n in places