#2 Add a minimum i18n support