[yast-commit] r39815 - /trunk/metapackage/src/OneClickInstallUI.ycp
Author: mvidner Date: Mon Jul 30 18:46:47 2007 New Revision: 39815 URL: http://svn.opensuse.org/viewcvs/yast?rev=39815&view=rev Log: Print error for bad usage Don't split translated messages Use stock strings Modified: trunk/metapackage/src/OneClickInstallUI.ycp Modified: trunk/metapackage/src/OneClickInstallUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallUI.ycp?rev=39815&r1=39814&r2=39815&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallUI.ycp (original) +++ trunk/metapackage/src/OneClickInstallUI.ycp Mon Jul 30 18:46:47 2007 @@ -36,7 +36,11 @@ { FTP::Get(metaPackageUrl,newUrl); metaPackageUrl = newUrl; - } else return false; + } else + { + y2error ("Argument is neither local absolute path nor an HTTP or FTP URL. Bye."); + return false; + } } OneClickInstall::Load(metaPackageUrl); @@ -72,8 +76,8 @@ string NOTHING = _("There is nothing to do."); string REQUIRE_ADVANCED = _("Advanced mode, with ability to change settings."); string SPLASH_HEADING = _("Welcome"); - string WIZARD_DESCRIPTION1 = _("This wizard will install"); - string WIZARD_DESCRIPTION2 = _("onto your computer."); + // %1: software package + string WIZARD_DESCRIPTION = _("This wizard will install <b>%1</b> onto your computer."); string SUMMARY_HEADING = _("Summary"); string DESCRIPTION_HEADING = _("Description"); string REPOSITORIES_FAILED = _("The following repositories could not be added"); @@ -417,7 +421,7 @@ if (is_viewing_splash(no)) { string splashStr = "<body bgcolor=\"White\"><h2>" + SPLASH_HEADING + "</h2>" ; - splashStr = splashStr + WIZARD_DESCRIPTION1 + " <b>" + OneClickInstall::GetName() + "</b> " + WIZARD_DESCRIPTION2; + splashStr = splashStr + sformat (WIZARD_DESCRIPTION, OneClickInstall::GetName()); splashStr = splashStr + "<h3>" + SUMMARY_HEADING + "</h3><p style=\"background-color:white;\">" + NewLinesToRichText(OneClickInstall::GetSummary()) + "</p>"; splashStr = splashStr + "<h3>" + DESCRIPTION_HEADING + "</h3><p>" + NewLinesToRichText(OneClickInstall::GetDescription()) + "</p></body>"; UI::ChangeWidget(`id(`splashMessage),`Value,splashStr); @@ -494,7 +498,7 @@ } if (is_confirming(step) && (button == `next) ) { - return Popup::AnyQuestion ("Warning","Have you reviewed the changes that will be made to your system?\n\nMalicious packages could damage your system.","Yes","No",`focus_no); + return Popup::AnyQuestion (Label::WarningMsg(), _("Have you reviewed the changes that will be made to your system?\n\nMalicious packages could damage your system."), Label::YesButton(), Label::NoButton(),`focus_no); } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
mvidner＠svn.opensuse.org