diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-31 18:48:33 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-31 18:48:33 +0200 |
| commit | 987d4bee715b9db6ae5806a1e4c4b76866ad6bd2 (patch) | |
| tree | 437d9ad9171a8b229e503bb3f37960da2a83c683 /DistUpgrade | |
| parent | 62806485669349fad90095bbb5826fb42e411ad2 (diff) | |
| download | python-apt-987d4bee715b9db6ae5806a1e4c4b76866ad6bd2.tar.gz | |
* DistUpgrade/Changelog:
- updated
* DistUpgrade/DistUpgradeViewGtk.py:
- ngetext fixed
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 4 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index a9786895..64b0a0b2 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,5 +1,9 @@ 2006-05-30: - fix bug in the free space calculation (#47092) + - updated ReleaseAnnouncement + - updated translations + - fix a missing bindtextdomain + - fix a incorrect ngettext usage 2006-05-24: - if the initial "update()" fails, just exit, don't try to restore the old sources.list (nothing was modified yet) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index e94198bc..43889793 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -298,7 +298,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): def __init__(self): # FIXME: i18n must be somewhere relative do this dir bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) - + gettext.textdomain("update-manager") + icons = gtk.icon_theme_get_default() gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) SimpleGladeApp.__init__(self, "DistUpgrade.glade", @@ -443,22 +444,20 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): msg = "" if pkgs_remove > 0: - msg += gettext.ngettext("%s package is going to be removed." %\ - pkgs_remove, - "%s packages are going to be removed." %\ - pkgs_remove, pkgs_remove) + msg += gettext.ngettext("%s package is going to be removed.", + "%s packages are going to be removed.", + pkgs_remove)% pkgs_remove msg += " " if pkgs_inst > 0: - msg += gettext.ngettext("%s new package is going to be "\ - "installed." % pkgs_inst, - "%s new packages are going to be "\ - "installed." % pkgs_inst, pkgs_inst) + msg += gettext.ngettext("%s new package is going to be " + "installed.", + "%s new packages are going to be " + "installed.",pkgs_inst) % pkgs_inst msg += " " if pkgs_upgrade > 0: - msg += gettext.ngettext("%s package is going to be upgraded." %\ - pkgs_upgrade, - "%s packages are going to be upgraded." %\ - pkgs_upgrade, pkgs_upgrade) + msg += gettext.ngettext("%s package is going to be upgraded.", + "%s packages are going to be upgraded.", + pkgs_upgrade) % pkgs_upgrade msg +=" " if downloadSize > 0: |