Fix issue where locale is not prepended to url in template (2)