[i18n] fix divers, refacto