Index: pykota/trunk/cgi-bin/printquota.cgi
===================================================================
--- pykota/trunk/cgi-bin/printquota.cgi (revision 3050)
+++ pykota/trunk/cgi-bin/printquota.cgi (revision 3055)
@@ -37,7 +37,6 @@
 from pykota.cgifuncs import getLanguagePreference, getCharsetPreference
 
-header = """Content-type: text/html
-
-<?xml version="1.0" encoding="%s"?>
+header = """Content-type: text/html;charset=%s
+
 <html>
   <head>
@@ -46,4 +45,5 @@
   </head>
   <body>
+    <!-- %s %s -->
     <p>
       <form action="printquota.cgi" method="POST">
@@ -97,5 +97,6 @@
         """Displays the administrative interface."""
         global header, footer
-        print header % (self.getCharset(), _("PyKota Reports"), \
+        print header % (self.charset, _("PyKota Reports"), \
+                        self.language, self.charset, \
                         self.config.getLogoLink(), \
                         self.config.getLogoURL(), version.__version__, \
@@ -287,6 +288,5 @@
             
 if __name__ == "__main__" :
-    os.environ["LC_ALL"] = getLanguagePreference()
-    admin = PyKotaReportGUI(lang=os.environ["LC_ALL"], charset=getCharsetPreference())
+    admin = PyKotaReportGUI(lang=getLanguagePreference(), charset=getCharsetPreference())
     admin.deferredInit()
     admin.form = cgi.FieldStorage()
Index: pykota/trunk/cgi-bin/pykotme.cgi
===================================================================
--- pykota/trunk/cgi-bin/pykotme.cgi (revision 2909)
+++ pykota/trunk/cgi-bin/pykotme.cgi (revision 3055)
@@ -37,7 +37,6 @@
     
 
-header = """Content-type: text/html
-
-<?xml version="1.0" encoding="%s"?>
+header = """Content-type: text/html;charset=%s
+
 <html>
   <head>
@@ -46,4 +45,5 @@
   </head>
   <body>
+    <!-- %s %s -->
     <p>
       <form action="pykotme.cgi" method="POST" enctype="multipart/form-data">
@@ -97,5 +97,6 @@
         """Displays the administrative interface."""
         global header, footer
-        print header % (self.getCharset(), _("PyKota Quotes"), \
+        print header % (self.charset, _("PyKota Quotes"), \
+                        self.language, self.charset, \
                         self.config.getLogoLink(), \
                         self.config.getLogoURL(), version.__version__, \
@@ -187,6 +188,5 @@
             
 if __name__ == "__main__" :
-    os.environ["LC_ALL"] = getLanguagePreference()
-    admin = PyKotMeGUI(lang=os.environ["LC_ALL"], charset=getCharsetPreference())
+    admin = PyKotMeGUI(lang=getLanguagePreference(), charset=getCharsetPreference())
     admin.deferredInit()
     admin.form = cgi.FieldStorage()
Index: pykota/trunk/cgi-bin/dumpykota.cgi
===================================================================
--- pykota/trunk/cgi-bin/dumpykota.cgi (revision 3032)
+++ pykota/trunk/cgi-bin/dumpykota.cgi (revision 3055)
@@ -35,7 +35,6 @@
 from pykota.cgifuncs import getLanguagePreference, getCharsetPreference
 
-header = """Content-type: text/html
-
-<?xml version="1.0" encoding="%s"?>
+header = """Content-type: text/html;charset=%s
+
 <html>
   <head>
@@ -70,4 +69,5 @@
   </head>
   <body>
+    <!-- %s %s -->
     <p>
       <form action="dumpykota.cgi" method="GET" name="mainform" onsubmit="return checkvalues()">
@@ -124,5 +124,6 @@
         """Displays the dumper interface."""
         global header, footer
-        print header % (self.getCharset(), _("PyKota Data Dumper"), \
+        print header % (self.charset, _("PyKota Data Dumper"), \
+                        self.language, self.charset, \
                         self.config.getLogoLink(), \
                         self.config.getLogoURL(), version.__version__, \
@@ -228,6 +229,5 @@
             
 if __name__ == "__main__" :
-    os.environ["LC_ALL"] = getLanguagePreference()
-    admin = PyKotaDumperGUI(lang=os.environ["LC_ALL"], charset=getCharsetPreference())
+    admin = PyKotaDumperGUI(lang=getLanguagePreference(), charset=getCharsetPreference())
     admin.deferredInit()
     admin.form = cgi.FieldStorage()
