Fixed UTF-8 copyright on about dialog.

2 files changed, 22 insertions, 2 deletions

diff --git a/engine/engine.py b/engine/engine.py
index b7a03ff..19fbcfe 100644
--- a/engine/engine.py
+++ b/engine/engine.py
@@ -22,7 +22,6 @@
 
 import os
 from os import environ, path
-from locale import getpreferredencoding
 import signal
 import sys
 import gobject
@@ -39,6 +38,11 @@ import jastring
 from segment import unichar_half_to_full
 
 try:
+    from locale import getpreferredencoding
+except:
+    pass
+
+try:
     from gtk import clipboard_get
 except ImportError:
     clipboard_get = lambda a : None
@@ -118,7 +122,10 @@ class Engine(ibus.EngineBase):
         self.__segment_mode = SEGMENT_DEFAULT
         self.__dict_mode = 0
         self.__prop_dict = {}
-        self.__is_utf8 = (getpreferredencoding().lower() == "utf-8")
+        try:
+            self.__is_utf8 = (getpreferredencoding().lower() == "utf-8")
+        except:
+            self.__is_utf8 = False
         self.__ibus_version = 0
 
 #        self.__lookup_table = ibus.LookupTable(page_size=9, round=True)
diff --git a/setup/main.py b/setup/main.py
index 8d5cfe5..965bb49 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -28,6 +28,11 @@ from gtk import glade
 from ibus import keysyms, modifier, Bus
 from gettext import dgettext, bindtextdomain
 
+try:
+    from locale import getpreferredencoding
+except:
+    pass
+
 from anthyprefs import AnthyPrefs
 
 
@@ -183,6 +188,14 @@ class AnthySetup(object):
         about_vbox = self.xml.get_widget("about_vbox")
 
         about_dialog.set_version(self.prefs.get_version())
+        try:
+            if getpreferredencoding().lower() == "utf-8":
+                copyright = about_dialog.get_copyright()
+                copyright = copyright.replace('(c)', '\xc2\xa9')
+                copyright = copyright.replace('-', '\xe2\x80\x93')
+                about_dialog.set_copyright(copyright)
+        except:
+            pass
         if icon_path != None:
             image = gtk.image_new_from_file(icon_path)
             about_dialog.set_logo(image.get_pixbuf())