Re-added SiteLanguageList logic and in addition take into account ShowUntranslatedObjects as suggested by @andrerom