ViewDialog.cpp   ViewDialog.cpp 
skipping to change at line 391 skipping to change at line 391
const bool b = StelApp::getInstance().getSkyCultureMgr().getCurrentS kyCultureID()==StelApp::getInstance().getSkyCultureMgr().getDefaultSkyCultu reID(); const bool b = StelApp::getInstance().getSkyCultureMgr().getCurrentS kyCultureID()==StelApp::getInstance().getSkyCultureMgr().getDefaultSkyCultu reID();
ui->useAsDefaultSkyCultureCheckBox->setChecked(b); ui->useAsDefaultSkyCultureCheckBox->setChecked(b);
ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b); ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b);
} }
void ViewDialog::updateSkyCultureText() void ViewDialog::updateSkyCultureText()
{ {
QString descPath; QString descPath;
try try
{ {
descPath = StelFileMgr::findFile("skycultures/" + StelApp::g QString lang = StelApp::getInstance().getLocaleMgr().getApp
etInstance().getSkyCultureMgr().getCurrentSkyCultureID() + "/description."+ Language();
StelApp::getInstance().getLocaleMgr().getAppLanguage()+".utf8"); if (!QString("pt_BR zh_CN zh_HK zh_TW").contains(lang))
{
lang = lang.split("_").at(0);
}
descPath = StelFileMgr::findFile("skycultures/" + StelApp::
getInstance().getSkyCultureMgr().getCurrentSkyCultureID() + "/description."
+lang+".utf8");
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
try try
{ {
descPath = StelFileMgr::findFile("skycultures/" + St elApp::getInstance().getSkyCultureMgr().getCurrentSkyCultureID() + "/descri ption.en.utf8"); descPath = StelFileMgr::findFile("skycultures/" + St elApp::getInstance().getSkyCultureMgr().getCurrentSkyCultureID() + "/descri ption.en.utf8");
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << "WARNING: can't find description for s kyculture" << StelApp::getInstance().getSkyCultureMgr().getCurrentSkyCultur eID(); qWarning() << "WARNING: can't find description for s kyculture" << StelApp::getInstance().getSkyCultureMgr().getCurrentSkyCultur eID();
 End of changes. 1 change blocks. 
3 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/