Fixed variable name os_locale_language

master
Ivan Loskutov 14 years ago
parent 2f5ea21758
commit 7c0383d1a1

@ -31,10 +31,10 @@ bool CalculateConfig::getDefaultConfig()
// start cl-install -v and parse out // start cl-install -v and parse out
QProcess cl_install; QProcess cl_install;
qDebug() << "Start cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\""; qDebug() << "Start cl-install -v --xml --filter \"os_install*|os_locale_lang*|*os_disk*|*os_device*|cl_migrate_user\"";
cl_install.start( cl_install.start(
"cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\"" "cl-install -v --xml --filter \"os_install*|os_locale_lang*|*os_disk*|*os_device*|cl_migrate_user\""
); );
if ( !cl_install.waitForStarted() ) if ( !cl_install.waitForStarted() )
@ -45,7 +45,7 @@ bool CalculateConfig::getDefaultConfig()
QString outVars = cl_install.readAll(); QString outVars = cl_install.readAll();
qDebug() << endl << outVars; //qDebug() << endl << outVars;
QDomDocument xmlVars; QDomDocument xmlVars;
QString errMsg; QString errMsg;
@ -65,7 +65,7 @@ bool CalculateConfig::getDefaultConfig()
// installer settings // installer settings
// gui_partitioning - install type: auto, manual // gui_partitioning - install type: auto, manual
m_Config["gui_install_language"] = m_Config["os_locale_lang"]; m_Config["gui_install_language"] = m_Config["os_locale_language"];
QStringList devs = m_Config["os_device_dev"].toStringList(); QStringList devs = m_Config["os_device_dev"].toStringList();
m_Config.remove("os_device_dev"); m_Config.remove("os_device_dev");
@ -479,7 +479,7 @@ QStringList CalculateConfig::getInstallParameters()
// lang // lang
QString lang = m_Config["gui_install_language"].toString(); QString lang = m_Config["gui_install_language"].toString();
if ( !lang.isEmpty() && ( lang != m_Config["os_locale_lang"].toString())) if ( !lang.isEmpty() && ( lang != m_Config["os_locale_language"].toString()))
params << "--lang=" + lang; params << "--lang=" + lang;
// users // users

@ -43,7 +43,7 @@ SystemInstaller::SystemInstaller(QWidget *parent) :
installReady = false; installReady = false;
} else { } else {
// set os locale language // set os locale language
changeLanguage( CalculateConfig::instance()->getValue("os_locale_lang").toString() ); changeLanguage( CalculateConfig::instance()->getValue("os_locale_language").toString() );
} }
setupUi(); setupUi();

Loading…
Cancel
Save