Merge lp:~kelemeng/software-properties/bug945245 into lp:software-properties

[Robert Roth]

I18n fixes proposed by Gabor Kelemen for bug #945245.

[Robert Roth (evfool)]

The fixes seem to be ok, and harmless.

review: Approve

[Timo Aaltonen (tjaalton)]

review: Approve

[Timo Aaltonen (tjaalton)]

needs a changelog entry though

=== modified file 'add-apt-repository'
--- add-apt-repository	2012-01-26 20:41:08 +0000
+++ add-apt-repository	2012-03-03 08:16:18 +0000
@@ -30,16 +30,23 @@
         lp = Launchpad.login_anonymously(lp_application_name, "production")
         try:
             user_inst = lp.people[user]
-            entity_name = "team" if user_inst.is_team else "user"
+            entity_name = _("team") if user_inst.is_team else _("user")
             if len(user_inst.ppas) > 0:
-                print _("The %s named '%s' has no PPA named '%s'" 
-                        %(entity_name, user, ppa_name))
+                # Translators: %(entity)s is either "team" or "user"
+                print _("The %(entity)s named '%(user)s' has no PPA named '%(ppa)s'") % {
+                        'entity' : entity_name, 
+                         'user' : user,
+                         'ppa' : ppa_name}
                 print _("Please choose from the following available PPAs:")
                 for ppa in user_inst.ppas:
-                    print _(" * '%s':  %s" %(ppa.name, ppa.displayname))
+                    print _(" * '%(name)s':  %(displayname)s") % {
+                            'name' : ppa.name,
+                            'displayname' : ppa.displayname}
             else:
-                print _("The %s named '%s' does not have any PPA"
-                        %(entity_name, user))
+                # Translators: %(entity)s is either "team" or "user"
+                print _("The %(entity)s named '%(user)s' does not have any PPA") % {
+                        'entity' : entity_name, 
+                         'user' : user}
         except KeyError:
             pass
     except ImportError:
@@ -63,6 +70,11 @@
         locale.setlocale(locale.LC_ALL, "")
     except:
         pass
+    gettext.textdomain("software-properties")
+    #FIXME: Workaround a bug in optparser which doesn't handle unicode/str
+    # correctly, see http://bugs.python.org/issue4391
+    # Shoudl be resolved by Python3
+    enc = locale.getpreferredencoding()
     usage = """Usage: %prog <sourceline>
 
 %prog is a script for adding apt sources.list entries. 
@@ -90,16 +102,16 @@
     #        puts the line into a specific file in sources.list.d
     parser.add_option ("-m", "--massive-debug", action="store_true",
         dest="massive_debug", default=False,
-        help="Print a lot of debug information to the command line")
+        help=_("Print a lot of debug information to the command line").decode(enc))
     parser.add_option("-r", "--remove", action="store_true",
         dest="remove", default=False,
-        help="remove repository from sources.list.d directory")
+        help=_("remove repository from sources.list.d directory").decode(enc))
     parser.add_option("-k", "--keyserver",
         dest="keyserver", default=DEFAULT_KEYSERVER,
-        help="URL of keyserver. Default: %default")
+        help=_("URL of keyserver. Default: %default").decode(enc))
     parser.add_option("-y", "--yes", action="store_true",
         dest="assume_yes", default=False,
-        help="Assume yes to all queries")
+        help=_("Assume yes to all queries").decode(enc))
     (options, args) = parser.parse_args()
 
     if os.geteuid() != 0:
@@ -126,7 +138,7 @@
         except HTTPError:
             print _("Cannot add PPA: '%s'.") % line
             if user.startswith("~"):
-                print _("Did you mean 'ppa:%s/%s' ?" %(user[1:], ppa_name))
+                print _("Did you mean 'ppa:%s/%s' ?") %(user[1:], ppa_name)
                 sys.exit(1) # Exit because the user cannot be correct
             # If the PPA does not exist, then try to find if the user/team 
             # exists. If it exists, list down the PPAs
@@ -167,14 +179,14 @@
         try:
             sp.remove_source(deb_entry)
         except ValueError:
-            print _("Error: '%s' doesn't exist in a sourcelist file" % deb_line)
+            print _("Error: '%s' doesn't exist in a sourcelist file") % deb_line
         try:
             sp.remove_source(debsrc_entry)
         except ValueError:
-            print _("Error: '%s' doesn't exist in a sourcelist file" % debsrc_line)
+            print _("Error: '%s' doesn't exist in a sourcelist file") % debsrc_line
 
     else:
         if not sp.add_source_from_line(line):
-            print _("Error: '%s' invalid" % line)
+            print _("Error: '%s' invalid") % line
             sys.exit(1)
         sp.sourceslist.save()