I saw that currently internationalization is implemented with a hack, but there are a few plugins that give support for it in Jekyll, like Polyglot and Jekyll Multiple Languages Plugin. Maybe changing the code to use one of them would make it easier to use and test.
I used Jekyll Multiple Languages Plugin in my personal site and decided to write about how to use it, since I never tried Jekyll before and struggled a little with it. Maybe it will help to implement it.