fix bug 1057012, 1079882

Replaces #2778
Ah, okay, yeah, the most issues I writing tests that work out of the box is our URL prefixer sadly. Creates too many issues sometimes :( I really want to investiage at some point why we can't use the i18n-URL abilities that are bundled with Django.