diff --git a/extensions/sievefilters/views.py b/extensions/sievefilters/views.py
index f39fd0f83..9613e2d75 100644
--- a/extensions/sievefilters/views.py
+++ b/extensions/sievefilters/views.py
@@ -41,8 +41,8 @@ def index(request, tplname="sievefilters/index.html"):
@is_not_localadmin()
def get_templates(request, ftype):
if ftype == "condition":
- return ajax_simple_response(FilterForm.cond_templates)
- return ajax_simple_response(FilterForm.action_templates)
+ return ajax_simple_response(FilterForm([], [], request).cond_templates)
+ return ajax_simple_response(FilterForm([], [], request).action_templates)
@login_required
@is_not_localadmin()
diff --git a/extensions/stats/main.py b/extensions/stats/main.py
index 1a11ffa3a..645a4a412 100644
--- a/extensions/stats/main.py
+++ b/extensions/stats/main.py
@@ -8,7 +8,7 @@ sent, received, bounced, rejected
"""
from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_noop as _, ugettext
from django.conf.urls.defaults import *
from modoboa.lib import events, parameters
from modoboa.lib.webutils import static_url
@@ -17,7 +17,7 @@ def infos():
return {
"name" : "Statistics",
"version" : "1.0",
- "description" : _("Graphical statistics about emails traffic using RRDtool")
+ "description" : ugettext("Graphical statistics about emails traffic using RRDtool")
}
def init():
@@ -43,7 +43,7 @@ def menu(**kwargs):
if kwargs["target"] == "admin_menu_box":
return [
{"name" : "stats",
- "label" : _("Statistics"),
+ "label" : ugettext("Statistics"),
"url" : reverse('fullindex'),
"img" : static_url("pics/graph.png")}
]
diff --git a/extensions/stats/templates/stats/graphs.html b/extensions/stats/templates/stats/graphs.html
index 1c1aaa9b6..83a088259 100644
--- a/extensions/stats/templates/stats/graphs.html
+++ b/extensions/stats/templates/stats/graphs.html
@@ -3,7 +3,7 @@
{% trans "Custom period : from" %} {{ start }} {% trans "to" %} {{ end }}
{% endif %}
{% for elems in graphs %}
-
{{ elems.label }}
+
{% trans elems.label %}
{% endfor %}
diff --git a/extensions/stats/templates/stats/index.html b/extensions/stats/templates/stats/index.html
index 9929a0dd5..6e33f0f4f 100644
--- a/extensions/stats/templates/stats/index.html
+++ b/extensions/stats/templates/stats/index.html
@@ -99,7 +99,7 @@ window.addEvent("domready", function() {
- {% blocktrans count attachments|length as counter %}
- {{ counter }} file
- {% plural %}
- {{ counter }} files
- {% endblocktrans %}
+ {% blocktrans count attachments|length as counter %}{{ counter }} file{% plural %}{{ counter }} files{% endblocktrans %}
{{ short_att_list }}
diff --git a/lib/middleware.py b/lib/middleware.py
index 49f7c534c..61f11fc53 100644
--- a/lib/middleware.py
+++ b/lib/middleware.py
@@ -15,5 +15,3 @@ class ExtControlMiddleware(object):
if ext.enabled:
return None
raise Http404
-
-
diff --git a/lib/parameters.py b/lib/parameters.py
index a29986423..2e01e6d23 100644
--- a/lib/parameters.py
+++ b/lib/parameters.py
@@ -61,11 +61,19 @@ def __guess_extension():
return None
def register_admin(name, **kwargs):
- app = kwargs.has_key("app") and kwargs["app"] or __guess_extension()
+ if kwargs.has_key("app"):
+ app = kwargs["app"]
+ del kwargs["app"]
+ else:
+ app = __guess_extension()
return __register(app, 'A', name, **kwargs)
def register_user(name, **kwargs):
- app = kwargs.has_key("app") and kwargs["app"] or __guess_extension()
+ if kwargs.has_key("app"):
+ app = kwargs["app"]
+ del kwargs["app"]
+ else:
+ app = __guess_extension()
return __register(app, 'U', name, **kwargs)
def unregister_app(app):
diff --git a/lib/tables.py b/lib/tables.py
index cd5c06426..8b4aaf80e 100644
--- a/lib/tables.py
+++ b/lib/tables.py
@@ -28,7 +28,7 @@ class Column:
label = getattr(self, "label")
except KeyError:
label = getattr(self, "name")
- return label
+ return _(label)
class SelectionColumn(Column):
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 613995c20..2b635fc86 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Modoboa-0.8.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 09:53+0200\n"
+"POT-Creation-Date: 2011-09-14 14:11+0200\n"
"PO-Revision-Date: 2011-08-25 13:03+0100\n"
"Last-Translator: Patrick Ben Koetter