Fix Bug 1036634 - links to pages within the site should be rendered in t...

Fix Bug 1036634 - links to pages within the site should be rendered in the current locale