Merge lp:~dobey/ubuntuone-client/ngettext-plurals into lp:ubuntuone-client

Proposed by dobey on 2009-10-12
Status: Merged
Approved by: Elliot Murphy on 2009-10-12
Approved revision: 248
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/ngettext-plurals
Merge into: lp:ubuntuone-client
Diff against target: 22 lines
1 file modified
bin/ubuntuone-client-applet (+4/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/ngettext-plurals
Reviewer Review Type Date Requested Status
Elliot Murphy (community) Approve on 2009-10-12
Stuart Langridge (community) 2009-10-12 Approve on 2009-10-12
Review via email: mp+13217@code.launchpad.net

Commit message

Use ngettext for the files updated notification

To post a comment you must log in.
Stuart Langridge (sil) wrote :

Looks fine to me.

review: Approve
Elliot Murphy (statik) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-client-applet'
2--- bin/ubuntuone-client-applet 2009-10-09 17:57:11 +0000
3+++ bin/ubuntuone-client-applet 2009-10-12 13:20:23 +0000
4@@ -50,6 +50,7 @@
5 DBusGMainLoop(set_as_default=True)
6
7 _ = gettext.gettext
8+P_ = gettext.ngettext
9
10 APPLET_BUS_NAME = "com.ubuntuone.ClientApplet"
11 APPLET_CONFIG_NAME = APPLET_BUS_NAME + ".Config"
12@@ -574,7 +575,9 @@
13 with self.__lock:
14 n = pynotify.Notification(
15 _("Updating Finished"),
16- _("Ubuntu One finished updating %(total)d files.") %
17+ P_("Ubuntu One finished updating %(total)d file.",
18+ "Ubuntu One finished updating %{total}d files.",
19+ self.__total) %
20 { 'total' : self.__total })
21 self.__total = 0
22 self.__updating = 0

Subscribers

People subscribed via source and target branches