- return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
- && isRequired("polyglossia")
- && isAvailable("polyglossia")
- && this->hasPolyglossiaLanguages();
+ if (bufferParams().lang_package == "default")
+ return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
+ return (bufferParams().lang_package == "auto")
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();