[DS-1599] I18nUtil.getMessage() does not return the intended language's message

This pull request fixes the issue described in DS-1599.