Fixes #1497 (wrong file rendered if language != sourceLanguage)
Merge pull request #1498 from mintao/master

i18N: View path does not change if language folder exists