i18n-locale fix
add i18n-js
Merge branch 'feature/i18n_js' into develop