client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 49 ++++++++-
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 50 ++++------
2 files changed, 64 insertions(+), 35 deletions(-)
New commits:
commit 18f23c924e962b7e3a640d49fea8b1ecdc0f1876
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 8 13:25:35 2010 +0200
596237 - use constants in SendingWindow
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index b21b284..313dece 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -129,6 +129,9 @@ SEND_WINDOW_DESC = _("We are finished collecting information for
the System Prof
"You can run the registration program later by "
"typing `rhn_register` at the command line.")
+# Sending Window
+SENDING_WINDOW = _("Sending Profile to Red Hat Network")
+
# Finish Window
FINISH_WINDOW = _("Finish setting up software updates")
FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update' from this
system's "
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 5e208e1..cb64223 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -793,8 +793,7 @@ class SendingWindow:
self.name = "SendingWindow"
size = snack._snack.size()
- self.pwin = snack.GridForm(screen, _("Sending Profile to Red Hat
Network"),
- 1, 1)
+ self.pwin = snack.GridForm(screen, SENDING_WINDOW, 1, 1)
self.scale = snack.Scale(40, 100)
self.pwin.add(self.scale, 0, 0)
commit abd6b45fd407b3ada03bc440d92f76342c58632e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 8 13:22:35 2010 +0200
596237 - use constants in SendWindow
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index c32996b..b21b284 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -122,11 +122,12 @@ SYSTEM_ALREADY_REGISTERED = _("It appears this system has
already been set up fo
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
# Send Window
-SEND_WINDOW = _("We are finished collecting information for the System
Profile.\n\n"
- "Press \"Next\" to send this System Profile to
Red Hat Network. "
- "Click \"Cancel\" and no information will be
sent. "
- "You can run the registration program later by "
- "typing `rhn_register` at the command line.")
+SEND_WINDOW = _("Send Profile Information to Red Hat Network")
+SEND_WINDOW_DESC = _("We are finished collecting information for the System
Profile.\n\n"
+ "Press \"Next\" to send this System Profile to Red
Hat Network. "
+ "Click \"Cancel\" and no information will be sent.
"
+ "You can run the registration program later by "
+ "typing `rhn_register` at the command line.")
# Finish Window
FINISH_WINDOW = _("Finish setting up software updates")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 096256e..5e208e1 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -757,10 +757,9 @@ class SendWindow:
self.name = "SendWindow"
size = snack._snack.size()
- toplevel = snack.GridForm(screen, _("Send Profile Information to Red Hat
Network"),
- 1, 2)
+ toplevel = snack.GridForm(screen, SEND_WINDOW, 1, 2)
- text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW)
+ text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW_DESC)
toplevel.add(text, 0, 0)
# BUTTON BAR
commit 10ac58f27079f27b289be6be0d598029152f3508
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 8 13:19:18 2010 +0200
596237 - use constants in PackagesWindow
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 8fb8b7e..c32996b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -99,6 +99,17 @@ HARDWARE_WINDOW_DESC2 = _("Additional hardware information
including PCI"
HARDWARE_WINDOW_CHECKBOX = _("Include the following information about
hardware"
" and network:")
+# Packages Window
+PACKAGES_WINDOW = _("Register a System Profile - Packages")
+PACKAGES_WINDOW_DESC1 = _("RPM information is important to determine what"
+ " updated software packages are relevant to this"
+ " system.")
+PACKAGES_WINDOW_DESC2 = _("Include RPM packages installed on this system"
+ " in my System Profile")
+PACKAGES_WINDOW_UNCHECK = _("You may deselect individual packages by"
+ " unchecking them below.")
+PACKAGES_WINDOW_PKGLIST = _("Building Package List")
+
# Product Window
HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
"Hat Network (
http://rhn.redhat.com/):\n\n")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index a0d33e9..096256e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -676,20 +676,19 @@ class PackagesWindow:
self.screen = screen
self.tui = tui
size = snack._snack.size()
- toplevel = snack.GridForm(screen, _("Register a System Profile -
Packages"),
- 1, 5)
+ toplevel = snack.GridForm(screen, PACKAGES_WINDOW, 1, 5)
self.g = toplevel
- text = snack.TextboxReflowed(size[0]-10, _("RPM information is important to
determine what updated software packages are relevant to this system."))
+ text = snack.TextboxReflowed(size[0]-10, PACKAGES_WINDOW_DESC1)
toplevel.add(text, 0, 0, anchorLeft = 1)
- self.packagesButton = snack.Checkbox(_("Include RPM packages installed on
this system in my System Profile"), 1)
+ self.packagesButton = snack.Checkbox(PACKAGES_WINDOW_DESC2, 1)
toplevel.add(self.packagesButton, 0, 1, padding = (0, 1, 0, 1),
anchorLeft = 1)
- label = snack.Label(_("You may deselect individual packages by unchecking
them below."))
+ label = snack.Label(PACKAGES_WINDOW_UNCHECK)
toplevel.add(label, 0, 2, anchorLeft = 1)
#self.packageList = snack.Listbox(size[1]-18, 1, width = size[0]-10)
@@ -698,8 +697,7 @@ class PackagesWindow:
# do we need to read the packages from disk?
if tui.packageList == []:
- self.pwin = snack.GridForm(screen, _("Building Package List"),
- 1, 1)
+ self.pwin = snack.GridForm(screen, PACKAGES_WINDOW_PKGLIST, 1, 1)
self.scale = snack.Scale(40, 100)
self.pwin.add(self.scale, 0, 0)
commit 790678be341a0d43b69a10a7dbf85b98a91ec18b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 8 13:10:34 2010 +0200
596237 - use constants in HardwareWindow
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index aca761d..8fb8b7e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -87,6 +87,18 @@ CONFIRM_OS_ALL = _("Your system will be subscribed
to the base"
" software channel to receive all available"
" updates.")
+# Hardware Window
+HARDWARE_WINDOW = _("Register a System Profile - Hardware")
+HARDWARE_WINDOW_DESC1 = _("A Profile Name is a descriptive name that"
+ " you choose to identify this System Profile"
+ " on the Red Hat Network web pages. Optionally,"
+ " include a computer serial or identification
number.")
+HARDWARE_WINDOW_DESC2 = _("Additional hardware information including PCI"
+ " devices, disk sizes and mount points will be"
+ " included in the profile.")
+HARDWARE_WINDOW_CHECKBOX = _("Include the following information about
hardware"
+ " and network:")
+
# Product Window
HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
"Hat Network (
http://rhn.redhat.com/):\n\n")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index c34e313..a0d33e9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -564,10 +564,9 @@ class HardwareWindow:
# read all hardware in
tui.hardware = hardware.Hardware()
- toplevel = snack.GridForm(screen, _("Register a System Profile -
Hardware"),
- 1, 7)
+ toplevel = snack.GridForm(screen, HARDWARE_WINDOW, 1, 7)
- text = snack.TextboxReflowed(70, _("A Profile Name is a descriptive name
that you choose to identify this System Profile on the Red Hat Network web pages.
Optionally, include a computer serial or identification number."))
+ text = snack.TextboxReflowed(70, HARDWARE_WINDOW_DESCRIPTION)
toplevel.add(text, 0, 0, anchorLeft = 1)
@@ -582,9 +581,9 @@ class HardwareWindow:
toplevel.add(grid, 0, 1, anchorLeft = 1)
if tui.includeHardware:
- self.hardwareButton = snack.Checkbox(_("Include the following
information about hardware and network:"), isOn = 1)
+ self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX, isOn = 1)
else:
- self.hardwareButton = snack.Checkbox(_("Include the following
information about hardware and network:"))
+ self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX)
toplevel.add(self.hardwareButton, 0, 2, padding = (0, 1, 0, 0),
anchorLeft = 1)
@@ -640,7 +639,7 @@ class HardwareWindow:
tb = snack.TextboxReflowed(80, hardware_text)
toplevel.add(tb, 0, 4)
- self.additionalHWLabel = snack.TextboxReflowed(size[0]-10, _("Additional
hardware information including PCI devices, disk sizes and mount points will be included
in the profile."))
+ self.additionalHWLabel = snack.TextboxReflowed(size[0]-10,
HARDWARE_WINDOW_DESC2)
toplevel.add(self.additionalHWLabel, 0, 5, padding = (0, 1, 0, 0),
anchorLeft = 1)
commit a7e6566dfb5a723b56ee0b6229451a33f28fee41
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 8 12:59:04 2010 +0200
596237 - use constants in OSReleaseWindow & AlreadyRegisteredWindow
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 2edde34..aca761d 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -76,6 +76,17 @@ LOGIN_TIP = _("Tip: Forgot your login or password?
Contact your "
USER_REQUIRED = _("Please enter a desired login.")
PASSWORD_REQUIRED = _("Please enter and verify a password.")
+# OS Release Window
+SELECT_OSRELEASE = _("Select Operating System Release")
+OS_VERSION = _("Operating System version:")
+MINOR_RELEASE = _(" Minor Release: ")
+LIMITED_UPDATES = _("Limited Updates Only")
+ALL_UPDATES = _("All available updates")
+CONFIRM_OS_RELEASE_SELECTION = _("Confirm operating system release selection")
+CONFIRM_OS_ALL = _("Your system will be subscribed to the base"
+ " software channel to receive all available"
+ " updates.")
+
# Product Window
HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
"Hat Network (
http://rhn.redhat.com/):\n\n")
@@ -83,6 +94,7 @@ HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password?
"
"Visit:
https://rhn.redhat.com/rhn/sales/LoginInfo.do")
EMAIL = _("*Email Address:")
+SYSTEM_ALREADY_SETUP = _("System software updates already set up")
SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for
software updates:")
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 618cf52..c34e313 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -109,7 +109,7 @@ class AlreadyRegisteredWindow:
oldUsername = systemIdXml[0][0]['username']
oldsystemId = systemIdXml[0][0]['system_id']
- toplevel = snack.GridForm(self.screen, _("System software updates already
set up"), 1, 2)
+ toplevel = snack.GridForm(self.screen, SYSTEM_ALREADY_SETUP, 1, 2)
self.bb = snack.ButtonBar(self.screen,
[(YES_CONT, "next"),
(NO_CANCEL, "exit")])
@@ -430,14 +430,12 @@ class OSReleaseWindow:
self.selectChannel = False
- toplevel = snack.GridForm(self.screen,
- _("Select Operating System Release"), 1, 7)
+ toplevel = snack.GridForm(self.screen, SELECT_OSRELEASE, 1, 7)
self.g = toplevel
- self.ostext = snack.TextboxReflowed(self.size[0]-10,
- _("Operating System version:"))
+ self.ostext = snack.TextboxReflowed(self.size[0]-10, OS_VERSION)
toplevel.add(self.ostext, 0, 0, anchorLeft = 1)
- optiontext1 = _("Limited Updates Only")
+ optiontext1 = LIMITED_UPDATES
if self.tui.limited_updates_button:
self.limited_updates_button = snack.SingleRadioButton(optiontext1,
@@ -449,7 +447,7 @@ class OSReleaseWindow:
toplevel.add(self.limited_updates_button, 0, 1, padding = (0, 1, 0, 1),
anchorLeft = 1)
- self.sublabel = snack.Label(_(" Minor Release: "))
+ self.sublabel = snack.Label(MINOR_RELEASE)
toplevel.add(self.sublabel, 0, 2, anchorLeft = 1)
self.channelList = snack.Listbox(self.size[1]-22, 1,
@@ -464,7 +462,7 @@ class OSReleaseWindow:
self.tip = snack.TextboxReflowed(self.size[0]-10, CHANNEL_PAGE_TIP)
toplevel.add(self.tip, 0, 4, anchorLeft = 1)
- optiontext2 = _("All available updates")
+ optiontext2 = ALL_UPDATES
if self.tui.all_updates_button:
self.all_updates_button = snack.SingleRadioButton(optiontext2,
@@ -517,7 +515,7 @@ class OSReleaseWindow:
later_release = self.channelList.current() != \
self.available_channels['default_channel']
- title = _("Confirm operating system release selection")
+ title = CONFIRM_OS_RELEASE_SELECTION
if later_release:
msgbox = snack.ButtonChoiceWindow(self.screen, title,
CONFIRM_OS_WARNING % self.channelList.current(),
@@ -525,9 +523,6 @@ class OSReleaseWindow:
return msgbox
if self.all_updates_button.selected() or later_release:
- CONFIRM_OS_ALL = _("Your system will be subscribed to the base"
- " software channel to receive all available"
- " updates.")
msgbox = snack.ButtonChoiceWindow(self.screen, title,
CONFIRM_OS_ALL, buttons =[OK, CANCEL])
return msgbox