Rejigger i18n to return key itself if translation not found, #875