Hi,
WinterFairy, please review my bugfix/6478 branch, that builds on top
of yours. Untested yet. I'll ask a formal go ahead for merging once I,
or someone else, has tested it for many languages.
Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc