From 4d002b963405110fa5007dd666df38a4a70d65e7 Mon Sep 17 00:00:00 2001 From: David Paleino Date: Fri, 16 Dec 2011 21:47:07 +0100 Subject: [PATCH] Make the templating system more robust to custom fields --- curses/netentry_curses.py | 5 ++++- gtk/netentry.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index f0d832f..ef02a50 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -403,7 +403,10 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): for type_ in ['required', 'optional']: fields = methods[ID][type_] for field in fields: - edit = MaskingEdit(('editcp',language[field[1].lower().replace(' ','_')]+': ')) + try: + edit = MaskingEdit(('editcp',language[field[1].lower().replace(' ','_')]+': ')) + except KeyError: + edit = MaskingEdit(('editcp',field[1].replace(' ','_')+': ')) edit.set_mask_mode('no_focus') theList.append(edit) # Add the data to any array, so that the information diff --git a/gtk/netentry.py b/gtk/netentry.py index a63cbe5..9842bf1 100644 --- a/gtk/netentry.py +++ b/gtk/netentry.py @@ -536,7 +536,10 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): for type_ in ['required', 'optional']: fields = methods[ID][type_] for field in fields: - field_text = language[field[1].lower().replace(' ','_')] + try: + field_text = language[field[1].lower().replace(' ','_')] + except KeyError: + field_text = field[1].replace(' ','_') if field in methods[ID]['protected']: box = ProtectedLabelEntry(field_text)