# HG changeset patch # User Jack Schwartz # Date 1342466531 25200 # Node ID 7c3f9534843adba2645e2f457a772e4e219097ed # Parent aab21c0ff69607e7914b9f99c11404f5c983dc3d 7183989 "No proxy"/"Proxy"/"Aggregation Hubs" take 2 diff -r aab21c0ff696 -r 7c3f9534843a usr/src/cmd/system-config/support.py --- a/usr/src/cmd/system-config/support.py Fri Jul 13 08:15:59 2012 -0700 +++ b/usr/src/cmd/system-config/support.py Mon Jul 16 12:22:11 2012 -0700 @@ -40,7 +40,7 @@ from terminalui.edit_field import EditField, PasswordField from terminalui.list_item import ListItem from terminalui.window_area import WindowArea -from terminalui.i18n import textwidth +from terminalui.i18n import fit_text_truncate, textwidth _LOGGER = None @@ -460,7 +460,7 @@ CHOICES = [ (SupportInfo.DIRECT, _("No proxy"), - _("Use system Internet connection parameters.")), + _("Use system Internet connection parameters")), (SupportInfo.PROXY, _("Proxy"), _("Enter proxy information on the next screen")), @@ -549,7 +549,8 @@ for choice in SupportNetConfigScreen.CHOICES: self.window_area.y_loc = y_loc key, title, text = choice - line = title.ljust(self.max_title_len + 2) + text + line = fit_text_truncate(title, self.max_title_len + 2, + just="left") + text self.window_area.columns = min(textwidth(line) + 1, full_field_width) widget = ListItem(self.window_area, window=self.center_win,