adapted to refactored i18n lib