Thank you for your response! I'll pull and review the language-selector branch as you suggested.
In the meantime, could you please take a look at the changes I made in this mergerequest? Here's the link: Merge Request #995. Your feedback would be greatly appreciated.