Multisite Sub-Directory Troubles

I’m currently using v3.4.4 of the plugin on an multisite installation of WordPress 4.3.1. The multisite mode is set at sub-directories (over sub-domain) and the plugin I have set to Pre-Path mode. I am having a couple of issues that seem to be related.

When browsing the “root” domain of the site in another language, the links are generated properly (in SEO terms), for example http://site.com/it/subfolder1. However, if I click the link, the site 404s. If I hack the URL to instead read http://site.com/subfolder1/it, the site loads properly. Once I have the site loaded properly, all the links internal to that specific subfolder are generated properly. That leads to my second issue.

Links outside of any given subfolder site, but still internal to the multisite install, don’t include the language URL segment. This appears to be the result of how the qtranxf_complete_url_info function inspects the ‘home’ site versus the destination site in a link (it doesn’t appear to compare hosts in two URLs to determine if the link is an external one).

I’ve forked the GitHub repo and have started hacking on it a bit. So far, I’ve been able to patch the URL building portions to always place the Pre-Path segment right after the host and before any subfolder and remaining path segments. However, I’m unable to get the content to actually load. I get the 404 page for the site when clicking any links.

I’m mainly looking for any guidance or insight on how to signal WP to load the proper page in the given language. Documentation on what the $urlinfo/$url_info hash values are used for would be great as I think that’s where the gap in my knowledge is hindering me. In the meantime, I’ll keep hacking.

Thanks in advance!

https://ww.wp.xz.cn/plugins/qtranslate-x/