[gnue] r7552 - trunk/gnue-common/src/datasources

[johannes]

Author: johannes
Date: 2005-05-23 01:53:02 -0500 (Mon, 23 May 2005)
New Revision: 7552

Modified:
   trunk/gnue-common/src/datasources/GLoginHandler.py
Log:
Added output-conversion, removed double colons


Modified: trunk/gnue-common/src/datasources/GLoginHandler.py
===================================================================
--- trunk/gnue-common/src/datasources/GLoginHandler.py  2005-05-20 08:54:33 UTC 
(rev 7551)
+++ trunk/gnue-common/src/datasources/GLoginHandler.py  2005-05-23 06:53:02 UTC 
(rev 7552)
@@ -24,7 +24,6 @@
 import getpass
 
 from gnue.common.apps import errors
-from gnue.common.apps import i18n
 
 
 # =============================================================================
@@ -193,25 +192,25 @@
 
     if not self.__silent:
       print "*" * 60
-      print title
+      print o(title)
       print
 
     try:
       for (label, name, ftype, default, master, elements) in fields:
         if ftype in ['label', 'warning']:
           if not self.__silent:
-            print "  %s" % label
+            print "  %s" % o(label)
 
         elif ftype in ['string', 'password']:
           if self.__useDefaults and default is not None:
             result [name] = default
           else:
             if ftype == 'password':
-              value = getpass.getpass ("  %s: " % 
label.encode(i18n.getencoding ()))
+              value = getpass.getpass ("  %s " % o(label))
             else:
               # raw_input print's it's argument to stderr, so we have to print
               # the label manually here since stderr might be redirected
-              print "  %s:" % label,
+              print "  %s" % o(label),
               value = raw_input ()
 
             result [name] = [value, default][value is None]
@@ -222,7 +221,7 @@
           if self.__useDefaults and default is not None:
             result [name] = default
           else:
-            print "  %s:" % label,
+            print "  %s" % o(label),
             result [name] = raw_input ()
 
     except KeyboardInterrupt: