Changeset 1791

Timestamp:

10/08/04 22:19:18 (20 years ago)

Author:

jalet

Message:

Added ugly workaround for strange locale problem

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.20alpha23 :
+    
+        - Add workaround for locale problem.
+        
     - 1.20alpha22 :
     

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.64  2004/10/08 20:19:18  jalet
+# Added ugly workaround for strange locale problem
+#
 # Revision 1.63  2004/10/07 21:14:28  jalet
 # Hopefully final fix for data encoding to and from the database
@@ -694 +697 @@
                 return unicode(text, "UTF-8").encode(self.tool.getCharset()) 
             except UnicodeError :    
-                pass
+                try :
+                    # Incorrect locale settings ?
+                    return unicode(text, "UTF-8").encode("ISO-8859-15") 
+                except UnicodeError :    
+                    pass
         return text
         
@@ -703 +710 @@
                 return unicode(text, self.tool.getCharset()).encode("UTF-8") 
             except UnicodeError :    
-                pass
+                try :
+                    # Incorrect locale settings ?
+                    return unicode(text, "ISO-8859-15").encode("UTF-8") 
+                except UnicodeError :    
+                    pass
         return text
         

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha22_unofficial"
+__version__ = "1.20alpha23_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""