Author: jsuchome Date: Thu Jul 28 13:51:12 2011 New Revision: 65073 URL: http://svn.opensuse.org/viewcvs/yast?rev=65073&view=rev Log: - adapt the message shown when compliance check fails - 2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/VERSION?rev=65073&r1=65072&r2=65073&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Jul 28 13:51:12 2011 @@ -1 +1 @@ -2.17.103 +2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp?rev=65073&r1=65072&r2=65073&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp Thu Jul 28 13:51:12 2011 @@ -180,12 +180,8 @@ } }); string reasons_s = mergestring (reasons, "\n"); - // popup message, %1 is list of problems - string question = sformat (_("The system is not compliant with provided profile: - - %1 - -Do you want to continue or abort the installation?"), reasons_s); + // last part of the question (variable) + string end_question = _("Do you want to continue or abort the installation?"); // button label string continue_button =_("&Continue Installation"); @@ -195,12 +191,8 @@ // checking specific product if (productId != nil) { - // popup message, %1 is list of problems - question = sformat (_("The system is not compliant with provided profile: - - %1 - -Do you want to add new product anyway?"), reasons_s); + // last part of the question (variable) + end_question = _("Do you want to add new product anyway?"); continue_button = Label::YesButton (); cancel_button = Label::NoButton (); } @@ -208,7 +200,16 @@ boolean ret = Report::AnyQuestion ( // popup dialog caption _("Warning"), - question, + // popup message, %1 is list of problems + sformat (_("The profile does not allow you to run the products on this system. +Proceeding to run this installation will leave you in an unsupported state +and might impact your compliance requirements. + +The following requirements are not fulfilled on this system: + +%1 + +%2"), reasons_s, end_question), continue_button, cancel_button, `no_button ); Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes?rev=65073&r1=65072&r2=65073&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Jul 28 13:51:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 13:46:22 CEST 2011 - jsuchome@suse.cz + +- adapt the message shown when compliance check fails +- 2.17.104 + +------------------------------------------------------------------- Wed Jul 27 09:29:36 UTC 2011 - lslezak@suse.cz - command line - properly display multiline help texts (bnc#708553) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org