r6180 - in trunk/gnue-appserver/src: . classrep gcd gld

[johannes]

Author: johannes
Date: 2004-08-09 13:38:48 -0500 (Mon, 09 Aug 2004)
New Revision: 6180

Modified:
   trunk/gnue-appserver/src/classrep/Base.py
   trunk/gnue-appserver/src/classrep/Class.py
   trunk/gnue-appserver/src/classrep/Definition.py
   trunk/gnue-appserver/src/classrep/Module.py
   trunk/gnue-appserver/src/classrep/Procedure.py
   trunk/gnue-appserver/src/classrep/helpers.py
   trunk/gnue-appserver/src/gcd/gcd2sql.py
   trunk/gnue-appserver/src/geasAuthentication.py
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-appserver/src/gld/readgld.py
   trunk/gnue-appserver/src/labels.py
Log:
Fixed unicode- and translation issues


Modified: trunk/gnue-appserver/src/classrep/Base.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Base.py   2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/classrep/Base.py   2004-08-09 18:38:48 UTC (rev 
6180)
@@ -150,7 +150,7 @@
     single item given by @key.
     """
     raise ClassRepositoryError ( \
-           _("%s: _getSingleCondition() not implemented!") % self.table)
+           u_("%s: _getSingleCondition() not implemented!") % self.table)
 
 
   # ---------------------------------------------------------------------------
@@ -163,7 +163,7 @@
     @obj, which is a language interface object.
     """
     raise ClassRepositoryError ( \
-           _("%s: _getNewItem() not implemented!") % self.table)
+           u_("%s: _getNewItem() not implemented!") % self.table)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/classrep/Class.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Class.py  2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/classrep/Class.py  2004-08-09 18:38:48 UTC (rev 
6180)
@@ -38,7 +38,7 @@
   Referenced class not found in repository
   """
   def __init__ (self, classname):
-    msg = _("Class '%s' not found in class repository") % classname
+    msg = u_("Class '%s' not found in class repository") % classname
     ClassRepositoryError.__init__ (self, msg)
 
 

Modified: trunk/gnue-appserver/src/classrep/Definition.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Definition.py     2004-08-09 13:51:10 UTC 
(rev 6179)
+++ trunk/gnue-appserver/src/classrep/Definition.py     2004-08-09 18:38:48 UTC 
(rev 6180)
@@ -51,7 +51,7 @@
   def __init__ (self, filename):
     self.filename = filename
     if not os.path.isfile (filename):
-      raise ClassRepositoryError (_("Cannot find file '%s'") % filename)
+      raise ClassRepositoryError, u_("Cannot find file '%s'") % filename
 
     self.parser   = ConfigParser.ConfigParser ()
     self.parser.read (self.filename)
@@ -88,23 +88,22 @@
        self._properties [identifier] = data
 
       else:
-       raise InvalidDefinitionError ( \
-                _("Invalid identifier '%s'") % identifier)
+       raise InvalidDefinitionError, u_("Invalid identifier '%s'") % identifier
 
     # Make some basic integrity checks
     for klass in self._classes.keys ():
       (module, classname) = splitName (klass)
       if not self._modules.has_key (module):
-       raise InvalidDefinitionError (_("Module '%s' not found") % module)
+       raise InvalidDefinitionError (u_("Module '%s' not found") % module)
 
     for prop in self._properties.keys ():
       (klass, property) = string.split (prop, '.')
       if not self._classes.has_key (klass):
-       raise InvalidDefinitionError (_("Class '%s' not found") % klass)
+       raise InvalidDefinitionError (u_("Class '%s' not found") % klass)
 
       (module, item) = splitName (property)
       if not self._modules.has_key (module):
-       raise InvalidDefinitionError (_("Module '%s' not found") % module)
+       raise InvalidDefinitionError (u_("Module '%s' not found") % module)
 
   # ---------------------------------------------------------------------------
   # return a list of modules defined in the configuration file

Modified: trunk/gnue-appserver/src/classrep/Module.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Module.py 2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/classrep/Module.py 2004-08-09 18:38:48 UTC (rev 
6180)
@@ -34,7 +34,7 @@
   This exception is raised if a non-existend module was called
   """
   def __init__ (self, module):
-    msg = _("Module '%s' not found in class repository.") % module
+    msg = u_("Module '%s' not found in class repository.") % module
     ClassRepositoryError.__init__ (self, msg)
     
 

Modified: trunk/gnue-appserver/src/classrep/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Procedure.py      2004-08-09 13:51:10 UTC 
(rev 6179)
+++ trunk/gnue-appserver/src/classrep/Procedure.py      2004-08-09 18:38:48 UTC 
(rev 6180)
@@ -32,8 +32,8 @@
 
 class ProcedureNotFoundError (ClassRepositoryError):
   def __init__ (self, classname, procedure):
-    msg = _("Class '%(classname)s' has no procedure '%(procedure)s'") % \
-           { "classname": classname, "procedure": procedure }
+    msg = u_("Class '%(classname)s' has no procedure '%(procedure)s'") \
+          % { "classname": classname, "procedure": procedure }
     ClassRepositoryError.__init__ (self, msg)
 
 class ProcedureValidationError (ItemValidationError):

Modified: trunk/gnue-appserver/src/classrep/helpers.py
===================================================================
--- trunk/gnue-appserver/src/classrep/helpers.py        2004-08-09 13:51:10 UTC 
(rev 6179)
+++ trunk/gnue-appserver/src/classrep/helpers.py        2004-08-09 18:38:48 UTC 
(rev 6180)
@@ -77,7 +77,7 @@
   if typename == 'number':
     if scale is not None and scale:
       if length is None or not length:
-        raise TypeFormatError, u_("number without 'length'")
+        raise TypeFormatError, _("number without 'length'")
 
 
 # -----------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/gcd/gcd2sql.py
===================================================================
--- trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-08-09 18:38:48 UTC (rev 
6180)
@@ -115,7 +115,7 @@
         self._files.append (openResource (filename))
 
     except IOError:
-      self.handleStartupError (_("Unable to open input file %s.") % filename)
+      self.handleStartupError (u_("Unable to open input file %s.") % filename)
 
 
     if not self.OPTIONS ['connection']:

Modified: trunk/gnue-appserver/src/geasAuthentication.py
===================================================================
--- trunk/gnue-appserver/src/geasAuthentication.py      2004-08-09 13:51:10 UTC 
(rev 6179)
+++ trunk/gnue-appserver/src/geasAuthentication.py      2004-08-09 18:38:48 UTC 
(rev 6180)
@@ -160,7 +160,7 @@
     if 0:
       return 0 # = no access
 
-    print _("User '%s' logged in.") % user
+    print u_("User '%s' logged in.") % user
 
     return 1 # = has access
 

Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py   2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/geasRpcServer.py   2004-08-09 18:38:48 UTC (rev 
6180)
@@ -124,7 +124,7 @@
 
     if rpctype in ('xmlrpc','xmlrpc.pw_xmlrpc','xmlrpc.py_xmlrpc'):
       port = gConfig ("rpcport")
-      print _("Exporting our services via %(rpctype)s (port %(port)s) ...") % \
+      print u_("Exporting our services via %(rpctype)s (port %(port)s) ...") % 
\
                {"rpctype": rpctype, "port": port}
       params = {'port': int (port),
                 'allowed_hosts': gConfig ('allowed_hosts')}
@@ -156,7 +156,7 @@
 
   def htmlStatus (self):
     out = "<HTML><HEAD></HEAD><BODY>"
-    out += _("Status: %s Sessions opened") % self.sm._sessNo
+    out += u_("Status: %s Sessions opened") % self.sm._sessNo
     out += "</BODY></HTML>"
     return out
 

Modified: trunk/gnue-appserver/src/gld/readgld.py
===================================================================
--- trunk/gnue-appserver/src/gld/readgld.py     2004-08-09 13:51:10 UTC (rev 
6179)
+++ trunk/gnue-appserver/src/gld/readgld.py     2004-08-09 18:38:48 UTC (rev 
6180)
@@ -182,7 +182,7 @@
       self.classes    = {}
 
       for item in range (len (self._files)):
-        print _("Loading gld file '%s' ...") % self._args [item]
+        print o(u_("Loading gld file '%s' ...") % self._args [item])
 
         try:
           schema = GLParser.loadFile (self._files [item])

Modified: trunk/gnue-appserver/src/labels.py
===================================================================
--- trunk/gnue-appserver/src/labels.py  2004-08-09 13:51:10 UTC (rev 6179)
+++ trunk/gnue-appserver/src/labels.py  2004-08-09 18:38:48 UTC (rev 6180)
@@ -795,11 +795,11 @@
     self.code.append ('%s</layout>' % indent)
     self.code.append ('</form>')
 
-    #f = open ('gencode.gfd', 'w')
-    #for i in self.code:
-      #data = "%s\n" % i
-      #f.write (data.encode ('utf-8'))
-    #f.close ()
+    f = open ('gencode.gfd', 'w')
+    for i in self.code:
+      data = "%s\n" % i
+      f.write (data.encode ('utf-8'))
+    f.close ()
 
     return string.join (self.code, "\n")