refactored intl message loading