I18n-js work fine now
Merge remote-tracking branch 'origin/master'