[meld] Update _() imports to use unicode-ifying meld.conf version (bgo#726116)

From: Kai Willadsen <kaiw src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Update _() imports to use unicode-ifying meld.conf version (bgo#726116)
Date: Sat, 15 Mar 2014 02:09:33 +0000 (UTC)
commit 4fb6538be7b56c51c3ca3d379b63220f1803294c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 15 12:06:09 2014 +1000

    Update _() imports to use unicode-ifying meld.conf version (bgo#726116)

 bin/meld                    |   10 ++++++----
 meld/conf.py                |    4 ++++
 meld/dirdiff.py             |    2 +-
 meld/filediff.py            |    2 +-
 meld/filemerge.py           |    3 +--
 meld/gutterrendererchunk.py |    4 ++--
 meld/meldapp.py             |    3 ++-
 meld/meldbuffer.py          |    2 +-
 meld/melddoc.py             |    2 +-
 meld/meldwindow.py          |    3 +--
 meld/misc.py                |    3 ++-
 meld/patchdialog.py         |    2 +-
 meld/preferences.py         |    3 +--
 meld/recent.py              |    3 +--
 meld/ui/findbar.py          |    2 +-
 meld/ui/notebooklabel.py    |    4 ++--
 meld/ui/vcdialogs.py        |    2 +-
 meld/vc/_vc.py              |    4 ++--
 meld/vc/git.py              |    2 +-
 meld/vcview.py              |    2 +-
 20 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 97553cd..2cc355d 100755
--- a/bin/meld
+++ b/bin/meld
@@ -69,18 +69,20 @@ if uninstalled:
 
 # TODO: Possibly move to elib.intl
 import gettext
-_ = gettext.gettext
 locale_domain = meld.conf.__package__
 locale_dir = meld.conf.LOCALEDIR
 
 gettext.bindtextdomain(locale_domain, locale_dir)
 locale.setlocale(locale.LC_ALL, '')
 gettext.textdomain(locale_domain)
+trans = gettext.translation(locale_domain, localedir=locale_dir, fallback=True)
 try:
-    gettext.install(locale_domain, localedir=locale_dir, unicode=True)
-except TypeError:
+    _ = meld.conf._ = trans.ugettext
+    meld.conf.ngettext = trans.ungettext
+except AttributeError:
     # py3k
-    gettext.install(locale_domain, localedir=locale_dir)
+    _ = meld.conf._ = trans.gettext
+    meld.conf.ngettext = trans.ngettext
 
 try:
     if os.name == 'nt':
diff --git a/meld/conf.py b/meld/conf.py
index ffeb90c..f6007be 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -9,6 +9,10 @@ DATADIR = os.path.join(sys.prefix, "share", "meld")
 LOCALEDIR = os.path.join(sys.prefix, "share", "locale")
 UNINSTALLED = False
 
+# Installed from main script
+_ = None
+ngettext = None
+
 
 def uninstalled():
     global DATADIR, LOCALEDIR, UNINSTALLED
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 8cc20dc..97a6b06 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -40,8 +40,8 @@ from .ui import emblemcellrenderer
 
 from collections import namedtuple
 from decimal import Decimal
-from gettext import gettext as _
 
+from meld.conf import _
 from meld.settings import meldsettings, settings
 
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 86675da..8a859f6 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -20,7 +20,6 @@ import copy
 import functools
 import io
 import os
-from gettext import gettext as _
 import time
 
 from multiprocessing import Pool
@@ -33,6 +32,7 @@ from gi.repository import Gio
 from gi.repository import Gdk
 from gi.repository import Gtk
 
+from meld.conf import _
 from . import diffutil
 from . import matchers
 from . import meldbuffer
diff --git a/meld/filemerge.py b/meld/filemerge.py
index 504161d..a1c27f4 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -14,8 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gettext import gettext as _
-
+from meld.conf import _
 from . import filediff
 from . import meldbuffer
 from . import merge
diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py
index ae3d5b4..8ae8575 100644
--- a/meld/gutterrendererchunk.py
+++ b/meld/gutterrendererchunk.py
@@ -13,11 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gettext import gettext as _
-
 from gi.repository import Gtk
 from gi.repository import GtkSource
 
+from meld.conf import _
+
 
 # FIXME: This is obviously beyond horrible
 line_height = 16
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 3bbe990..3b46580 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -19,7 +19,6 @@ from __future__ import print_function
 import optparse
 import os
 import StringIO
-from gettext import gettext as _
 
 from gi.repository import Gio
 from gi.repository import GLib
@@ -30,6 +29,8 @@ import meld.conf
 import meld.preferences
 import meld.ui.util
 
+from meld.conf import _
+
 
 class MeldApp(Gtk.Application):
 
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 8959877..119ac8a 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -17,13 +17,13 @@
 from __future__ import unicode_literals
 
 import sys
-from gettext import gettext as _
 
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import GtkSource
 
+from meld.conf import _
 from meld.util.compat import text_type
 
 
diff --git a/meld/melddoc.py b/meld/melddoc.py
index a852b2b..d052a55 100644
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 
 from . import task
 
-from gettext import gettext as _
+from meld.conf import _
 from meld.settings import settings
 
 log = logging.getLogger(__name__)
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index ed712a3..474bf67 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from gettext import gettext as _
 
 from gi.repository import Gdk
 from gi.repository import Gio
@@ -34,8 +33,8 @@ from .ui import gnomeglade
 from .ui import notebooklabel
 
 from .util.compat import string_types
+from meld.conf import _
 from meld.recent import recent_comparisons
-
 from meld.settings import interface_settings, settings
 
 
diff --git a/meld/misc.py b/meld/misc.py
index e5e3b5a..6d0aa27 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -19,7 +19,6 @@
 """
 
 import os
-from gettext import gettext as _
 import errno
 import shutil
 import re
@@ -28,6 +27,8 @@ import subprocess
 from gi.repository import GObject
 from gi.repository import Gtk
 
+from meld.conf import _
+
 
 if os.name != "nt":
     from select import select
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index 1ab1cd1..d6530a9 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import difflib
-from gettext import gettext as _
 import os
 
 from gi.repository import Gtk
@@ -23,6 +22,7 @@ from gi.repository import GtkSource
 
 from .ui import gnomeglade
 
+from meld.conf import _
 from meld.settings import meldsettings
 from .util.compat import text_type
 from meld.sourceview import LanguageManager
diff --git a/meld/preferences.py b/meld/preferences.py
index 28cc338..9866d6e 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -14,14 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gettext import gettext as _
-
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import GtkSource
 
+from meld.conf import _
 from meld.filters import FilterEntry
 from meld.settings import settings
 from meld.ui.gnomeglade import Component
diff --git a/meld/recent.py b/meld/recent.py
index b699111..2d28afa 100644
--- a/meld/recent.py
+++ b/meld/recent.py
@@ -33,14 +33,13 @@ import os
 import sys
 import tempfile
 
-from gettext import gettext as _
-
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import Gtk
 
 import meld.misc
 
+from meld.conf import _
 
 TYPE_FILE = "File"
 TYPE_FOLDER = "Folder"
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index b283ada..0012d9d 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -21,7 +21,7 @@ import re
 from meld import misc
 from . import gnomeglade
 
-from gettext import gettext as _
+from meld.conf import _
 
 
 class FindBar(gnomeglade.Component):
diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py
index 4582771..76efb7d 100644
--- a/meld/ui/notebooklabel.py
+++ b/meld/ui/notebooklabel.py
@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gettext import gettext as _
-
 from gi.repository import Gdk
 from gi.repository import Gio
 from gi.repository import Gtk
 from gi.repository import Pango
 
+from meld.conf import _
+
 
 class NotebookLabel(Gtk.HBox):
     __gtype_name__ = "NotebookLabel"
diff --git a/meld/ui/vcdialogs.py b/meld/ui/vcdialogs.py
index a3aeea2..9af26a7 100644
--- a/meld/ui/vcdialogs.py
+++ b/meld/ui/vcdialogs.py
@@ -18,13 +18,13 @@ from __future__ import print_function
 
 import os
 import textwrap
-from gettext import gettext as _
 
 from gi.repository import Gio
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Pango
 
+from meld.conf import _
 from meld.misc import commonprefix
 from meld.settings import meldsettings, settings
 from meld.ui.gnomeglade import Component
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index a370b27..be905c8 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -24,9 +24,9 @@
 
 import itertools
 import os
-import re
 import subprocess
-from gettext import gettext as _
+
+from meld.conf import _
 
 # ignored, new, normal, ignored changes,
 # error, placeholder, vc added
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 5db2063..d777a17 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -32,7 +32,7 @@ import shutil
 import subprocess
 import tempfile
 
-from gettext import gettext as _, ngettext
+from meld.conf import _, ngettext
 
 from . import _vc
 
diff --git a/meld/vcview.py b/meld/vcview.py
index 80ed4b4..8f8e0e8 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -22,7 +22,6 @@ import shutil
 import os
 import stat
 import sys
-from gettext import gettext as _
 
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -40,6 +39,7 @@ from .ui import emblemcellrenderer
 from .ui import gnomeglade
 from .ui import vcdialogs
 
+from meld.conf import _
 from meld.settings import settings
 from meld.vc import _null
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]