diff options
| -rw-r--r-- | debug_toolbar/locale/en/LC_MESSAGES/django.mo | bin | 378 -> 378 bytes | |||
| -rw-r--r-- | debug_toolbar/locale/en/LC_MESSAGES/django.po | 18 | ||||
| -rw-r--r-- | debug_toolbar/panels/signals.py | 28 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/panels/signals.html | 2 |
4 files changed, 33 insertions, 15 deletions
diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.mo b/debug_toolbar/locale/en/LC_MESSAGES/django.mo Binary files differindex ccc04a2..17ac61c 100644 --- a/debug_toolbar/locale/en/LC_MESSAGES/django.mo +++ b/debug_toolbar/locale/en/LC_MESSAGES/django.mo diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.po b/debug_toolbar/locale/en/LC_MESSAGES/django.po index a1c0b2e..bbb3487 100644 --- a/debug_toolbar/locale/en/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-05 17:21+0100\n" +"POT-Creation-Date: 2012-03-05 17:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -67,10 +67,24 @@ msgstr "" msgid "Settings from <code>%s</code>" msgstr "" -#: panels/signals.py:40 panels/signals.py:54 +#: panels/signals.py:40 panels/signals.py:58 msgid "Signals" msgstr "" +#: panels/signals.py:49 +#, python-format +msgid "%(num_receivers)d receiver of 1 signal" +msgid_plural "%(num_receivers)d receivers of 1 signal" +msgstr[0] "" +msgstr[1] "" + +#: panels/signals.py:52 +#, python-format +msgid "%(num_receivers)d receiver of %(num_signals)d signals" +msgid_plural "%(num_receivers)d receivers of %(num_signals)d signals" +msgstr[0] "" +msgstr[1] "" + #: panels/sql.py:121 msgid "SQL" msgstr "" diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index b7dbffe..2d38b1f 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -1,17 +1,17 @@ import sys from django.conf import settings -from django.core.signals import request_started, request_finished, \ - got_request_exception -from django.db.models.signals import class_prepared, pre_init, post_init, \ - pre_save, post_save, pre_delete, post_delete, post_syncdb +from django.core.signals import (request_started, request_finished, + got_request_exception) +from django.db.models.signals import (class_prepared, pre_init, post_init, + pre_save, post_save, pre_delete, post_delete, post_syncdb) from django.dispatch.dispatcher import WEAKREF_TYPES -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, ungettext try: from django.db.backends.signals import connection_created except ImportError: - connection_created = None + connection_created = None # noqa from debug_toolbar.panels import DebugPanel @@ -43,12 +43,16 @@ class SignalDebugPanel(DebugPanel): signals = self.get_stats()['signals'] num_receivers = sum(len(s[2]) for s in signals) num_signals = len(signals) - return '%d %s from %d %s' % ( - num_receivers, - (num_receivers == 1) and 'receiver' or 'receivers', - num_signals, - (num_signals == 1) and 'signal' or 'signals', - ) + # here we have to handle a double count translation, hence the + # hard coding of one signal + if num_signals == 1: + return ungettext('%(num_receivers)d receiver of 1 signal', + '%(num_receivers)d receivers of 1 signal', + num_receivers) % {'num_receivers': num_receivers} + return ungettext('%(num_receivers)d receiver of %(num_signals)d signals', + '%(num_receivers)d receivers of %(num_signals)d signals', + num_receivers) % {'num_receivers': num_receivers, + 'num_signals': num_signals} def title(self): return _("Signals") diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html index 75c1e22..96b863a 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/signals.html +++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html @@ -2,7 +2,7 @@ <table> <thead> <tr> - <th>{% trans "Signal" %}</th> + <th>{% trans 'Signal' %}</th> <th>{% trans 'Providing Args' %}</th> <th>{% trans 'Receivers' %}</th> </tr> |