From b9d06ce26ed8090f75f5864f60d9ae85f9118cad Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 17:16:25 +0100 Subject: Fixed the number of logging records and use i18n for it. --- debug_toolbar/panels/logger.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py index e894b50..816e718 100644 --- a/debug_toolbar/panels/logger.py +++ b/debug_toolbar/panels/logger.py @@ -4,15 +4,15 @@ try: import threading except ImportError: threading = None -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ungettext, ugettext_lazy as _ from debug_toolbar.panels import DebugPanel class LogCollector(object): def __init__(self): if threading is None: - raise NotImplementedError("threading module is not available, \ - the logging panel cannot be used without it") + raise NotImplementedError("threading module is not available, " + "the logging panel cannot be used without it") self.records = {} # a dictionary that maps threads to log records def add_record(self, record, thread=None): @@ -96,6 +96,10 @@ class LoggingPanel(DebugPanel): template = 'debug_toolbar/panels/logger.html' has_content = True + def __init__(self, *args, **kwargs): + super(LoggingPanel, self).__init__(*args, **kwargs) + self._records = {} + def process_request(self, request): collector.clear_records() @@ -105,6 +109,7 @@ class LoggingPanel(DebugPanel): def get_and_delete(self): records = collector.get_records() + self._records[threading.currentThread()] = records collector.clear_records() return records @@ -112,8 +117,10 @@ class LoggingPanel(DebugPanel): return _("Logging") def nav_subtitle(self): - # FIXME l10n: use ngettext - return "%s message%s" % (len(collector.get_records()), (len(collector.get_records()) == 1) and '' or 's') + records = self._records[threading.currentThread()] + record_count = len(records) + return ungettext('%(count)s message', '%(count)s messages', + record_count) % {'count': record_count} def title(self): return _('Log Messages') -- cgit v1.2.3 From d1b5f1d67d56adc0858c6954df794fb988e5c103 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 17:17:22 +0100 Subject: Use i18n for the cache and SQL panels. --- debug_toolbar/locale/en/LC_MESSAGES/django.mo | Bin 367 -> 378 bytes debug_toolbar/locale/en/LC_MESSAGES/django.po | 169 ++++++++++++++++---------- debug_toolbar/panels/cache.py | 11 +- debug_toolbar/panels/sql.py | 8 +- 4 files changed, 117 insertions(+), 71 deletions(-) diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.mo b/debug_toolbar/locale/en/LC_MESSAGES/django.mo index 5ffd385..ccc04a2 100644 Binary files a/debug_toolbar/locale/en/LC_MESSAGES/django.mo and b/debug_toolbar/locale/en/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.po b/debug_toolbar/locale/en/LC_MESSAGES/django.po index eaefdc6..a1c0b2e 100644 --- a/debug_toolbar/locale/en/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/en/LC_MESSAGES/django.po @@ -7,36 +7,54 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-18 08:06-0800\n" +"POT-Creation-Date: 2012-03-05 17:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: panels/cache.py:92 -#, python-format -msgid "Cache: %.2fms" +msgid "Cache" msgstr "" -#: panels/cache.py:95 +#: panels/cache.py:96 +#, python-format +msgid "%(cache_calls)d call in %(time).2fms" +msgid_plural "%(cache_calls)d calls in %(time).2fms" +msgstr[0] "" +msgstr[1] "" + +#: panels/cache.py:102 msgid "Cache Usage" msgstr "" -#: panels/headers.py:36 panels/headers.py:39 +#: panels/headers.py:37 panels/headers.py:40 msgid "HTTP Headers" msgstr "" -#: panels/logger.py:56 +#: panels/logger.py:117 msgid "Logging" msgstr "" -#: panels/logger.py:63 +#: panels/logger.py:122 +#, python-format +msgid "%(count)s message" +msgid_plural "%(count)s messages" +msgstr[0] "" +msgstr[1] "" + +#: panels/logger.py:126 msgid "Log Messages" msgstr "" -#: panels/request_vars.py:13 panels/request_vars.py:16 +#: panels/profiling.py:149 panels/profiling.py:155 +msgid "Profiling" +msgstr "" + +#: panels/request_vars.py:22 panels/request_vars.py:25 msgid "Request Vars" msgstr "" @@ -49,82 +67,77 @@ msgstr "" msgid "Settings from %s" msgstr "" -#: panels/signals.py:39 panels/signals.py:42 +#: panels/signals.py:40 panels/signals.py:54 msgid "Signals" msgstr "" -#: panels/sql.py:146 +#: panels/sql.py:121 msgid "SQL" msgstr "" -#: panels/sql.py:160 -msgid "SQL Queries" -msgstr "" - -#: panels/template.py:47 +#: panels/template.py:102 msgid "Templates" msgstr "" -#: panels/template.py:52 +#: panels/template.py:106 #, python-format msgid "Templates (%(num_templates)s rendered)" msgstr "" -#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: panels/timer.py:56 templates/debug_toolbar/panels/cache.html:39 #: templates/debug_toolbar/panels/logger.html:7 -#: templates/debug_toolbar/panels/sql.html:5 #: templates/debug_toolbar/panels/sql_explain.html:11 #: templates/debug_toolbar/panels/sql_profile.html:12 #: templates/debug_toolbar/panels/sql_select.html:11 msgid "Time" msgstr "" -#: panels/timer.py:47 +#: panels/timer.py:70 msgid "Resource Usage" msgstr "" -#: panels/timer.py:78 +#: panels/timer.py:83 msgid "User CPU time" msgstr "" -#: panels/timer.py:79 +#: panels/timer.py:84 msgid "System CPU time" msgstr "" -#: panels/timer.py:80 +#: panels/timer.py:85 msgid "Total CPU time" msgstr "" -#: panels/timer.py:81 +#: panels/timer.py:86 msgid "Elapsed time" msgstr "" -#: panels/timer.py:82 +#: panels/timer.py:87 msgid "Context switches" msgstr "" -#: panels/version.py:20 panels/version.py:29 +#: panels/version.py:19 panels/version.py:28 msgid "Versions" msgstr "" -#: templates/debug_toolbar/base.html:23 +#: templates/debug_toolbar/base.html:11 msgid "Hide Toolbar" msgstr "" -#: templates/debug_toolbar/base.html:23 +#: templates/debug_toolbar/base.html:11 msgid "Hide" msgstr "" -#: templates/debug_toolbar/base.html:48 +#: templates/debug_toolbar/base.html:36 msgid "Show Toolbar" msgstr "" -#: templates/debug_toolbar/base.html:54 +#: templates/debug_toolbar/base.html:42 msgid "Close" msgstr "" #: templates/debug_toolbar/redirect.html:7 -#: templates/debug_toolbar/panels/logger.html:9 +#: templates/debug_toolbar/panels/logger.html:10 msgid "Location" msgstr "" @@ -174,10 +187,10 @@ msgid "Key" msgstr "" #: templates/debug_toolbar/panels/headers.html:6 -#: templates/debug_toolbar/panels/request_vars.html:37 -#: templates/debug_toolbar/panels/request_vars.html:63 -#: templates/debug_toolbar/panels/request_vars.html:85 -#: templates/debug_toolbar/panels/request_vars.html:107 +#: templates/debug_toolbar/panels/request_vars.html:39 +#: templates/debug_toolbar/panels/request_vars.html:65 +#: templates/debug_toolbar/panels/request_vars.html:87 +#: templates/debug_toolbar/panels/request_vars.html:109 #: templates/debug_toolbar/panels/settings_vars.html:6 #: templates/debug_toolbar/panels/timer.html:10 msgid "Value" @@ -188,13 +201,38 @@ msgid "Level" msgstr "" #: templates/debug_toolbar/panels/logger.html:8 +msgid "Channel" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:9 msgid "Message" msgstr "" -#: templates/debug_toolbar/panels/logger.html:24 +#: templates/debug_toolbar/panels/logger.html:26 msgid "No messages logged" msgstr "" +#: templates/debug_toolbar/panels/profiling.html:6 +msgid "Call" +msgstr "" + +#: templates/debug_toolbar/panels/profiling.html:7 +msgid "CumTime" +msgstr "" + +#: templates/debug_toolbar/panels/profiling.html:8 +#: templates/debug_toolbar/panels/profiling.html:10 +msgid "Per" +msgstr "" + +#: templates/debug_toolbar/panels/profiling.html:9 +msgid "TotTime" +msgstr "" + +#: templates/debug_toolbar/panels/profiling.html:11 +msgid "Count" +msgstr "" + #: templates/debug_toolbar/panels/request_vars.html:3 msgid "View information" msgstr "" @@ -211,42 +249,42 @@ msgstr "" msgid "kwargs" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:27 +#: templates/debug_toolbar/panels/request_vars.html:29 msgid "COOKIES Variables" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:36 -#: templates/debug_toolbar/panels/request_vars.html:62 -#: templates/debug_toolbar/panels/request_vars.html:84 -#: templates/debug_toolbar/panels/request_vars.html:106 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:64 +#: templates/debug_toolbar/panels/request_vars.html:86 +#: templates/debug_toolbar/panels/request_vars.html:108 msgid "Variable" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:50 +#: templates/debug_toolbar/panels/request_vars.html:52 msgid "No COOKIE data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:53 +#: templates/debug_toolbar/panels/request_vars.html:55 msgid "SESSION Variables" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:76 +#: templates/debug_toolbar/panels/request_vars.html:78 msgid "No SESSION data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:79 +#: templates/debug_toolbar/panels/request_vars.html:81 msgid "GET Variables" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:98 +#: templates/debug_toolbar/panels/request_vars.html:100 msgid "No GET data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:101 +#: templates/debug_toolbar/panels/request_vars.html:103 msgid "POST Variables" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:120 +#: templates/debug_toolbar/panels/request_vars.html:122 msgid "No POST data" msgstr "" @@ -266,28 +304,27 @@ msgstr "" msgid "Receivers" msgstr "" -#: templates/debug_toolbar/panels/sql.html:6 -msgid "Action" -msgstr "" - -#: templates/debug_toolbar/panels/sql.html:7 -msgid "Stacktrace" -msgstr "" - #: templates/debug_toolbar/panels/sql.html:8 +#, python-format +msgid "%(num)s query" +msgid_plural "%(num)s queries" +msgstr[0] "" +msgstr[1] "" + +#: templates/debug_toolbar/panels/sql.html:19 msgid "Query" msgstr "" -#: templates/debug_toolbar/panels/sql.html:38 -msgid "Line" +#: templates/debug_toolbar/panels/sql.html:20 +msgid "Timeline" msgstr "" -#: templates/debug_toolbar/panels/sql.html:39 -msgid "Method" +#: templates/debug_toolbar/panels/sql.html:21 +msgid "Time (ms)" msgstr "" -#: templates/debug_toolbar/panels/sql.html:40 -msgid "File" +#: templates/debug_toolbar/panels/sql.html:22 +msgid "Action" msgstr "" #: templates/debug_toolbar/panels/sql_explain.html:3 @@ -307,11 +344,17 @@ msgstr "" msgid "Executed SQL" msgstr "" +#: templates/debug_toolbar/panels/sql_explain.html:13 +#: templates/debug_toolbar/panels/sql_profile.html:14 +#: templates/debug_toolbar/panels/sql_select.html:13 +msgid "Database" +msgstr "" + #: templates/debug_toolbar/panels/sql_profile.html:4 msgid "SQL Profiled" msgstr "" -#: templates/debug_toolbar/panels/sql_profile.html:35 +#: templates/debug_toolbar/panels/sql_profile.html:37 msgid "Error" msgstr "" @@ -319,7 +362,7 @@ msgstr "" msgid "SQL Selected" msgstr "" -#: templates/debug_toolbar/panels/sql_select.html:34 +#: templates/debug_toolbar/panels/sql_select.html:36 msgid "Empty set" msgstr "" diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index ace343b..1656932 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -3,7 +3,7 @@ import inspect from django.core import cache from django.core.cache.backends.base import BaseCache -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, ungettext from debug_toolbar.panels import DebugPanel @@ -89,7 +89,14 @@ class CacheDebugPanel(DebugPanel): cache.cache = self.cache def nav_title(self): - return _('Cache: %.2fms') % self.cache.total_time + return _('Cache') + + def nav_subtitle(self): + cache_calls = len(self.cache.calls) + return ungettext('%(cache_calls)d call in %(time).2fms', + '%(cache_calls)d calls in %(time).2fms', + cache_calls) % {'cache_calls': cache_calls, + 'time': self.cache.total_time} def title(self): return _('Cache Usage') diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py index b05eefe..f4edcb3 100644 --- a/debug_toolbar/panels/sql.py +++ b/debug_toolbar/panels/sql.py @@ -121,12 +121,8 @@ class SQLDebugPanel(DebugPanel): return _('SQL') def nav_subtitle(self): - # TODO l10n: use ngettext - return "%d %s in %.2fms" % ( - self._num_queries, - (self._num_queries == 1) and 'query' or 'queries', - self._sql_time - ) + return __("%d query in %.2fms", "%d queries in %.2fms", + self._num_queries) % (self._num_queries, self._sql_time) def title(self): count = len(self._databases) -- cgit v1.2.3 From 91bccdf2fb678278f074ea2d4c04b2a32618a498 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 17:32:01 +0100 Subject: Updated German translation. --- debug_toolbar/locale/de/LC_MESSAGES/django.mo | Bin 1862 -> 4510 bytes debug_toolbar/locale/de/LC_MESSAGES/django.po | 274 +++++++++++++++----------- 2 files changed, 157 insertions(+), 117 deletions(-) diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.mo b/debug_toolbar/locale/de/LC_MESSAGES/django.mo index 87a276c..004caa6 100644 Binary files a/debug_toolbar/locale/de/LC_MESSAGES/django.mo and b/debug_toolbar/locale/de/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.po b/debug_toolbar/locale/de/LC_MESSAGES/django.po index f344a33..945722b 100644 --- a/debug_toolbar/locale/de/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/de/LC_MESSAGES/django.po @@ -8,39 +8,56 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-18 08:06-0800\n" +"POT-Creation-Date: 2012-03-05 17:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: panels/cache.py:92 +msgid "Cache" +msgstr "Cache" + +#: panels/cache.py:96 #, python-format -msgid "Cache: %.2fms" -msgstr "" +msgid "%(cache_calls)d call in %(time).2fms" +msgid_plural "%(cache_calls)d calls in %(time).2fms" +msgstr[0] "%(cache_calls)d Anfrage in %(time).2fms" +msgstr[1] "%(cache_calls)d Anfragen in %(time).2fms" -#: panels/cache.py:95 +#: panels/cache.py:102 msgid "Cache Usage" -msgstr "" +msgstr "Cache-Verbrauch" -#: panels/headers.py:36 panels/headers.py:39 +#: panels/headers.py:37 panels/headers.py:40 msgid "HTTP Headers" -msgstr "" +msgstr "HTTP-Header" -#: panels/logger.py:56 +#: panels/logger.py:117 msgid "Logging" msgstr "Logging" -#: panels/logger.py:63 -#, fuzzy +#: panels/logger.py:122 +#, python-format +msgid "%(count)s message" +msgid_plural "%(count)s messages" +msgstr[0] "%(count)s Nachricht" +msgstr[1] "%(count)s Nachrichten" + +#: panels/logger.py:126 msgid "Log Messages" -msgstr "Nachricht" +msgstr "Log-Nachrichten" -#: panels/request_vars.py:13 panels/request_vars.py:16 +#: panels/profiling.py:149 panels/profiling.py:155 +msgid "Profiling" +msgstr "Profiling" + +#: panels/request_vars.py:22 panels/request_vars.py:25 msgid "Request Vars" -msgstr "" +msgstr "Request-Variablen" #: panels/settings_vars.py:16 msgid "Settings" @@ -49,87 +66,79 @@ msgstr "Einstellungen" #: panels/settings_vars.py:19 #, python-format msgid "Settings from %s" -msgstr "" +msgstr "Einstellungen von %s" -#: panels/signals.py:39 panels/signals.py:42 +#: panels/signals.py:40 panels/signals.py:54 msgid "Signals" msgstr "Signals" -#: panels/sql.py:146 +#: panels/sql.py:121 msgid "SQL" -msgstr "" - -#: panels/sql.py:160 -msgid "SQL Queries" -msgstr "" +msgstr "SQL" -#: panels/template.py:47 +#: panels/template.py:102 msgid "Templates" msgstr "Templates" -#: panels/template.py:52 +#: panels/template.py:106 #, python-format msgid "Templates (%(num_templates)s rendered)" -msgstr "" +msgstr "Templates (%(num_templates)s gerendert)" -#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: panels/timer.py:56 templates/debug_toolbar/panels/cache.html:39 #: templates/debug_toolbar/panels/logger.html:7 -#: templates/debug_toolbar/panels/sql.html:5 #: templates/debug_toolbar/panels/sql_explain.html:11 #: templates/debug_toolbar/panels/sql_profile.html:12 #: templates/debug_toolbar/panels/sql_select.html:11 msgid "Time" msgstr "Zeit" -#: panels/timer.py:47 -#, fuzzy +#: panels/timer.py:70 msgid "Resource Usage" -msgstr "Ressource" +msgstr "Ressource-Verbrauch" -#: panels/timer.py:78 +#: panels/timer.py:83 msgid "User CPU time" -msgstr "" +msgstr "Benutzer CPU-Zeit" -#: panels/timer.py:79 +#: panels/timer.py:84 msgid "System CPU time" -msgstr "" +msgstr "System CPU-Zeit" -#: panels/timer.py:80 -#, fuzzy +#: panels/timer.py:85 msgid "Total CPU time" -msgstr "Zeit gesamt" +msgstr "CPU-Zeit gesamt" -#: panels/timer.py:81 +#: panels/timer.py:86 msgid "Elapsed time" -msgstr "" +msgstr "Zeit verstrichen" -#: panels/timer.py:82 +#: panels/timer.py:87 msgid "Context switches" -msgstr "" +msgstr "Kontextwechsel" -#: panels/version.py:20 panels/version.py:29 -#, fuzzy +#: panels/version.py:19 panels/version.py:28 msgid "Versions" -msgstr "Django-Version" +msgstr "Versionen" -#: templates/debug_toolbar/base.html:23 +#: templates/debug_toolbar/base.html:11 msgid "Hide Toolbar" -msgstr "" +msgstr "Toolbar ausblenden" -#: templates/debug_toolbar/base.html:23 +#: templates/debug_toolbar/base.html:11 msgid "Hide" -msgstr "Verbergen" +msgstr "Ausblenden" -#: templates/debug_toolbar/base.html:48 +#: templates/debug_toolbar/base.html:36 msgid "Show Toolbar" -msgstr "" +msgstr "Toolbar einblenden" -#: templates/debug_toolbar/base.html:54 +#: templates/debug_toolbar/base.html:42 msgid "Close" msgstr "Schließen" #: templates/debug_toolbar/redirect.html:7 -#: templates/debug_toolbar/panels/logger.html:9 +#: templates/debug_toolbar/panels/logger.html:10 msgid "Location" msgstr "Ort" @@ -156,11 +165,11 @@ msgstr "Aufrufe" #: templates/debug_toolbar/panels/cache.html:20 msgid "Misses" -msgstr "" +msgstr "Fehler" #: templates/debug_toolbar/panels/cache.html:35 msgid "Breakdown" -msgstr "" +msgstr "Zusammenfassung" #: templates/debug_toolbar/panels/cache.html:40 msgid "Type" @@ -179,10 +188,10 @@ msgid "Key" msgstr "Schlüssel" #: templates/debug_toolbar/panels/headers.html:6 -#: templates/debug_toolbar/panels/request_vars.html:37 -#: templates/debug_toolbar/panels/request_vars.html:63 -#: templates/debug_toolbar/panels/request_vars.html:85 -#: templates/debug_toolbar/panels/request_vars.html:107 +#: templates/debug_toolbar/panels/request_vars.html:39 +#: templates/debug_toolbar/panels/request_vars.html:65 +#: templates/debug_toolbar/panels/request_vars.html:87 +#: templates/debug_toolbar/panels/request_vars.html:109 #: templates/debug_toolbar/panels/settings_vars.html:6 #: templates/debug_toolbar/panels/timer.html:10 msgid "Value" @@ -193,70 +202,90 @@ msgid "Level" msgstr "Niveau" #: templates/debug_toolbar/panels/logger.html:8 +msgid "Channel" +msgstr "Channel" + +#: templates/debug_toolbar/panels/logger.html:9 msgid "Message" msgstr "Nachricht" -#: templates/debug_toolbar/panels/logger.html:24 +#: templates/debug_toolbar/panels/logger.html:26 msgid "No messages logged" msgstr "Keine Nachricht gespeichert" +#: templates/debug_toolbar/panels/profiling.html:6 +msgid "Call" +msgstr "Aufruf" + +#: templates/debug_toolbar/panels/profiling.html:7 +msgid "CumTime" +msgstr "Zeit einzeln" + +#: templates/debug_toolbar/panels/profiling.html:8 +#: templates/debug_toolbar/panels/profiling.html:10 +msgid "Per" +msgstr "Per" + +#: templates/debug_toolbar/panels/profiling.html:9 +msgid "TotTime" +msgstr "Zeit gesamt" + +#: templates/debug_toolbar/panels/profiling.html:11 +msgid "Count" +msgstr "Anzahl" + #: templates/debug_toolbar/panels/request_vars.html:3 msgid "View information" -msgstr "" +msgstr "Details anzeigen" #: templates/debug_toolbar/panels/request_vars.html:7 -#, fuzzy msgid "View Function" -msgstr "Funktion" +msgstr "Funktion anzeigen" #: templates/debug_toolbar/panels/request_vars.html:8 msgid "args" -msgstr "" +msgstr "args" #: templates/debug_toolbar/panels/request_vars.html:9 msgid "kwargs" -msgstr "" +msgstr "kwargs" -#: templates/debug_toolbar/panels/request_vars.html:27 -#, fuzzy +#: templates/debug_toolbar/panels/request_vars.html:29 msgid "COOKIES Variables" -msgstr "Variable" +msgstr "COOKIES Variablen" -#: templates/debug_toolbar/panels/request_vars.html:36 -#: templates/debug_toolbar/panels/request_vars.html:62 -#: templates/debug_toolbar/panels/request_vars.html:84 -#: templates/debug_toolbar/panels/request_vars.html:106 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:64 +#: templates/debug_toolbar/panels/request_vars.html:86 +#: templates/debug_toolbar/panels/request_vars.html:108 msgid "Variable" msgstr "Variable" -#: templates/debug_toolbar/panels/request_vars.html:50 +#: templates/debug_toolbar/panels/request_vars.html:52 msgid "No COOKIE data" msgstr "Keine COOKIE-Daten" -#: templates/debug_toolbar/panels/request_vars.html:53 -#, fuzzy +#: templates/debug_toolbar/panels/request_vars.html:55 msgid "SESSION Variables" -msgstr "Variable" +msgstr "SESSION Variablen" -#: templates/debug_toolbar/panels/request_vars.html:76 +#: templates/debug_toolbar/panels/request_vars.html:78 msgid "No SESSION data" msgstr "Keine SESSION-Daten" -#: templates/debug_toolbar/panels/request_vars.html:79 -#, fuzzy +#: templates/debug_toolbar/panels/request_vars.html:81 msgid "GET Variables" -msgstr "Variable" +msgstr "GET Variablen" -#: templates/debug_toolbar/panels/request_vars.html:98 +#: templates/debug_toolbar/panels/request_vars.html:100 msgid "No GET data" msgstr "Keine GET-Daten" -#: templates/debug_toolbar/panels/request_vars.html:101 -#, fuzzy +#: templates/debug_toolbar/panels/request_vars.html:103 msgid "POST Variables" -msgstr "Variable" +msgstr "POST Variablen" -#: templates/debug_toolbar/panels/request_vars.html:120 +#: templates/debug_toolbar/panels/request_vars.html:122 msgid "No POST data" msgstr "Keine POST-Daten" @@ -270,35 +299,34 @@ msgstr "Signal" #: templates/debug_toolbar/panels/signals.html:6 msgid "Providing Args" -msgstr "" +msgstr "Bereitgestellte Argumente" #: templates/debug_toolbar/panels/signals.html:7 msgid "Receivers" -msgstr "" - -#: templates/debug_toolbar/panels/sql.html:6 -msgid "Action" -msgstr "Aktion" - -#: templates/debug_toolbar/panels/sql.html:7 -msgid "Stacktrace" -msgstr "" +msgstr "Empfänger" #: templates/debug_toolbar/panels/sql.html:8 +#, python-format +msgid "%(num)s query" +msgid_plural "%(num)s queries" +msgstr[0] "%(num)s Anfrage" +msgstr[1] "%(num)s Anfragen" + +#: templates/debug_toolbar/panels/sql.html:19 msgid "Query" -msgstr "" +msgstr "Anfrage" -#: templates/debug_toolbar/panels/sql.html:38 -msgid "Line" -msgstr "Zeile" +#: templates/debug_toolbar/panels/sql.html:20 +msgid "Timeline" +msgstr "Verlauf" -#: templates/debug_toolbar/panels/sql.html:39 -msgid "Method" -msgstr "Methode" +#: templates/debug_toolbar/panels/sql.html:21 +msgid "Time (ms)" +msgstr "Zeit (ms)" -#: templates/debug_toolbar/panels/sql.html:40 -msgid "File" -msgstr "Datei" +#: templates/debug_toolbar/panels/sql.html:22 +msgid "Action" +msgstr "Aktion" #: templates/debug_toolbar/panels/sql_explain.html:3 #: templates/debug_toolbar/panels/sql_profile.html:3 @@ -309,7 +337,7 @@ msgstr "Zurück" #: templates/debug_toolbar/panels/sql_explain.html:4 msgid "SQL Explained" -msgstr "" +msgstr "SQL erklärt" #: templates/debug_toolbar/panels/sql_explain.html:9 #: templates/debug_toolbar/panels/sql_profile.html:10 @@ -317,31 +345,35 @@ msgstr "" msgid "Executed SQL" msgstr "Ausgeführtes SQL" +#: templates/debug_toolbar/panels/sql_explain.html:13 +#: templates/debug_toolbar/panels/sql_profile.html:14 +#: templates/debug_toolbar/panels/sql_select.html:13 +msgid "Database" +msgstr "Datenbank" + #: templates/debug_toolbar/panels/sql_profile.html:4 msgid "SQL Profiled" -msgstr "" +msgstr "SQL untersucht" -#: templates/debug_toolbar/panels/sql_profile.html:35 +#: templates/debug_toolbar/panels/sql_profile.html:37 msgid "Error" msgstr "Fehler" #: templates/debug_toolbar/panels/sql_select.html:4 msgid "SQL Selected" -msgstr "" +msgstr "SQL ausgewählt" -#: templates/debug_toolbar/panels/sql_select.html:34 +#: templates/debug_toolbar/panels/sql_select.html:36 msgid "Empty set" msgstr "Leeres Set" #: templates/debug_toolbar/panels/template_source.html:4 -#, fuzzy msgid "Template Source" -msgstr "Template" +msgstr "Template-Quelle" #: templates/debug_toolbar/panels/templates.html:2 -#, fuzzy msgid "Template path" -msgstr "Template" +msgstr "Template-Pfad" #: templates/debug_toolbar/panels/templates.html:13 msgid "Template" @@ -350,7 +382,7 @@ msgstr "Template" #: templates/debug_toolbar/panels/templates.html:21 #: templates/debug_toolbar/panels/templates.html:37 msgid "Toggle Context" -msgstr "" +msgstr "Context zeigen" #: templates/debug_toolbar/panels/templates.html:28 #: templates/debug_toolbar/panels/templates.html:43 @@ -359,7 +391,7 @@ msgstr "Nichts" #: templates/debug_toolbar/panels/templates.html:31 msgid "Context processor" -msgstr "" +msgstr "Context processor" #: templates/debug_toolbar/panels/timer.html:9 msgid "Resource" @@ -367,9 +399,17 @@ msgstr "Ressource" #: templates/debug_toolbar/panels/versions.html:6 msgid "Package" -msgstr "" +msgstr "Package" #: templates/debug_toolbar/panels/versions.html:7 -#, fuzzy msgid "Version" -msgstr "Django-Version" +msgstr "Version" + +#~ msgid "Line" +#~ msgstr "Zeile" + +#~ msgid "Method" +#~ msgstr "Methode" + +#~ msgid "File" +#~ msgstr "Datei" -- cgit v1.2.3 From 6f2df17d3600f2ef45c2b79140c14886569f326d Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 17:56:25 +0100 Subject: Added i18n to the Signals panel. --- debug_toolbar/locale/en/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes debug_toolbar/locale/en/LC_MESSAGES/django.po | 18 +++++++++++-- debug_toolbar/panels/signals.py | 28 ++++++++++++--------- .../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 index ccc04a2..17ac61c 100644 Binary files a/debug_toolbar/locale/en/LC_MESSAGES/django.mo and b/debug_toolbar/locale/en/LC_MESSAGES/django.mo differ 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 \n" "Language-Team: LANGUAGE \n" @@ -67,10 +67,24 @@ msgstr "" msgid "Settings from %s" 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 @@ - + -- cgit v1.2.3 From 3f2a3bd5486558df1438ad0034883caeeec3166e Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 17:56:50 +0100 Subject: Updated German translation again for the signals panel. --- debug_toolbar/locale/de/LC_MESSAGES/django.mo | Bin 4510 -> 4905 bytes debug_toolbar/locale/de/LC_MESSAGES/django.po | 26 ++++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.mo b/debug_toolbar/locale/de/LC_MESSAGES/django.mo index 004caa6..49efc94 100644 Binary files a/debug_toolbar/locale/de/LC_MESSAGES/django.mo and b/debug_toolbar/locale/de/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.po b/debug_toolbar/locale/de/LC_MESSAGES/django.po index 945722b..35998f8 100644 --- a/debug_toolbar/locale/de/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-05 17:24+0100\n" +"POT-Creation-Date: 2012-03-05 17:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,9 +68,23 @@ msgstr "Einstellungen" msgid "Settings from %s" msgstr "Einstellungen von %s" -#: panels/signals.py:40 panels/signals.py:54 +#: panels/signals.py:40 panels/signals.py:58 msgid "Signals" -msgstr "Signals" +msgstr "Signale" + +#: 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] "%(num_receivers)d Empfänger von 1 Signal" +msgstr[1] "%(num_receivers)d Empfänger von 1 Signal" + +#: 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] "%(num_receivers)d Empfänger von %(num_signals)d Signal" +msgstr[1] "%(num_receivers)d Empfänger von %(num_signals)d Signalen" #: panels/sql.py:121 msgid "SQL" @@ -185,7 +199,7 @@ msgstr "Funktion" #: templates/debug_toolbar/panels/headers.html:5 msgid "Key" -msgstr "Schlüssel" +msgstr "Name" #: templates/debug_toolbar/panels/headers.html:6 #: templates/debug_toolbar/panels/request_vars.html:39 @@ -199,7 +213,7 @@ msgstr "Wert" #: templates/debug_toolbar/panels/logger.html:6 msgid "Level" -msgstr "Niveau" +msgstr "Level" #: templates/debug_toolbar/panels/logger.html:8 msgid "Channel" @@ -299,7 +313,7 @@ msgstr "Signal" #: templates/debug_toolbar/panels/signals.html:6 msgid "Providing Args" -msgstr "Bereitgestellte Argumente" +msgstr "Argumente" #: templates/debug_toolbar/panels/signals.html:7 msgid "Receivers" -- cgit v1.2.3
{% trans "Signal" %}{% trans 'Signal' %} {% trans 'Providing Args' %} {% trans 'Receivers' %}