Changeset 3055 for pykota/trunk/pykota/tool.py

Timestamp:

11/12/06 17:16:49 (17 years ago)

Author:

jerome

Message:

Simplified i18n and l10n stuff by removing code used with Python<2.3 => not supported anymore.
Fixed it for working in CGI scripts as expected (better with Python 2.4 and higher).

Files:

• pykota/trunk/pykota/tool.py (modified) (4 diffs)

pykota/trunk/pykota/tool.py

@@ -130 +130 @@
         
         # locale stuff
-        self.defaultToCLocale = 0
-        try :
-            locale.setlocale(locale.LC_ALL, lang)
+        try :
+            locale.setlocale(locale.LC_ALL, (lang, charset))
         except (locale.Error, IOError) :
-            # locale.setlocale(locale.LC_ALL, "C")
-            self.defaultToCLocale = 1
-        try :
-            gettext.install("pykota")
+            locale.setlocale(locale.LC_ALL, None)
+        (self.language, self.charset) = locale.getlocale()
+        self.language = self.language or "C"
+        self.charset = self.charset or locale.getpreferredencoding()
+        
+        # translation stuff
+        try :
+            try :
+                trans = gettext.translation("pykota", languages=["%s.%s" % (self.language, self.charset)], codeset=self.charset)
+            except TypeError : # Python <2.4
+                trans = gettext.translation("pykota", languages=["%s.%s" % (self.language, self.charset)])
+            trans.install()
         except :
             gettext.NullTranslations().install()
-            
-        # Finds the correct charset
-        self.localecharset = sys.getfilesystemencoding()
-        if self.localecharset is None :
-            try :
-                try :
-                    self.localecharset = locale.getpreferredencoding()
-                except AttributeError :    
-                    try :
-                        self.localecharset = locale.getlocale()[1]
-                        self.localecharset = self.localecharset or locale.getdefaultlocale()[1]
-                    except ValueError :    
-                        pass        # Unknown locale, strange...
-            except locale.Error :            
-                pass
-        self.charset = charset or self.localecharset or "UTF-8"
     
         # pykota specific stuff
@@ -189 +180 @@
         self.softwareJobPrice = 0.0
         
-        if self.defaultToCLocale :
-            self.printInfo("Incorrect locale settings. PyKota falls back to the default locale.", "warn")
         if environHome :
             self.printInfo("PYKOTA_HOME environment variable is set. Configuration files were searched in %s" % confdir, "info")
@@ -197 +186 @@
                 self.printInfo("The 'pykota' system account is missing. Configuration files were searched in %s instead." % confdir, "warn")
         
-        self.logdebug("Charset detected from locale settings : %s" % self.localecharset)
+        self.logdebug("Language in use : %s" % self.language)
         self.logdebug("Charset in use : %s" % self.charset)
+        
         arguments = " ".join(['"%s"' % arg for arg in sys.argv])
         self.logdebug("Command line arguments : %s" % arguments)
@@ -237 +227 @@
                 self.logdebug(_("Regained priviledges. Now running as root."))
                 self.privdropped = 0
-        
-    def getCharset(self) :    
-        """Returns the charset in use."""
-        return self.charset
         
     def UTF8ToUserCharset(self, text) :