| CODENOTIFIER | HelpYou are not signed inSign in |
Project: Trac
Revision: 7423
Author: cmlenz
Date: 30 Jul 2008 11:36:25
Diff at Trac: http://trac.edgewall.org/changeset/7423
Changes:Fix for `ngettext` conflict between the positional argument `num` and a keyword argument with the same name.
Files:| ... | ...@@ -666,7 +666,7 @@ | |
| 666 | 666 | cursor.execute("SELECT count(rev) FROM revision") |
| 667 | 667 | for cnt, in cursor: |
| 668 | 668 | printout(ngettext("%(num)s revision cached.", |
| 669 | "%(num)s revisions cached.", cnt, num=cnt)) | |
| 669 | "%(num)s revisions cached.", num=cnt)) | |
| 670 | 670 | printout(_("Done.")) |
| 671 | 671 | |
| 672 | 672 | ## Wiki |
| ... | ...@@ -32,7 +32,6 @@ | |
| 32 | 32 | retval = singular |
| 33 | 33 | else: |
| 34 | 34 | retval = plural |
| 35 | if kwargs: | |
| 36 | retval %= kwargs | |
| 37 | return retval | |
| 35 | kwargs.setdefault('num', num) | |
| 36 | return retval % kwargs | |
| 38 | 37 | ngettext = ngettext_noop |