From b7dbd9e955c4401955e0e9928226500bd1f60d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 23 Dec 2010 17:40:28 +0300 Subject: [PATCH] Revert "Fixed variable name os_locale_language" This reverts commit 7c0383d1a1ce5ddf98db1aab8d67e2c1b7d5690e. --- src/calculateconfig.cpp | 10 +++++----- src/systeminstaller.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calculateconfig.cpp b/src/calculateconfig.cpp index ee2da12..f223e12 100644 --- a/src/calculateconfig.cpp +++ b/src/calculateconfig.cpp @@ -31,10 +31,10 @@ bool CalculateConfig::getDefaultConfig() // start cl-install -v and parse out 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 -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() ) @@ -45,7 +45,7 @@ bool CalculateConfig::getDefaultConfig() QString outVars = cl_install.readAll(); - //qDebug() << endl << outVars; + qDebug() << endl << outVars; QDomDocument xmlVars; QString errMsg; @@ -65,7 +65,7 @@ bool CalculateConfig::getDefaultConfig() // installer settings // gui_partitioning - install type: auto, manual - m_Config["gui_install_language"] = m_Config["os_locale_language"]; + m_Config["gui_install_language"] = m_Config["os_locale_lang"]; QStringList devs = m_Config["os_device_dev"].toStringList(); m_Config.remove("os_device_dev"); @@ -479,7 +479,7 @@ QStringList CalculateConfig::getInstallParameters() // lang QString lang = m_Config["gui_install_language"].toString(); - if ( !lang.isEmpty() && ( lang != m_Config["os_locale_language"].toString())) + if ( !lang.isEmpty() && ( lang != m_Config["os_locale_lang"].toString())) params << "--lang=" + lang; // users diff --git a/src/systeminstaller.cpp b/src/systeminstaller.cpp index 8ebd4ed..5aad421 100644 --- a/src/systeminstaller.cpp +++ b/src/systeminstaller.cpp @@ -43,7 +43,7 @@ SystemInstaller::SystemInstaller(QWidget *parent) : installReady = false; } else { // set os locale language - changeLanguage( CalculateConfig::instance()->getValue("os_locale_language").toString() ); + changeLanguage( CalculateConfig::instance()->getValue("os_locale_lang").toString() ); } setupUi();