diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py index a3c21e98e..2ff1d5906 100644 --- a/modoboa/extensions/postfix_autoreply/__init__.py +++ b/modoboa/extensions/postfix_autoreply/__init__.py @@ -58,11 +58,11 @@ def extra_routes(): @events.observe("ExtraUprefsJS") -def extra_js(): +def extra_js(user): return ["""function autoreply_cb() { $('#id_untildate').datepicker({format: 'yyyy-mm-dd', language: '%s'}); } -""" % 'en'] +""" % parameters.get_user(user, "LANG", app="general") @events.observe("UserMenuDisplay") diff --git a/modoboa/extensions/postfix_autoreply/forms.py b/modoboa/extensions/postfix_autoreply/forms.py index 4c4420a81..6f254fa7a 100644 --- a/modoboa/extensions/postfix_autoreply/forms.py +++ b/modoboa/extensions/postfix_autoreply/forms.py @@ -8,7 +8,8 @@ class ARmessageForm(forms.ModelForm): untildate = forms.DateField( label=ugettext_lazy('Until'), required=False, - help_text=ugettext_lazy("Activate your auto reply until this date") + help_text=ugettext_lazy("Activate your auto reply until this date"), + localize=False ) class Meta: diff --git a/modoboa/userprefs/views.py b/modoboa/userprefs/views.py index 229d858e3..a45ad7645 100644 --- a/modoboa/userprefs/views.py +++ b/modoboa/userprefs/views.py @@ -12,7 +12,7 @@ from forms import ForwardForm, BadDestination, ProfileForm @login_required def index(request, tplname="userprefs/index.html"): - extrajs = events.raiseQueryEvent("ExtraUprefsJS") + extrajs = events.raiseQueryEvent("ExtraUprefsJS", request.user) return render(request, tplname, { "selection" : "user", "extrajs" : "".join(extrajs)