improve i18n handling