diff options
| author | Martin Sivak <msivak@redhat.com> | 2010-08-26 16:57:32 +0200 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2010-08-30 14:37:55 +0200 |
| commit | 3125442cbf151eaa9b7a843e9750eb6329ddf825 (patch) | |
| tree | 35dc9982cb123abed40cfda074ced9a5d5eb98aa | |
| parent | 9c70a5f7cf94e712429f2b319032b53908dfa006 (diff) | |
| download | firstaidkit-3125442cbf151eaa9b7a843e9750eb6329ddf825.tar.gz firstaidkit-3125442cbf151eaa9b7a843e9750eb6329ddf825.tar.xz firstaidkit-3125442cbf151eaa9b7a843e9750eb6329ddf825.zip | |
Fix the regular expression check and make Config buttons more clear
| -rw-r--r-- | frontend/gtk-list.xml | 4 | ||||
| -rw-r--r-- | pyfirstaidkit/reporting.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/frontend/gtk-list.xml b/frontend/gtk-list.xml index 427652f..0a71aee 100644 --- a/frontend/gtk-list.xml +++ b/frontend/gtk-list.xml @@ -66,7 +66,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="ok_button"> - <property name="label" translatable="yes">OK</property> + <property name="label" translatable="yes">Save and continue</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -81,7 +81,7 @@ </child> <child> <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">Cancel</property> + <property name="label" translatable="yes">Use defaults and continue</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/pyfirstaidkit/reporting.py b/pyfirstaidkit/reporting.py index 21a4b45..ea133a1 100644 --- a/pyfirstaidkit/reporting.py +++ b/pyfirstaidkit/reporting.py @@ -20,6 +20,7 @@ import logging import thread import weakref import re +import time from errors import * @@ -87,7 +88,7 @@ class ConfigQuestion(Question): self.title = title self.description = description self.items = map(lambda x: (x[0], x[1], x[2], x[3], - re.compile("^"+x[4]+"$"), x[5]), items) + re.compile("^("+x[4]+")$"), x[5]), items) class ChoiceQuestion(Question): """A question that offers multiple options. |