Adding i18n locale support