[bug] Incorrect location of a site language override; Fixes #3680, Fixes #3686