oasp-i18n bug fixed, refactoring