[CDF-284] [CDF-refactor] i18n not working properly