From f628ec24560dc1807115c92c143ff328d2a6bb3a Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 19 Jan 2010 18:51:48 +0100 Subject: [PATCH] Use ungettext instead of ngettext for unicode support. --- picard/tagger.py | 6 +++--- picard/ui/tageditor.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/picard/tagger.py b/picard/tagger.py index 78bdf4d8c..3750c8340 100644 --- a/picard/tagger.py +++ b/picard/tagger.py @@ -231,13 +231,13 @@ class Tagger(QtGui.QApplication): self.log.debug("Loading gettext translation, localedir=%r", localedir) self.translation = gettext.translation("picard", localedir) self.translation.install(True) - ngettext = self.translation.ngettext + ungettext = self.translation.ungettext except IOError: __builtin__.__dict__['_'] = lambda a: a - def ngettext(a, b, c): + def ungettext(a, b, c): if c == 1: return a else: return b - __builtin__.__dict__['ngettext'] = ngettext + __builtin__.__dict__['ungettext'] = ungettext def move_files_to_album(self, files, albumid=None, album=None): """Move `files` to tracks on album `albumid`.""" diff --git a/picard/ui/tageditor.py b/picard/ui/tageditor.py index a1a4ad2f2..f174b890c 100644 --- a/picard/ui/tageditor.py +++ b/picard/ui/tageditor.py @@ -68,7 +68,7 @@ class TagEditor(QtGui.QDialog): if total == 1: title += files[0].base_filename else: - title += ngettext("%d file", "%d files", total) % total + title += ungettext("%d file", "%d files", total) % total self.setWindowTitle(title) self.ui.buttonbox.addButton(StandardButton(StandardButton.OK), QtGui.QDialogButtonBox.AcceptRole) @@ -128,10 +128,10 @@ class TagEditor(QtGui.QDialog): item.setFont(1, font) missing = total - counts[name] if not missing: - value = ngettext("(different across %d file)", + value = ungettext("(different across %d file)", "(different across %d files)", total) % total else: - value = ngettext("(missing from %d file)", + value = ungettext("(missing from %d file)", "(missing from %d files)", missing) % missing item.setText(1, value) @@ -262,4 +262,4 @@ class TagEditor(QtGui.QDialog): text = '
'.join(map(lambda i: '%s
%s' % i, info)) self.ui.info.setText(text) else: - self.ui.info.setText(ngettext("%d file", "%d files", total) % total) + self.ui.info.setText(ungettext("%d file", "%d files", total) % total)