Show UTF-8 copyright by default with GNOME suggestion.

3 files changed, 32 insertions, 19 deletions

diff --git a/data/symbol.t b/data/symbol.t
index a7e3c1b..0e0a0a1 100644
--- a/data/symbol.t
+++ b/data/symbol.t
@@ -22,6 +22,7 @@
 # This file was imported from im-dict-ja
 # im-dict-ja - Japanese word dictionary set for input method
 # http://github.com/fujiwarat/im-dict-ja
+あっとまーく #T35*500 ＠
 いちのじ #T35*500 ゝ
 いちのじ #T35*500 ゞ
 いちのじ #T35*500 ヽ
@@ -79,6 +80,12 @@
 おとめざ #T35*500 ♍
 おひつじざ #T35*500 ♈
 おんぷ #T35*500 ♪
+おんぷ #T35*500 𝄞
+おんぷ #T35*500 𝄢
+おんぷ #T35*500 𝄻
+おんぷ #T35*500 𝄼
+おんぷ #T35*500 𝄽
+おんぷ #T35*500 𝄾
 かっこ #T35*500 「
 かっこ #T35*500 」
 かっこ #T35*500 『
@@ -145,6 +152,15 @@
 かぶしきがいしゃ #T35*500 ㍿
 かぶしきがいしゃ #T35*500 ㈱
 かぶしきがいしゃ #T35*500 ㏍
+きごう #T35*500 ©
+きごう #T35*500 ®
+きごう #T35*500 ℗
+きごう #T35*500 ℠
+きごう #T35*500 ™
+きごう #T35*500 ⁈
+きごう #T35*500 ⁉
+きごう #T35*500 ⁇
+きごう #T35*500 ‼
 きゅうかな #T35*500 ゐ
 きゅうかな #T35*500 ヰ
 きゅうかな #T35*500 ヸ
@@ -196,18 +212,23 @@
 けいせん #T35*500 ー
 けいせん #T35*500 ︱
 こと #T35*500 ヿ
+こぴーらいと #T35*500 ©
+こぴーらいと #T35*500 ℗
 こめ #T35*500 ※
 さそりざ #T35*500 ♏
 さんかく #T35*500 ▲
 さんかく #T35*500 △
 さんかく #T35*500 ▼
 さんかく #T35*500 ▽
+さーびすまーく #T35*500 ℠
 しかく #T35*500 □
 しかく #T35*500 ■
 しかく #T35*500 ◇
 しかく #T35*500 ◆
 ししざ #T35*500 ♌
 しゃーぷ #T35*500 ♯
+しょうひょう #T35*500 ©
+しょうひょう #T35*500 ℗
 しょうりゃくもじ #T35*500 №
 しょうりゃくもじ #T35*500 ㏍
 しょうりゃくもじ #T35*500 ℡
@@ -253,6 +274,12 @@
 しょうりゃくもじ #T35*500 ㊘
 しょうりゃくもじ #T35*500 ㊞
 しょうりゃくもじ #T35*500 ㊙
+しょうりゃくもじ #T35*500 ＠
+しょうりゃくもじ #T35*500 ©
+しょうりゃくもじ #T35*500 ®
+しょうりゃくもじ #T35*500 ℗
+しょうりゃくもじ #T35*500 ℠
+しょうりゃくもじ #T35*500 ™
 しょうわ #T35*500 ㍼
 じす #T35*500 〄
 すうがく #T35*500 ＋
@@ -480,6 +507,7 @@
 とらんぷ #T35*500 ♣
 とらんぷ #T35*500 ♥
 とらんぷ #T35*500 ♦
+とれーどまーく #T35*500 ™
 とん #T35*500 ㌧
 ど #T35*500 ℃
 ど #T35*500 °
diff --git a/setup/main.py b/setup/main.py
index c792710..98486ad 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -28,11 +28,6 @@ import xml.dom.minidom
 import gettext
 from gettext import dgettext
 
-try:
-    from locale import getpreferredencoding
-except:
-    getpreferredencoding = None
-
 from gi.repository import GLib
 
 # set_prgname before importing other modules to show the name in warning
@@ -288,17 +283,7 @@ class AnthySetup(object):
     def __init_about_vbox(self, icon_path):
         about_dialog = self.__builder.get_object('about_dialog')
         about_vbox = self.__builder.get_object('about_vbox')
-
         about_dialog.set_version(self.prefs.get_version())
-        try:
-            if getpreferredencoding != None and \
-                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:
             if icon_path[0] == '/':
                 image = Gtk.Image.new_from_file(icon_path)
diff --git a/setup/setup.ui b/setup/setup.ui
index 7ce5e74..d9ec626 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -2798,10 +2798,10 @@
   </object>
   <object class="GtkAboutDialog" id="about_dialog">
     <property name="program-name">IBus-Anthy</property>
-    <property name="copyright">Copyright (c) 2007-2008 Peng Huang
-Copyright (c) 2009 Hideaki ABE
-Copyright (c) 2009-2013 Takao Fujiwara
-Copyright (c) 2007-2013 Red Hat, Inc.</property>
+    <property name="copyright">Copyright © 2007–2008 Peng Huang
+Copyright © 2009 Hideaki ABE
+Copyright © 2009–2013 Takao Fujiwara
+Copyright © 2007–2013 Red Hat, Inc.</property>
     <property name="comments" translatable="yes">The Anthy engine for the IBus input platform</property>
     <property name="license">GPL</property>
     <property name="website">http://code.google.com/p/ibus/</property>