[CDF-284] [CDF-refactor] i18n not working properly
Merge pull request #186 from pedrofvteixeira/CDF-284

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