Merged r294 of experimental-nacl

curses/netentry_curses.py

@@ -26,9 +26,7 @@ from curses_misc import TextDialog,DynWrap,MaskingEdit,ComboBox,error
 import wicd.misc as misc
 from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool
 
-
-
-language = misc.get_language_list_gui()
+from wicd.translations import language
 
 daemon = None
 wired = None
@@ -56,9 +54,9 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
         use_global_dns_t = language['use_global_dns']
         dns_dom_t    = ('editcp',language['dns_domain']+':   ')
         search_dom_t = ('editcp',language['search_domain']+':')
-        dns1_t       = ('editcp',language['dns']+ ' ' + language['1']+':'+' '*8)
-        dns2_t       = ('editcp',language['dns']+ ' ' + language['2']+':'+' '*8)
-        dns3_t       = ('editcp',language['dns']+ ' ' + language['3']+':'+' '*8)
+        dns1_t       = ('editcp',language['dns']+ ' 1'+':'+' '*8)
+        dns2_t       = ('editcp',language['dns']+ ' 2'+':'+' '*8)
+        dns3_t       = ('editcp',language['dns']+ ' 3'+':'+' '*8)
 
         cancel_t = 'Cancel'
         ok_t = 'OK'

curses/prefs_curses.py

@@ -28,7 +28,7 @@ daemon = None
 wireless = None
 wired = None
 
-language = misc.get_language_list_gui()
+from wicd.translations import language
 
 class PrefsDialog(urwid.WidgetWrap):
     def __init__(self,body,pos,ui,dbus=None):

curses/wicd-curses.py

@@ -68,9 +68,10 @@ from optparse import OptionParser
 
 CURSES_REVNO=wpath.curses_revision
 
-language = misc.get_language_list_gui()
-# We need 'Connecting' without the '...'
-language['connecting']=misc.get_language_list_tray()['connecting']
+# Fix strings in wicd-curses
+from wicd.translations import language
+for i in language.keys():
+    language[i] = language[i].decode('utf8')
 
 ########################################
 ##### SUPPORT CLASSES
@@ -951,7 +952,6 @@ def main():
     # Import the screen based on whatever the user picked.
     # The raw_display will have some features that may be useful to users
     # later
-    parser.set_defaults(screen='raw')
     if options.screen == 'raw':
         import urwid.raw_display
         ui = urwid.raw_display.Screen()
@@ -1042,7 +1042,6 @@ setup_dbus()
 ########################################
 if __name__ == '__main__':
     parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello()))
-    # raw = True. curses = False
     parser.set_defaults(screen='raw')
     parser.add_option("-r", "--raw-screen",action="store_const",const='raw'
             ,dest='screen',help="use urwid's raw screen controller (default)")