Author: aschnell Date: Fri Feb 10 12:15:08 2012 New Revision: 67405 URL: http://svn.opensuse.org/viewcvs/yast?rev=67405&view=rev Log: - use new String::YesNo Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67405&r1=67404&r2=67405&view=diff ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 12:15:08 2012 @@ -18,6 +18,7 @@ import "Report"; import "Sequencer"; import "Wizard"; + import "String"; include "s390/dasd/helps.ycp"; @@ -82,17 +83,9 @@ { items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; - string diag = d["diag"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - string format = d["format"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - return `item (`id(k), channel, format, diag); + string diag = String::YesNo(d["diag"]:false); + string format = String::YesNo(d["format"]:false); + return `item(`id(k), channel, format, diag); }); } else @@ -102,11 +95,7 @@ integer channel = d["resource", "io", 0, "start"]:0; string str_channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = DASDController::diag[str_channel]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string diag = String::YesNo(DASDController::diag[str_channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -115,11 +104,7 @@ substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = d["formatted"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; string selected = DASDController::selected[k]:false Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=67405&r1=67404&r2=67405&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "DASDController"; textdomain "s390"; @@ -283,9 +281,7 @@ // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No s = sformat (_("Channel ID: %1, Format: %2, Use DIAG: %3"), - d["channel"]:"", - d["format"]:false ? _("Yes") : _("No"), - d["diag"]:false ? _("Yes") : _("No") + d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) ); return s; }); @@ -695,5 +691,4 @@ return mergestring (l, ", "); } -/* EOF */ } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.ycp?rev=67405&r1=67404&r2=67405&view=diff ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "ZFCPController"; textdomain "s390"; @@ -503,7 +501,4 @@ return runCommand(sformat("zfcp_san_disc -b '%1' -p '%2' -L", busid, wwpn)); } - - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org