Further implemented i18n for french and english
Only en and fr are supported now