replaced js makemessage with info msg and added local check