Merge lp:~zyga/command-not-found/rework-locale-support into lp:~command-not-found-developers/command-not-found/trunk

[Zygmunt Krynicki]

See the bzr commit message for details

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2011-08-10 13:03:51 +0000
+++ CommandNotFound/CommandNotFound.py	2011-08-25 10:00:25 +0000
@@ -2,6 +2,7 @@
 # Licensed under GPL, see COPYING for the whole text
 
 import gdbm
+import gettext
 import grp
 import os
 import os.path
@@ -9,7 +10,7 @@
 import string
 import sys
 
-from CommandNotFound.util import gettext_wrapper as _
+_ = gettext.translation("command-not-found", fallback=True).ugettext
 
 
 class BinaryDatabase(object):

=== modified file 'CommandNotFound/util.py'
--- CommandNotFound/util.py	2011-08-10 12:50:58 +0000
+++ CommandNotFound/util.py	2011-08-25 10:00:25 +0000
@@ -1,42 +1,12 @@
 # (c) Zygmunt Krynicki 2008
 # Licensed under GPL, see COPYING for the whole text
 
+import gettext
+import locale
 import sys
 import gettext
 
-
-def no_gettext_for_you(message):
-    """This function is used instead of gettext when there are some locale problems"""
-    return message
-
-
-def gettext_not_crashy(s):
-    """ The getext handling is confusing:
-        - gettext.gettext caused LP: #161159
-        - getext.lgettext causes LP: #282446
-        Here we just try both :(
-    """
-    try:
-        return gettext.lgettext(s)
-    except UnicodeEncodeError:
-        return gettext.gettext(s)
-
-
-def setup_locale():
-    import locale
-    try:
-        locale.getpreferredencoding()
-        gettext.bindtextdomain("command-not-found", "/usr/share/locale")
-        gettext.textdomain("command-not-found")
-        gettext.install("command-not-found", unicode=True)
-        return gettext_not_crashy
-    except locale.Error:
-        #print "Warning: python was unable to setup locale!"
-        #print "Internationalizatio features will not be enabled."
-        return no_gettext_for_you
-
-
-_ = gettext_wrapper = setup_locale()
+_ = gettext.translation("command-not-found", fallback=True).ugettext
 
 
 def crash_guard(callback, bug_report_url, version):

=== modified file 'command-not-found'
--- command-not-found	2011-08-10 13:07:05 +0000
+++ command-not-found	2011-08-25 10:00:25 +0000
@@ -2,20 +2,47 @@
 # (c) Zygmunt Krynicki 2005, 2006, 2007, 2008
 # Licensed under GPL, see COPYING for the whole text
 
+from __future__ import absolute_import
+
+
 __version__ = "0.2.21"
 BUG_REPORT_URL = "https://bugs.launchpad.net/command-not-found/+filebug"
 
 try:
     import sys
-    import CommandNotFound
-    from CommandNotFound.util import crash_guard, gettext_wrapper as _
+    import gettext
+    from optparse import OptionParser
+
+    from CommandNotFound.util import crash_guard
     from CommandNotFound import CommandNotFound
-    from optparse import OptionParser
 except KeyboardInterrupt:
     sys.exit(127)
 
+
+def enable_i18n():
+    cnf = gettext.translation("command-not-found", fallback=True)
+    cnf.install(unicode=True)
+
+
+class LocaleOptionParser(OptionParser):
+    """
+    OptionParser is broken as its implementation of _get_encoding() uses
+    sys.getdefaultencoding() which is ascii, what it should be using is
+    locale.getpreferredencoding() which returns value based on LC_CTYPE (most
+    likely) and allows for UTF-8 encoding to be used.
+    """
+    def _get_encoding(self, file):
+        encoding = getattr(file, "encoding", None)
+        if not encoding:
+            encoding = locale.getpreferredencoding()
+        return encoding
+
+
 def main():
-    parser = OptionParser(version = __version__, usage=_("%prog [options] <command-name>"))
+    enable_i18n()
+    parser = LocaleOptionParser(
+        version=__version__,
+        usage=_("%prog [options] <command-name>"))
     parser.add_option('-d', '--data-dir', action='store',
                       default="/usr/share/command-not-found",
                       help=_("use this path to locate data fields"))