WIP on OnLanguageChanged - issue #148