Changeset 1856

Timestamp:

10/20/04 16:29:30 (20 years ago)

Author:

jalet

Message:

Now logs something when locale settings are incorrect.

Files:

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

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.135  2004/10/20 14:29:30  jalet
+# Now logs something when locale settings are incorrect.
+#
 # Revision 1.134  2004/10/20 08:12:27  jalet
 # Another fix for charset detection and Python2.3
@@ -535 +538 @@
         """Initializes the command line tool."""
         # locale stuff
+        defaultToCLocale = 0
         try :
             locale.setlocale(locale.LC_ALL, lang)
             gettext.install("pykota")
         except (locale.Error, IOError) :
+            locale.setlocale(locale.LC_ALL, "C")
+            defaultToCLocale = 1
             gettext.NullTranslations().install()
             
@@ -545 +551 @@
         # Else we use the current locale's one.
         # If nothing is set, we use ISO-8859-15 widely used in western Europe.
+        localecharset = None
         try :
-            # preferred method with Python 2.3 and up
-            localecharset = locale.getpreferredencoding()
-        except AttributeError :    
-            localecharset = locale.getlocale()[1]
             try :
-                localecharset = localecharset or locale.getdefaultlocale()[1]
-            except ValueError :    
-                pass        # Unknown locale, strange...
+                # preferred method with Python 2.3 and up
+                localecharset = locale.getpreferredencoding()
+            except AttributeError :    
+                localecharset = locale.getlocale()[1]
+                try :
+                    localecharset = localecharset or locale.getdefaultlocale()[1]
+                except ValueError :    
+                    pass        # Unknown locale, strange...
+        except locale.Error :            
+            pass
         self.charset = charset or os.environ.get("CHARSET") or localecharset or "ISO-8859-15"
     
@@ -576 +586 @@
         self.softwareJobSize = 0
         self.softwareJobPrice = 0.0
+        if defaultToCLocale :
+            self.printInfo("Incorrect locale settings. PyKota falls back to the 'C' locale.", "warn")
         self.logdebug("Charset in use : %s" % self.charset)