There's already a similar fix in issue-#22-translation branch. Please rebase your work from there.
Thanks