updated generator + i18n behavior