See the new code

Now this is working for all the language you want.

Not sure if you will be able to merge only the new code but try it!